manual merge again

This commit is contained in:
Gert
2015-06-01 21:22:56 +02:00
committed by Andy Miller
parent d8e0ee979a
commit f3ed44db0c
6 changed files with 47 additions and 111 deletions

View File

@@ -28,7 +28,6 @@
CheckboxesField.prototype.disabled = function(state) {
if (typeof state !== 'undefined') {
this._disabled = state ? true : false;
this.el.css('opacity', state ? 0.6 : 1);
}
return this._disabled;