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

Fix #1188 Swap focusout event for keyup event

Browse Source 
Fix typo
This commit is contained in:
Nicolas Le Goff
2013-05-29 18:51:01 +02:00
parent d968e30379
commit 08529cd594
1 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,13 +69,7 @@ define([
});
},
close: function(e) {
var fieldTag = $(e.target);
var fieldTagId = fieldTag.attr("id");
var fieldTagValue = fieldTag.val();
var data = {};
data[fieldTagId] = fieldTagValue;
self.model.set(data);
self.tagFieldChangedAction(e);
}
});
@@ -91,9 +85,9 @@ define([
events: {
"click": "focusAction",
"click .delete-field": "deleteAction",
"keyup #name": "changeNameAction",
"focusout input[type=text]": "fieldChangedAction",
"focusout input#tag": "tagFieldChangedAction",
"keyup input#name": "nameFieldChangedAction",
"keyup input#tbranch": "fieldChangedAction",
"keyup input#tag": "tagFieldChangedAction",
"change input[type=checkbox]": "fieldChangedAction",
"change select": "selectionChangedAction"
},
@@ -106,16 +100,18 @@ define([
return this;
},
// on input name keyup check for errors
changeNameAction: function(event) {
nameFieldChangedAction: function(event) {
var self = this;
var fieldName = $(event.target);
var fieldNameId = fieldName.attr("id");
var fieldNameValue = fieldName.val();
// check for duplicate field name
if ("" === fieldNameValue || "undefined" !== typeof AdminFieldApp.fieldListView.collection.find(function(model) {
// check for empty or duplicate field name
var notValid = "" === fieldNameValue || "undefined" !== typeof AdminFieldApp.fieldListView.collection.find(function(model) {
return model.get("name").toLowerCase() === fieldNameValue.toLowerCase() && self.model.get("id") !== model.get("id");
})) {
});
if (notValid) {
fieldName
.closest(".control-group")
.addClass("error")
@@ -137,9 +133,15 @@ define([
self.model, fieldNameId
);
}
if (!notValid) {
this.fieldChangedAction(event);
}
return this;
},
selectionChangedAction: function(e) {
var field = $(e.currentTarget);
var field = $(e.target);
var data = {};
data[field.attr("id")] = $("option:selected", field).val();
this.model.set(data);
@@ -147,7 +149,7 @@ define([
return this;
},
fieldChangedAction: function(e) {
var field = $(e.currentTarget);
var field = $(e.target);
var fieldId = field.attr("id");
var data = {};
data[fieldId] = field.is(":checkbox") ? field.is(":checked") : field.val();
@@ -160,8 +162,9 @@ define([
var fieldTagId = fieldTag.attr("id");
var fieldTagValue = fieldTag.val();
var notValid = "" !== fieldTagValue && false === /[a-z]+:[a-z0-9]+/i.test(fieldTagValue);
// check for format tag
if ("" !== fieldTagValue && false === /[a-z]+:[a-z0-9]+/i.test(fieldTagValue)) {
if (notValid) {
fieldTag
.closest(".control-group")
.addClass("error")
@@ -185,7 +188,9 @@ define([
.empty();
}
this.fieldChangedAction(e);
if (!notValid) {
this.fieldChangedAction(e);
}
},
deleteAction: function() {
var self = this;
@@ -234,15 +239,13 @@ define([
this._selectModelView(index);
this.render();
AdminFieldApp.saveView.updateStateButton();
},
// select temView by index in itemList
_selectModelView: function(index) {
// select previous or next itemview
if (index >= 0) {
AdminFieldApp.fieldListView.itemViews[index].clickAction().animate();
AdminFieldApp.fieldListView.itemViews[index].select().animate();
}
}
}));