mirror of
https://github.com/jquery/jquery-ui.git
synced 2024-11-21 11:04:24 +00:00
Sortable: Fixed #3979: Fixed using a string for connectWith option.
This commit is contained in:
parent
bae4a16d61
commit
34a5af8779
@ -462,14 +462,21 @@ $.widget("ui.sortable", $.extend({}, $.ui.mouse, {
|
|||||||
this.refreshPositions();
|
this.refreshPositions();
|
||||||
},
|
},
|
||||||
|
|
||||||
|
_connectWith: function() {
|
||||||
|
var options = this.options;
|
||||||
|
return options.connectWith.constructor == String
|
||||||
|
? [options.connectWith]
|
||||||
|
: options.connectWith;
|
||||||
|
},
|
||||||
|
|
||||||
_getItemsAsjQuery: function(connected) {
|
_getItemsAsjQuery: function(connected) {
|
||||||
|
|
||||||
var self = this;
|
var self = this;
|
||||||
var items = [];
|
var items = [];
|
||||||
var queries = [];
|
var queries = [];
|
||||||
|
var connectWith = this._connectWith();
|
||||||
|
|
||||||
if(this.options.connectWith && connected) {
|
if(connectWith && connected) {
|
||||||
var connectWith = this.options.connectWith.constructor == String ? [this.options.connectWith] : this.options.connectWith;
|
|
||||||
for (var i = connectWith.length - 1; i >= 0; i--){
|
for (var i = connectWith.length - 1; i >= 0; i--){
|
||||||
var cur = $(connectWith[i]);
|
var cur = $(connectWith[i]);
|
||||||
for (var j = cur.length - 1; j >= 0; j--){
|
for (var j = cur.length - 1; j >= 0; j--){
|
||||||
@ -515,10 +522,11 @@ $.widget("ui.sortable", $.extend({}, $.ui.mouse, {
|
|||||||
var items = this.items;
|
var items = this.items;
|
||||||
var self = this;
|
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 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) {
|
if(connectWith) {
|
||||||
for (var i = this.options.connectWith.length - 1; i >= 0; i--){
|
for (var i = connectWith.length - 1; i >= 0; i--){
|
||||||
var cur = $(this.options.connectWith[i]);
|
var cur = $(connectWith[i]);
|
||||||
for (var j = cur.length - 1; j >= 0; j--){
|
for (var j = cur.length - 1; j >= 0; j--){
|
||||||
var inst = $.data(cur[j], 'sortable');
|
var inst = $.data(cur[j], 'sortable');
|
||||||
if(inst && inst != this && !inst.options.disabled) {
|
if(inst && inst != this && !inst.options.disabled) {
|
||||||
|
Loading…
Reference in New Issue
Block a user