Changeset 4966

Timestamp:

03/15/08 14:14:25 (10 months ago)

Author:

scott.gonzalez

Message:

UI: Fixed #2519 - Proper namespacing of events and data.

Location:

trunk/ui

Files:

• ui.accordion.js (modified) (6 diffs)
• ui.dialog.js (modified) (7 diffs)
• ui.draggable.js (modified) (3 diffs)
• ui.droppable.js (modified) (3 diffs)
• ui.resizable.js (modified) (3 diffs)
• ui.selectable.js (modified) (8 diffs)
• ui.slider.js (modified) (3 diffs)
• ui.sortable.js (modified) (6 diffs)

trunk/ui/ui.accordion.js

@@ -25 +25 @@
         return this.each(function() {
             if (typeof options == "string") {
-                var accordion = $.data(this, "ui-accordion");
+                var accordion = $.data(this, "accordion");
                 accordion[options].apply(accordion, args);
             // INIT with optional options
             } else if (!$(this).is(".ui-accordion"))
-                $.data(this, "ui-accordion", new $.ui.accordion(this, options));
+                $.data(this, "accordion", new $.ui.accordion(this, options));
         });
     },
@@ -85 +85 @@
     
     if (options.event)
-        $(container).bind((options.event) + ".ui-accordion", clickHandler);
+        $(container).bind((options.event) + ".accordion", clickHandler);
 };
 
@@ -107 +107 @@
             this.options.headers.next().css("height", "");
         }
-        $.removeData(this.element, "ui-accordion");
-        $(this.element).removeClass("ui-accordion").unbind(".ui-accordion");
+        $.removeData(this.element, "accordion");
+        $(this.element).removeClass("ui-accordion").unbind(".accordion");
     }
 };
