composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 15:22:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Protected the property fields against the collision of ids within the same page (even if that is a bug, make it work not too bad!)

Browse Source 
SVN:trunk[3370]
This commit is contained in:
Romain Quetiez
2014-10-20 15:15:39 +00:00
parent 711949414d
commit 03c4964072
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
js/property_field.js
View File

@@ -32,7 +32,9 @@ $(function()
if (this.options.field_id != '') if (this.options.field_id != '')
{ {
$('#'+this.options.field_id).bind('change.itop-property-field', function() { me._on_change(); }); // In case there is an hidden input having the same id (somewhere else in the page), the change event does not occur unless the input loses the focus
// To reduce the impact, let's handle keyup as well
$('#'+this.options.field_id, this.element).bind('change.itop-property-field keyup.itop-property-field', function() { me._on_change(); });
this.value = this._get_field_value(); this.value = this._get_field_value();
} }
this.element.find(".prop_apply").bind('click.itop-property-field', function() { me._do_apply(); }); this.element.find(".prop_apply").bind('click.itop-property-field', function() { me._do_apply(); });
@@ -113,7 +115,7 @@ $(function()
{ {
if (this.options.get_field_value === null) if (this.options.get_field_value === null)
{ {
var oField = $('#'+this.options.field_id); var oField = $('#'+this.options.field_id, this.element);
if (oField.attr('type') == 'checkbox') if (oField.attr('type') == 'checkbox')
{ {
return (oField.attr('checked') == 'checked'); return (oField.attr('checked') == 'checked');
@@ -130,7 +132,7 @@ $(function()
}, },
_get_committed_value: function() _get_committed_value: function()
{ {
return { name: $('#'+this.options.field_id).attr('name'), value: this.value }; return { name: $('#'+this.options.field_id, this.element).attr('name'), value: this.value };
}, },
_do_apply: function() _do_apply: function()
{ {
@@ -153,7 +155,7 @@ $(function()
{ {
// Validate the field // Validate the field
sFormId = this.element.closest('form').attr('id'); sFormId = this.element.closest('form').attr('id');
var oField = $('#'+this.options.field_id); var oField = $('#'+this.options.field_id, this.element);
oField.trigger('validate'); oField.trigger('validate');
if ( $.inArray(this.options.field_id, oFormValidation[sFormId]) == -1) if ( $.inArray(this.options.field_id, oFormValidation[sFormId]) == -1)
{ {
@@ -175,7 +177,7 @@ $(function()
else else
{ {
this.bModified = false; this.bModified = false;
var oField = $('#'+this.options.field_id); var oField = $('#'+this.options.field_id, this.element);
if (oField.attr('type') == 'checkbox') if (oField.attr('type') == 'checkbox')
{ {
if (this.value) if (this.value)
@@ -215,7 +217,7 @@ $(function()
}); });
oPostedData = this.options.submit_parameters; oPostedData = this.options.submit_parameters;
oPostedData.params = oData; oPostedData.params = oData;
oPostedData.params.updated = [ $('#'+this.options.field_id).attr('name') ]; // only one field updated in this case oPostedData.params.updated = [ $('#'+this.options.field_id, this.element).attr('name') ]; // only one field updated in this case
oPostedData.params.previous_values = {}; oPostedData.params.previous_values = {};
oPostedData.params.previous_values[oPostedData.params.updated] = this.previous_value; // pass also the previous value(s) oPostedData.params.previous_values[oPostedData.params.updated] = this.previous_value; // pass also the previous value(s)
$.post(this.options.submit_to, oPostedData, function(data) $.post(this.options.submit_to, oPostedData, function(data)