resizable,selectable,slider: changed this.disabled to this.options.disabled (fixes...

diff --git a/ui/source/ui.resizable.js b/ui/source/ui.resizable.js
index 890c5ad427e92eed054b6e048cbda40c26348ddd..6e8907ec1ac27f6cc485cc93cb09a680b268b61c 100644 (file)
--- a/ui/source/ui.resizable.js
+++ b/ui/source/ui.resizable.js
@@ -251,14 +251,14 @@
                },\r
                enable: function() {\r
                        this.element.removeClass("ui-resizable-disabled");\r
-                       this.disabled = false;\r
+                       this.options.disabled = false;\r
                },\r
                disable: function() {\r
                        this.element.addClass("ui-resizable-disabled");\r
-                       this.disabled = true;\r
+                       this.options.disabled = true;\r
                },\r
                mouseStart: function(e) {\r
-                       if(this.disabled) return false;\r
+                       if(this.options.disabled) return false;\r
                        \r
                        var handle = false;\r
                        for(var i in this.options.handles) {\r

diff --git a/ui/source/ui.selectable.js b/ui/source/ui.selectable.js
index 8486e44e29d7f0d69887aa16a7a1ed70e636270f..a27391da658c490fbeb2d81eca5222aaf26ccf5e 100644 (file)
--- a/ui/source/ui.selectable.js
+++ b/ui/source/ui.selectable.js
@@ -52,7 +52,7 @@
                        this.helper = $(document.createElement('div')).css({border:'1px dotted black'});\r
                },\r
                toggle: function() {\r
-                       if(this.disabled){\r
+                       if(this.options.disabled){\r
                                this.enable();\r
                        } else {\r
                                this.disable();\r
@@ -67,18 +67,18 @@
                },\r
                enable: function() {\r
                        this.element.removeClass("ui-selectable-disabled");\r
-                       this.disabled = false;\r
+                       this.options.disabled = false;\r
                },\r
                disable: function() {\r
                        this.element.addClass("ui-selectable-disabled");\r
-                       this.disabled = true;\r
+                       this.options.disabled = true;\r
                },\r
                mouseStart: function(e) {\r
                        var self = this;\r
                        \r
                        this.opos = [e.pageX, e.pageY];\r
                        \r
-                       if (this.disabled)\r
+                       if (this.options.disabled)\r
                                return;\r
 \r
                        var options = this.options;\r
@@ -133,7 +133,7 @@
                        var self = this;\r
                        this.dragged = true;\r
                        \r
-                       if (this.disabled)\r
+                       if (this.options.disabled)\r
                                return;\r
 \r
                        var options = this.options;\r

diff --git a/ui/source/ui.slider.js b/ui/source/ui.slider.js
index a15c917dd0186f6301401cca841ad10538aa398b..87c1572fbf9a31e51d39e0fcf7eaf44a663156b0 100644 (file)
--- a/ui/source/ui.slider.js
+++ b/ui/source/ui.slider.js
@@ -49,11 +49,11 @@
                },\r
                enable: function() {\r
                        this.element.removeClass("ui-slider-disabled");\r
-                       this.disabled = false;\r
+                       this.options.disabled = false;\r
                },\r
                disable: function() {\r
                        this.element.addClass("ui-slider-disabled");\r
-                       this.disabled = true;\r
+                       this.options.disabled = true;\r
                },\r
                setData: function(key, value) {\r
                        this.options[key] = value;\r
@@ -162,7 +162,7 @@
                                if(this == e.target)\r
                                        clickedHandle = true;\r
                        });\r
-                       if (clickedHandle || this.disabled || !(this.currentHandle || this.previousHandle))\r
+                       if (clickedHandle || this.options.disabled || !(this.currentHandle || this.previousHandle))\r
                                return;\r
 \r
                        // If a previous handle was focussed, focus it again\r
@@ -270,10 +270,10 @@
                        \r
                        this.propagate('start', e);\r
                        \r
-                       if(!this.disabled) {\r
+                       if(!this.options.disabled) {\r
                                if(this.currentHandle) this.blur(this.currentHandle);\r
                                this.focus(handle,1);\r
-                               return !this.disabled;\r
+                               return !this.options.disabled;\r
                        }\r
                },\r
                mouseDrag: function(e) {\r