tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-29 20:59:23 +02:00
Code Issues Projects Releases Wiki Activity

BUG Fix incorrect change detection on checkbox fields

Browse Source 
Fixes #6121
This commit is contained in:
Damian Mooyman 2016-10-27 11:15:37 +13:00
parent 5347d660a0
commit f7fd4ffae1
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
2 changed files with 117 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
admin/client/dist/js/vendor.js vendored
View File

@ -9699,11 +9699,12 @@ if(this.length>1)return this.each(function(t,n){this.changetracker(e)}),this
this.defaults={fieldSelector:":input:not(:submit)",ignoreFieldSelector:"",changedCssClass:"changed"} this.defaults={fieldSelector:":input:not(:submit)",ignoreFieldSelector:"",changedCssClass:"changed"}
var r=t.extend({},this.defaults,e) var r=t.extend({},this.defaults,e)
if(this.initialize=function(){t.meta&&(r=t.extend({},r,this.data())) if(this.initialize=function(){t.meta&&(r=t.extend({},r,this.data()))
var e=!1,i=function(i){var o=t(i.target),a=o.data("changetracker.origVal"),s var e=!1,i=function(t){if(t.is(":radio")){var e=n.find(":input[name="+t.attr("name")+"]:checked")
s=o.is(":checkbox")?o.is(":checked")?1:0:o.val(),null===a||s!=a?(o.addClass(r.changedCssClass),n.addClass(r.changedCssClass)):(o.removeClass(r.changedCssClass),o.is(":radio")&&n.find(":radio[name="+o.attr("name")+"]").removeClass(r.changedCssClass), return e.length?e.val():0}return t.is(":checkbox")?t.is(":checked")?1:0:t.val()},o=function(o){var a=t(o.target),s=a.data("changetracker.origVal"),l
e||n.getFields().filter("."+r.changedCssClass).length||n.removeClass(r.changedCssClass))},o=this.getFields(),a l=i(a),null===s||l!=s?(a.addClass(r.changedCssClass),n.addClass(r.changedCssClass)):(a.removeClass(r.changedCssClass),a.is(":radio")&&n.find(":radio[name="+a.attr("name")+"]").removeClass(r.changedCssClass),
o.filter(":radio,:checkbox").bind("click.changetracker",i),o.not(":radio,:checkbox").bind("change.changetracker",i),o.each(function(){a=t(this).is(":radio,:checkbox")?n.find(":input[name="+t(this).attr("name")+"]:checked").val():t(this).val(), e||n.getFields().filter("."+r.changedCssClass).length||n.removeClass(r.changedCssClass))},a=this.getFields(),s
t(this).data("changetracker.origVal",a)}),n.bind("dirty.changetracker",function(){e=!0,n.addClass(r.changedCssClass)}),this.data("changetracker",!0)},this.destroy=function(){this.getFields().unbind(".changetracker").removeClass(r.changedCssClass).removeData("changetracker.origVal"), a.filter(":radio,:checkbox").bind("click.changetracker",o),a.not(":radio,:checkbox").bind("change.changetracker",o),a.each(function(){s=i(t(this)),t(this).data("changetracker.origVal",s)}),n.bind("dirty.changetracker",function(){
e=!0,n.addClass(r.changedCssClass)}),this.data("changetracker",!0)},this.destroy=function(){this.getFields().unbind(".changetracker").removeClass(r.changedCssClass).removeData("changetracker.origVal"),
this.unbind(".changetracker").removeData("changetracker")},this.reset=function(){this.getFields().each(function(){n.resetField(this)}),this.removeClass(r.changedCssClass)},this.resetField=function(e){return t(e).removeData("changetracker.origVal").removeClass("changed") this.unbind(".changetracker").removeData("changetracker")},this.reset=function(){this.getFields().each(function(){n.resetField(this)}),this.removeClass(r.changedCssClass)},this.resetField=function(e){return t(e).removeData("changetracker.origVal").removeClass("changed")
},this.getFields=function(){return this.find(r.fieldSelector).not(r.ignoreFieldSelector)},"string"==typeof arguments[0]){var i=arguments[1],o=Array.prototype.slice.call(arguments) },this.getFields=function(){return this.find(r.fieldSelector).not(r.ignoreFieldSelector)},"string"==typeof arguments[0]){var i=arguments[1],o=Array.prototype.slice.call(arguments)

215
admin/thirdparty/jquery-changetracker/lib/jquery.changetracker.js vendored
View File

@ -33,126 +33,133 @@
* @license BSD License * @license BSD License
*/ */
(function($) { (function($) {
$.fn.changetracker = function(_options) { $.fn.changetracker = function(_options) {
var self = this; var self = this;
if(this.length > 1){ if(this.length > 1){
this.each(function(i, item) { this.each(function(i, item) {
this.changetracker(_options); this.changetracker(_options);
}); });
return this; return this;
} }
this.defaults = { this.defaults = {
fieldSelector: ':input:not(:submit)', fieldSelector: ':input:not(:submit)',
ignoreFieldSelector: "", ignoreFieldSelector: "",
changedCssClass: 'changed' changedCssClass: 'changed'
}; };
var options = $.extend({}, this.defaults, _options); var options = $.extend({}, this.defaults, _options);
this.initialize = function() { this.initialize = function() {
// optional metadata plugin support // optional metadata plugin support
if ($.meta) options = $.extend({}, options, this.data()); if ($.meta) options = $.extend({}, options, this.data());
// Flag indicating this form was dirtied by an external component // Flag indicating this form was dirtied by an external component
var dirty = false; var dirty = false;
// Get value from field for purposes of change tracking
var fieldValue = function($field) {
// Get radio
if ($field.is(':radio')) {
var checkedItems = self.find(':input[name=' + $field.attr('name') + ']:checked');
return checkedItems.length ? checkedItems.val() : 0;
}
if($field.is(':checkbox')) {
return $field.is(':checked') ? 1 : 0;
}
return $field.val();
}
var onchange = function(e) { var onchange = function(e) {
var $field = $(e.target); var $field = $(e.target);
var origVal = $field.data('changetracker.origVal'), newVal; var origVal = $field.data('changetracker.origVal'), newVal;
// Determine value based on field type // Determine value based on field type
if($field.is(':checkbox')) { newVal = fieldValue($field);
newVal = $field.is(':checked') ? 1 : 0;
} else {
newVal = $field.val();
}
// Determine changed state based on value comparisons // Determine changed state based on value comparisons
if(origVal === null || newVal != origVal) { if(origVal === null || newVal != origVal) {
$field.addClass(options.changedCssClass); $field.addClass(options.changedCssClass);
self.addClass(options.changedCssClass); self.addClass(options.changedCssClass);
} else { } else {
$field.removeClass(options.changedCssClass); $field.removeClass(options.changedCssClass);
// Unset changed state on all radio buttons of the same name // Unset changed state on all radio buttons of the same name
if($field.is(':radio')) { if($field.is(':radio')) {
self.find(':radio[name=' + $field.attr('name') + ']').removeClass(options.changedCssClass); self.find(':radio[name=' + $field.attr('name') + ']').removeClass(options.changedCssClass);
} }
// Only unset form state if no other fields are changed as well and the form isn't explicitly dirty // Only unset form state if no other fields are changed as well and the form isn't explicitly dirty
if(!dirty && !self.getFields().filter('.' + options.changedCssClass).length) { if(!dirty && !self.getFields().filter('.' + options.changedCssClass).length) {
self.removeClass(options.changedCssClass); self.removeClass(options.changedCssClass);
} }
} }
}; };
// setup original values // setup original values
var fields = this.getFields(), origVal; var fields = this.getFields(), origVal;
fields.filter(':radio,:checkbox').bind('click.changetracker', onchange); fields.filter(':radio,:checkbox').bind('click.changetracker', onchange);
fields.not(':radio,:checkbox').bind('change.changetracker', onchange); fields.not(':radio,:checkbox').bind('change.changetracker', onchange);
fields.each(function() { fields.each(function() {
if($(this).is(':radio,:checkbox')) { origVal = fieldValue($(this));
origVal = self.find(':input[name=' + $(this).attr('name') + ']:checked').val(); $(this).data('changetracker.origVal', origVal);
} else { });
origVal = $(this).val();
}
$(this).data('changetracker.origVal', origVal);
});
self.bind('dirty.changetracker', function() { self.bind('dirty.changetracker', function() {
dirty = true; dirty = true;
self.addClass(options.changedCssClass); self.addClass(options.changedCssClass);
}); });
this.data('changetracker', true); this.data('changetracker', true);
}; };
this.destroy = function() { this.destroy = function() {
this.getFields() this.getFields()
.unbind('.changetracker') .unbind('.changetracker')
.removeClass(options.changedCssClass) .removeClass(options.changedCssClass)
.removeData('changetracker.origVal'); .removeData('changetracker.origVal');
this.unbind('.changetracker') this.unbind('.changetracker')
.removeData('changetracker'); .removeData('changetracker');
}; };
/** /**
* Reset change state of all form fields and the form itself. * Reset change state of all form fields and the form itself.
*/ */
this.reset = function() { this.reset = function() {
this.getFields().each(function() { this.getFields().each(function() {
self.resetField(this); self.resetField(this);
}); });
this.removeClass(options.changedCssClass); this.removeClass(options.changedCssClass);
}; };
/** /**
* Reset the change single form field. * Reset the change single form field.
* Does not reset to the original value. * Does not reset to the original value.
* *
* @param DOMElement field * @param DOMElement field
*/ */
this.resetField = function(field) { this.resetField = function(field) {
return $(field).removeData('changetracker.origVal').removeClass('changed'); return $(field).removeData('changetracker.origVal').removeClass('changed');
}; };
/** /**
* @return jQuery Collection of fields * @return jQuery Collection of fields
*/ */
this.getFields = function() { this.getFields = function() {
return this.find(options.fieldSelector).not(options.ignoreFieldSelector); return this.find(options.fieldSelector).not(options.ignoreFieldSelector);
}; };
// Support invoking "public" methods as string arguments // Support invoking "public" methods as string arguments
if (typeof arguments[0] === 'string') { if (typeof arguments[0] === 'string') {
var property = arguments[1]; var property = arguments[1];
var args = Array.prototype.slice.call(arguments); var args = Array.prototype.slice.call(arguments);
args.splice(0, 1); args.splice(0, 1);
return this[arguments[0]].apply(this, args); return this[arguments[0]].apply(this, args);
} else { } else {
return this.initialize(); return this.initialize();
} }
}; };
}(jQuery)); }(jQuery));