r1936 - trunk/ui
r1936 - trunk/ui
Author: scott.gonzalez
Date: Sat Jan 31 08:54:06 2009
New Revision: 1936
Modified:
trunk/ui/ui.sortable.js
Log:
Sortable: Fixed #3979: Fixed using a string for connectWith option.
Modified: trunk/ui/ui.sortable.js
==============================================================================
--- trunk/ui/ui.sortable.js (original)
+++ trunk/ui/ui.sortable.js Sat Jan 31 08:54:06 2009
@@ -462,14 +462,21 @@
this.refreshPositions();
},
+ _connectWith: function() {
+ var options = this.options;
+ return options.connectWith.constructor == String
+ ? [options.connectWith]
+ : options.connectWith;
+ },
+
_getItemsAsjQuery: function(connected) {
var self = this;
var items = [];
var queries = [];
+ var connectWith = this._connectWith();
- if(this.options.connectWith && connected) {
- var connectWith = this.options.connectWith.constructor == String ?
[this.options.connectWith] : this.options.connectWith;
+ if(connectWith && connected) {
for (var i = connectWith.length - 1; i >= 0; i--){
var cur = $(connectWith[i]);
for (var j = cur.length - 1; j >= 0; j--){
@@ -515,10 +522,11 @@
var items = this.items;
var self = this;
var queries = [[$.isFunction(this.options.items) ?
this.options.items.call(this.element[0], event, { item: this.currentItem
}) : $(this.options.items, this.element), this]];
+ var connectWith = this._connectWith();
- if(this.options.connectWith) {
- for (var i = this.options.connectWith.length - 1; i >= 0; i--){
- var cur = $(this.options.connectWith[i]);
+ if(connectWith) {
+ for (var i = connectWith.length - 1; i >= 0; i--){
+ var cur = $(connectWith[i]);
for (var j = cur.length - 1; j >= 0; j--){
var inst = $.data(cur[j], 'sortable');
if(inst && inst != this && !inst.options.disabled) {