Changeset 4502

Timestamp:

01/21/08 17:41:11 (1 year ago)

Author:

paul.bakaus

Message:

- added serialization
- added new API methods (enable,disable,change)
- fixed many issues

Files:

• trunk/ui/current/ui.sortable.js (modified) (8 diffs)

trunk/ui/current/ui.sortable.js

@@ -10 +10 @@
     $.extend($.expr[':'], { sortable: "(' '+a.className+' ').indexOf(' ui-sortable ')" });
 
-    $.fn.sortable = function(o) {
-        return this.each(function() {
-            new $.ui.sortable(this,o);  
-        });
-    };
+    $.fn.extend({
+        makeSortable: function(o) {
+            return this.each(function() {
+                if(!$.data(this, "ui-sortable")) new $.ui.sortable(this,o); 
+            });
+        },
+        removeSortable: function() {
+            return this.each(function() { if($.data(this, "ui-sortable")) $.data(this, "ui-sortable").destroy(); });
+        },
+        changeSortable: function(key,value) {
+            var ret = null;
+            this.each(function() {
+                if($.data(this, "ui-sortable")) ret = $.data(this, "ui-sortable")[key](value);
+            });
+            return ret || this;
+        },
+        enableSortable: function() {
+            return this.each(function() { if($.data(this, "ui-sortable")) $.data(this, "ui-sortable").enable(); });
+        },
+        disableSortable: function() {
+            return this.each(function() { if($.data(this, "ui-sortable")) $.data(this, "ui-sortable").disable(); });
+        }
+    });
+
     
     $.ui.sortable = function(element,options) {
@@ -87 +106 @@
             this.element.triggerHandler(n == "sort" ? n : "sort"+n, [e, this.ui()], this.options[n]);
         },
+        serialize: function(o) {
+            
+            var items = $(this.options.items, this.element); //Only the items of the sortable itself
+            var str = '';
+            o = o || {};
+            
+            $(this.options.items, this.element).each(function() {
+                var res = (this.getAttribute(o.attribute || 'id') || '').match(o.expression || /(.+)[-=_](.+)/);
+                if(res) str += res[1]+'='+res[2];               
+            });
+            
+            return str;
+            
+        },
         intersectsWith: function(item) {
             
@@ -93 +126 @@
             var l = item.left, r = l + item.width, 
                 t = item.top,  b = t + item.height;
-
+            
             return (   l < x1 + (this.helperProportions.width  / 2)        // Right Half
                 &&     x2 - (this.helperProportions.width  / 2) < r    // Left Half
@@ -101 +134 @@
         },
         refresh: function() {
+            
             this.items = [];
             var items = this.items;
@@ -108 +142 @@
                 for (var i = this.options.connectWith.length - 1; i >= 0; i--){
                     var inst = $.data($(this.options.connectWith[i])[0], 'ui-sortable');
-                    if(inst) {
-                        queries.push($(inst.options.items, inst.element));
-                    }
+                    if(inst) queries.push($(inst.options.items, inst.element));
                 };
             }
@@ -136 +168 @@
         },
         destroy: function() {
+            
             this.element.removeClass("ui-sortable ui-sortable-disabled");
             this.element.removeMouseInteraction();
+            
+            for (var i = this.items.length - 1; i >= 0; i--) {
+                $.data(this.items[i].item[0], 'ui-sortable-item', null);
+            };
+            
+            $.data(this.element[0], 'ui-sortable', null);
+            
         },
         enable: function() {
@@ -150 +190 @@
             
             var o = this.options;
+
+            //Refresh the droppable items
+            this.refresh(); this.refreshPositions();
 
             //Create and append the visible helper
@@ -193 +236 @@
             //Set the original element visibility to hidden to still fill out the white space   
             $(this.currentItem).css('visibility', 'hidden');
-            
-            //Refresh the droppable positions
-            this.refreshPositions();
 
             return false;