hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-15 14:03:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8'

Browse Source 
Conflicts:
	CHANGELOG.md
	bin/developer
	lib/classes/module/console/systemUpgrade.php
	www/skins/report/jquery-ui.css
This commit is contained in:
Romain Neutron
2013-10-03 15:29:22 +02:00
parent 642a1a5657 0a86cb635e
commit 1dfbff5666
82 changed files with 2558 additions and 923 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
www/scripts/apps/admin/fields/views/edit.js
View File

@@ -84,7 +84,6 @@ define([
return this;
},
events: {
"click": "focusAction",
"click .delete-field": "deleteAction",
"blur input#tbranch": "fieldChangedAction",
"blur input#separator": "fieldChangedAction",
@@ -94,14 +93,6 @@ define([
"change select": "selectionChangedAction",
"click .lng-label a": "_toggleLabels"
},
focusAction: function() {
var index = AdminFieldApp.fieldListView.collection.indexOf(this.model);
if (index >= 0) {
AdminFieldApp.fieldListView.itemViews[index].animate();
}
return this;
},
selectionChangedAction: function(e) {
var field = $(e.target);
var data = {};

7
www/scripts/apps/admin/fields/views/list.js
View File

@@ -27,6 +27,13 @@ define([
// store all single rendered views
this.itemViews = [];
// force base 1 indexed
if (this.collection.first().get("sorter") === 0) {
this.collection.each(function (model) {
model.set({'sorter': model.get("sorter") + 1}, {silent: true});
});
}
// rerender whenever there is a change on the collection
this.collection.bind("reset", this.render, this);
this.collection.bind("add", this.render, this);