@@ -120 +120 @@
 function completed(cancel) {
     // if removed while animated data can be empty
-    if (!$.data(this, "ui-accordion"))
+    if (!$.data(this, "accordion"))
         return;
-    var instance = $.data(this, "ui-accordion");
+    var instance = $.data(this, "accordion");
     var options = instance.options;
     options.running = cancel ? 0 : --options.running;
@@ -137 +137 @@
 
 function toggle(toShow, toHide, data, clickedActive, down) {
-    var options = $.data(this, "ui-accordion").options;
+    var options = $.data(this, "accordion").options;
     options.toShow = toShow;
     options.toHide = toHide;
@@ -176 +176 @@
 
 function clickHandler(event) {
-    var options = $.data(this, "ui-accordion").options;
+    var options = $.data(this, "accordion").options;
     if (options.disabled)
         return false;

trunk/ui/ui.dialog.js

@@ -13 +13 @@
                         ? this
                         : $(this).parents(".ui-dialog:first").find(".ui-dialog-content")[0];
-                    var dialog = elem ? $.data(elem, "ui-dialog") : {};
+                    var dialog = elem ? $.data(elem, "dialog") : {};
                     if (dialog[options])
                         dialog[options].apply(dialog, args);
@@ -29 +29 @@
         var self = this; //Do bindings
 
-        $.data(this.element, "ui-dialog", this);
+        $.data(this.element, "dialog", this);
         
         $(el).bind("setData.dialog", function(event, key, value){
@@ -274 +274 @@
             $(el).unbind('.dialog').removeClass('ui-dialog-content').hide().appendTo('body');
             uiDialog.remove();
-            $.removeData(this.element, "ui-dialog");
+            $.removeData(this.element, "dialog");
         };
         
@@ -307 +307 @@
         instances: [],
         events: $.map('focus,mousedown,mouseup,keydown,keypress,click'.split(','),
-            function(e) { return e + '.ui-dialog-overlay'; }).join(' '),
+            function(e) { return e + '.dialog-overlay'; }).join(' '),
         create: function(dialog) {
             if (this.instances.length === 0) {
@@ -334 +334 @@
                 
                 // allow closing by pressing the escape key
-                $(document).bind('keydown.ui-dialog-overlay', function(e) {
+                $(document).bind('keydown.dialog-overlay', function(e) {
                     var ESC = 27;
                     e.keyCode && e.keyCode == ESC && dialog.close(); 
@@ -340 +340 @@
                 
                 // handle window resize
-                $(window).bind('resize.ui-dialog-overlay', $.ui.dialog.overlay.resize);
+                $(window).bind('resize.dialog-overlay', $.ui.dialog.overlay.resize);
             }
             
@@ -361 +361 @@
             
             if (this.instances.length === 0) {
-                $('a, :input').add([document, window]).unbind('.ui-dialog-overlay');
+                $('a, :input').add([document, window]).unbind('.dialog-overlay');
             }
             

trunk/ui/ui.draggable.js

@@ -7 +7 @@
             return this.each(function() {
                 if (typeof options == "string") {
-                    var drag = $.data(this, "ui-draggable");
+                    var drag = $.data(this, "draggable");
                     if(drag) drag[options].apply(drag, args);
 
-                } else if(!$.data(this, "ui-draggable"))
+                } else if(!$.data(this, "draggable"))
                     new $.ui.draggable(this, options);
             });
@@ -22 +22 @@
         this.element = $(element);
         
-        $.data(element, "ui-draggable", this);
+        $.data(element, "draggable", this);
         this.element.addClass("ui-draggable");
         
@@ -75 +75 @@
         },
         destroy: function() {
-            if(!$.data(this.element[0], 'ui-draggable')) return;
+            if(!$.data(this.element[0], 'draggable')) return;
             this.options.handle.removeMouseInteraction();
             this.element
                 .removeClass("ui-draggable ui-draggable-disabled")
-                .removeData("ui-draggable")
+                .removeData("draggable")
                 .unbind(".draggable");
         },

trunk/ui/ui.droppable.js

@@ -7 +7 @@
             return this.each(function() {
                 if (typeof options == "string") {
-                    var drop = $.data(this, "ui-droppable");
+                    var drop = $.data(this, "droppable");
                     if(drop) drop[options].apply(drop, args);
 
-                } else if(!$.data(this, "ui-droppable"))
+                } else if(!$.data(this, "droppable"))
                     new $.ui.droppable(this, options);
             });
@@ -21 +21 @@
         //Initialize needed constants           
         this.element = $(element);
-        $.data(element, "ui-droppable", this);
+        $.data(element, "droppable", this);
         this.element.addClass("ui-droppable");      
         
@@ -69 +69 @@
             this.element
                 .removeClass("ui-droppable ui-droppable-disabled")
-                .removeData("ui-droppable")
+                .removeData("droppable")
                 .unbind(".droppable");
         },

trunk/ui/ui.resizable.js

@@ -6 +6 @@
             
             if (typeof options == "string") {
-                var resize = $.data(this, "ui-resizable");
+                var resize = $.data(this, "resizable");
                 resize[options].apply(resize, args);
 
@@ -21 +21 @@
         this.element = $(element);
         
-        $.data(element, "ui-resizable", this);
+        $.data(element, "resizable", this);
         
         // simulate .ui-resizable { position: relative; }
@@ -268 +268 @@
             .removeClass("ui-resizable ui-resizable-disabled")
             .removeMouseInteraction()
-            .removeData("ui-resizable")
+            .removeData("resizable")
             .unbind(".resizable").find('.ui-resizable-handle').remove();
         },

trunk/ui/ui.selectable.js

@@ -8 +8 @@
             return this.each(function() {
                 if (typeof options == "string") {
-                    var select = $.data(this, "ui-selectable");
+                    var select = $.data(this, "selectable");
                     select[options].apply(select, args);
 
-                } else if(!$.data(this, "ui-selectable"))
+                } else if(!$.data(this, "selectable"))
                     new $.ui.selectable(this, options);
             });
@@ -22 +22 @@
         this.element = $(element);
         
-        $.data(this.element, "ui-selectable", this);
+        $.data(this.element, "selectable", this);
         this.element.addClass("ui-selectable");
         
@@ -47 +47 @@
                 var $this = $(this);
                 var pos = $this.offset();
-                $.data(this, "ui-selectee", {
+                $.data(this, "selectable-item", {
                     element: this,
                     $element: $this,
@@ -91 +91 @@
             this.element
                 .removeClass("ui-selectable ui-selectable-disabled")
-                .removeData("ui-selectable")
+                .removeData("selectable")
                 .unbind(".selectable");
             this.removeMouseInteraction();
@@ -136 +136 @@
 
             this.selectees.filter('.ui-selected').each(function() {
-                var selectee = $.data(this, "ui-selectee");
+                var selectee = $.data(this, "selectable-item");
                 selectee.startselected = true;
                 if (!ev.ctrlKey) {
@@ -166 +166 @@
 
             this.selectees.each(function() {
-                var selectee = $.data(this, "ui-selectee");
+                var selectee = $.data(this, "selectable-item");
                 //prevent helper from being selected if appendTo: selectable
                 if (selectee.element == element)
@@ -244 +244 @@
 
             $('.ui-unselecting', this.element).each(function() {
-                var selectee = $.data(this, "ui-selectee");
+                var selectee = $.data(this, "selectable-item");
                 selectee.$element.removeClass('ui-unselecting');
                 selectee.unselecting = false;
@@ -255 +255 @@
             });
             $('.ui-selecting', this.element).each(function() {
-                var selectee = $.data(this, "ui-selectee");
+                var selectee = $.data(this, "selectable-item");
                 selectee.$element.removeClass('ui-selecting').addClass('ui-selected');
                 selectee.selecting = false;

trunk/ui/ui.slider.js

@@ -6 +6 @@
             
             if ( options == "value" )
-                return $.data(this[0], "ui-slider").value(arguments[1]);
+                return $.data(this[0], "slider").value(arguments[1]);
             
             return this.each(function() {
                 if (typeof options == "string") {
-                    var slider = $.data(this, "ui-slider");
+                    var slider = $.data(this, "slider");
                     slider[options].apply(slider, args);
 
-                } else if(!$.data(this, "ui-slider"))
+                } else if(!$.data(this, "slider"))
                     new $.ui.slider(this, options);
             });
@@ -24 +24 @@
         var self = this;
         this.element = $(element);
-        $.data(element, "ui-slider", this);
+        $.data(element, "slider", this);
         this.element.addClass("ui-slider");
         
@@ -142 +142 @@
             this.element
                 .removeClass("ui-slider ui-slider-disabled")
-                .removeData("ui-slider")
+                .removeData("slider")
                 .unbind(".slider");
             this.handle.removeMouseInteraction();

trunk/ui/ui.sortable.js

@@ -13 +13 @@
             
             if (options == "serialize" || options == "toArray")
-                return $.data(this[0], "ui-sortable")[options](arguments[1]);
+                return $.data(this[0], "sortable")[options](arguments[1]);
             
             return this.each(function() {
                 if (typeof options == "string") {
-                    var sort = $.data(this, "ui-sortable");
+                    var sort = $.data(this, "sortable");
                     sort[options].apply(sort, args);
 
-                } else if(!$.data(this, "ui-sortable"))
+                } else if(!$.data(this, "sortable"))
                     new $.ui.sortable(this, options);
             });
@@ -33 +33 @@
         this.containerCache = {};
         
-        $.data(element, "ui-sortable", this);
+        $.data(element, "sortable", this);
         this.element.addClass("ui-sortable");
 
@@ -78 +78 @@
                 //Find out if the clicked node (or one of its parents) is a actual item in this.items
                 var currentItem = null, nodes = $(e.target).parents().andSelf().each(function() {
-                    if($.data(this, 'ui-sortable-item')) currentItem = $(this);
+                    if($.data(this, 'sortable-item')) currentItem = $(this);
                 });
                 if(currentItem && (!this.options.handle || $(e.target).parents().andSelf().is(this.options.handle))) {
@@ -170 +170 @@
                     var cur = $(this.options.connectWith[i]);
                     for (var j = cur.length - 1; j >= 0; j--){
-                        var inst = $.data(cur[j], 'ui-sortable');
+                        var inst = $.data(cur[j], 'sortable');
                         if(inst && !inst.disabled) {
                             queries.push($(inst.options.items, inst.element));
@@ -182 +182 @@
             for (var i = queries.length - 1; i >= 0; i--){
                 queries[i].each(function() {
-                    $.data(this, 'ui-sortable-item', true); // Data for target checking (mouse manager)
+                    $.data(this, 'sortable-item', true); // Data for target checking (mouse manager)
                     items.push({
                         item: $(this),
@@ -211 +211 @@
             this.element
                 .removeClass("ui-sortable ui-sortable-disabled")
-                .removeData("ui-sortable")
+                .removeData("sortable")
                 .unbind(".sortable")
                 .removeMouseInteraction();
             
             for ( var i = this.items.length - 1; i >= 0; i-- )
-                this.items[i].item.removeData("ui-sortable-item");
+                this.items[i].item.removeData("sortable-item");
         },
         enable: function() {