library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2024-11-21 11:04:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed #4038 (sortable: cssNamespace option should be removed)

Browse Source
This commit is contained in:
Richard Worth 2009-02-03 02:18:12 +00:00
parent b534fcccb9
commit 87796aff53
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/unit/sortable/sortable_defaults.js
View File

@ -9,7 +9,6 @@ var sortable_defaults = {
cancel: ":input,option", cancel: ":input,option",
connectWith: false, connectWith: false,
containment: false, containment: false,
cssNamespace: "ui",
cursor: 'auto', cursor: 'auto',
cursorAt: false, cursorAt: false,
delay: 0, delay: 0,

21
ui/ui.sortable.js
View File

@ -17,7 +17,7 @@ $.widget("ui.sortable", $.extend({}, $.ui.mouse, {
var o = this.options; var o = this.options;
this.containerCache = {}; this.containerCache = {};
(this.options.cssNamespace && this.element.addClass(this.options.cssNamespace+"-sortable")); this.element.addClass("ui-sortable");
//Get the items //Get the items
this.refresh(); this.refresh();
@ -35,7 +35,7 @@ $.widget("ui.sortable", $.extend({}, $.ui.mouse, {
destroy: function() { destroy: function() {
this.element this.element
.removeClass(this.options.cssNamespace+"-sortable "+this.options.cssNamespace+"-sortable-disabled") .removeClass("ui-sortable ui-sortable-disabled")
.removeData("sortable") .removeData("sortable")
.unbind(".sortable"); .unbind(".sortable");
this._mouseDestroy(); this._mouseDestroy();
@ -189,7 +189,7 @@ $.widget("ui.sortable", $.extend({}, $.ui.mouse, {
this.dragging = true; this.dragging = true;
this.helper.addClass(o.cssNamespace+'-sortable-helper'); this.helper.addClass("ui-sortable-helper");
this._mouseDrag(event); //Execute the drag once - this causes the helper not to be visible before getting its correct position this._mouseDrag(event); //Execute the drag once - this causes the helper not to be visible before getting its correct position
return true; return true;
@ -322,7 +322,7 @@ $.widget("ui.sortable", $.extend({}, $.ui.mouse, {
this._mouseUp(); this._mouseUp();
if(this.options.helper == "original") if(this.options.helper == "original")
this.currentItem.css(this._storedCSS).removeClass(this.options.cssNamespace+"-sortable-helper"); this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
else else
this.currentItem.show(); this.currentItem.show();
@ -482,13 +482,13 @@ $.widget("ui.sortable", $.extend({}, $.ui.mouse, {
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) {
queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element) : $(inst.options.items, inst.element).not("."+inst.options.cssNamespace+"-sortable-helper"), inst]); queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element) : $(inst.options.items, inst.element).not(".ui-sortable-helper"), inst]);
} }
}; };
}; };
} }
queries.push([$.isFunction(this.options.items) ? this.options.items.call(this.element, null, { options: this.options, item: this.currentItem }) : $(this.options.items, this.element).not("."+this.options.cssNamespace+"-sortable-helper"), this]); queries.push([$.isFunction(this.options.items) ? this.options.items.call(this.element, null, { options: this.options, item: this.currentItem }) : $(this.options.items, this.element).not(".ui-sortable-helper"), this]);
for (var i = queries.length - 1; i >= 0; i--){ for (var i = queries.length - 1; i >= 0; i--){
queries[i][0].each(function() { queries[i][0].each(function() {
@ -613,8 +613,8 @@ $.widget("ui.sortable", $.extend({}, $.ui.mouse, {
element: function() { element: function() {
var el = $(document.createElement(self.currentItem[0].nodeName)) var el = $(document.createElement(self.currentItem[0].nodeName))
.addClass(className || self.currentItem[0].className+" "+self.options.cssNamespace+"-sortable-placeholder") .addClass(className || self.currentItem[0].className+" ui-sortable-placeholder")
.removeClass(self.options.cssNamespace+'-sortable-helper')[0]; .removeClass("ui-sortable-helper")[0];
if(!className) if(!className)
el.style.visibility = "hidden"; el.style.visibility = "hidden";
@ -909,13 +909,13 @@ $.widget("ui.sortable", $.extend({}, $.ui.mouse, {
for(var i in this._storedCSS) { for(var i in this._storedCSS) {
if(this._storedCSS[i] == 'auto' || this._storedCSS[i] == 'static') this._storedCSS[i] = ''; if(this._storedCSS[i] == 'auto' || this._storedCSS[i] == 'static') this._storedCSS[i] = '';
} }
this.currentItem.css(this._storedCSS).removeClass(this.options.cssNamespace+"-sortable-helper"); this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
} else { } else {
this.currentItem.show(); this.currentItem.show();
} }
if(this.fromOutside && !noPropagation) delayedTriggers.push(function(event) { this._trigger("receive", event, this._uiHash(this.fromOutside)); }); if(this.fromOutside && !noPropagation) delayedTriggers.push(function(event) { this._trigger("receive", event, this._uiHash(this.fromOutside)); });
if((this.fromOutside || this.domPosition.prev != this.currentItem.prev().not("."+this.options.cssNamespace+"-sortable-helper")[0] || this.domPosition.parent != this.currentItem.parent()[0]) && !noPropagation) delayedTriggers.push(function(event) { this._trigger("update", event, this._uiHash()); }); //Trigger update callback if the DOM position has changed if((this.fromOutside || this.domPosition.prev != this.currentItem.prev().not(".ui-sortable-helper")[0] || this.domPosition.parent != this.currentItem.parent()[0]) && !noPropagation) delayedTriggers.push(function(event) { this._trigger("update", event, this._uiHash()); }); //Trigger update callback if the DOM position has changed
if(!$.ui.contains(this.element[0], this.currentItem[0])) { //Node was moved out of the current element if(!$.ui.contains(this.element[0], this.currentItem[0])) { //Node was moved out of the current element
if(!noPropagation) delayedTriggers.push(function(event) { this._trigger("remove", event, this._uiHash()); }); if(!noPropagation) delayedTriggers.push(function(event) { this._trigger("remove", event, this._uiHash()); });
for (var i = this.containers.length - 1; i >= 0; i--){ for (var i = this.containers.length - 1; i >= 0; i--){
@ -999,7 +999,6 @@ $.extend($.ui.sortable, {
cancel: ":input,option", cancel: ":input,option",
connectWith: false, connectWith: false,
containment: false, containment: false,
cssNamespace: 'ui',
cursor: 'auto', cursor: 'auto',
cursorAt: false, cursorAt: false,
delay: 0, delay: 0,