library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2025-01-07 20:34:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

All: Convert single quotes to double quotes.

Browse Source
This commit is contained in:
Mike Sherov 2012-12-25 12:01:09 -05:00
parent 63d624fcb5
commit 74d7eac2da
12 changed files with 654 additions and 653 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui/.jshintrc
View File

@ -8,6 +8,7 @@
"latedef": true, "latedef": true,
"noarg": true, "noarg": true,
"onevar": true, "onevar": true,
"quotmark": "double",
"trailing": true, "trailing": true,
"undef": true, "undef": true,
"unused": true, "unused": true,

8
ui/jquery.ui.core.js vendored
View File

@ -69,17 +69,17 @@ $.fn.extend({
scrollParent: function() { scrollParent: function() {
var scrollParent; var scrollParent;
if (($.ui.ie && (/(static|relative)/).test(this.css('position'))) || (/absolute/).test(this.css('position'))) { if (($.ui.ie && (/(static|relative)/).test(this.css("position"))) || (/absolute/).test(this.css("position"))) {
scrollParent = this.parents().filter(function() { scrollParent = this.parents().filter(function() {
return (/(relative|absolute|fixed)/).test($.css(this,'position')) && (/(auto|scroll)/).test($.css(this,'overflow')+$.css(this,'overflow-y')+$.css(this,'overflow-x')); return (/(relative|absolute|fixed)/).test($.css(this,"position")) && (/(auto|scroll)/).test($.css(this,"overflow")+$.css(this,"overflow-y")+$.css(this,"overflow-x"));
}).eq(0); }).eq(0);
} else { } else {
scrollParent = this.parents().filter(function() { scrollParent = this.parents().filter(function() {
return (/(auto|scroll)/).test($.css(this,'overflow')+$.css(this,'overflow-y')+$.css(this,'overflow-x')); return (/(auto|scroll)/).test($.css(this,"overflow")+$.css(this,"overflow-y")+$.css(this,"overflow-x"));
}).eq(0); }).eq(0);
} }
return (/fixed/).test(this.css('position')) || !scrollParent.length ? $(document) : scrollParent; return (/fixed/).test(this.css("position")) || !scrollParent.length ? $(document) : scrollParent;
}, },
zIndex: function( zIndex ) { zIndex: function( zIndex ) {

794
ui/jquery.ui.datepicker.js vendored
View File

File diff suppressed because it is too large Load Diff

2
ui/jquery.ui.dialog.js vendored
View File

@ -466,7 +466,7 @@ $.widget( "ui.dialog", {
// .ui-resizable has position: relative defined in the stylesheet // .ui-resizable has position: relative defined in the stylesheet
// but dialogs have to use absolute or fixed positioning // but dialogs have to use absolute or fixed positioning
position = this.uiDialog.css("position"), position = this.uiDialog.css("position"),
resizeHandles = typeof handles === 'string' ? resizeHandles = typeof handles === "string" ?
handles : handles :
"n,e,s,w,se,sw,ne,nw"; "n,e,s,w,se,sw,ne,nw";

112
ui/jquery.ui.draggable.js vendored
View File

@ -46,8 +46,8 @@ $.widget("ui.draggable", $.ui.mouse, {
}, },
_create: function() { _create: function() {
if (this.options.helper === 'original' && !(/^(?:r|a|f)/).test(this.element.css("position"))) { if (this.options.helper === "original" && !(/^(?:r|a|f)/).test(this.element.css("position"))) {
this.element[0].style.position = 'relative'; this.element[0].style.position = "relative";
} }
if (this.options.addClasses){ if (this.options.addClasses){
this.element.addClass("ui-draggable"); this.element.addClass("ui-draggable");
@ -70,7 +70,7 @@ $.widget("ui.draggable", $.ui.mouse, {
var o = this.options; var o = this.options;
// among others, prevent a drag on a resizable-handle // among others, prevent a drag on a resizable-handle
if (this.helper || o.disabled || $(event.target).closest('.ui-resizable-handle').length > 0) { if (this.helper || o.disabled || $(event.target).closest(".ui-resizable-handle").length > 0) {
return false; return false;
} }
@ -81,7 +81,7 @@ $.widget("ui.draggable", $.ui.mouse, {
} }
$(o.iframeFix === true ? "iframe" : o.iframeFix).each(function() { $(o.iframeFix === true ? "iframe" : o.iframeFix).each(function() {
$('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>') $("<div class='ui-draggable-iframeFix' style='background: #fff;'></div>")
.css({ .css({
width: this.offsetWidth+"px", height: this.offsetHeight+"px", width: this.offsetWidth+"px", height: this.offsetHeight+"px",
position: "absolute", opacity: "0.001", zIndex: 1000 position: "absolute", opacity: "0.001", zIndex: 1000
@ -144,7 +144,7 @@ $.widget("ui.draggable", $.ui.mouse, {
this.originalPageX = event.pageX; this.originalPageX = event.pageX;
this.originalPageY = event.pageY; this.originalPageY = event.pageY;
//Adjust the mouse offset relative to the helper if 'cursorAt' is supplied //Adjust the mouse offset relative to the helper if "cursorAt" is supplied
(o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt)); (o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt));
//Set a containment if given in the options //Set a containment if given in the options
@ -186,7 +186,7 @@ $.widget("ui.draggable", $.ui.mouse, {
//Call plugins and callbacks and use the resulting position if something is returned //Call plugins and callbacks and use the resulting position if something is returned
if (!noPropagation) { if (!noPropagation) {
var ui = this._uiHash(); var ui = this._uiHash();
if(this._trigger('drag', event, ui) === false) { if(this._trigger("drag", event, ui) === false) {
this._mouseUp({}); this._mouseUp({});
return false; return false;
} }
@ -194,10 +194,10 @@ $.widget("ui.draggable", $.ui.mouse, {
} }
if(!this.options.axis || this.options.axis !== "y") { if(!this.options.axis || this.options.axis !== "y") {
this.helper[0].style.left = this.position.left+'px'; this.helper[0].style.left = this.position.left+"px";
} }
if(!this.options.axis || this.options.axis !== "x") { if(!this.options.axis || this.options.axis !== "x") {
this.helper[0].style.top = this.position.top+'px'; this.helper[0].style.top = this.position.top+"px";
} }
if($.ui.ddmanager) { if($.ui.ddmanager) {
$.ui.ddmanager.drag(this, event); $.ui.ddmanager.drag(this, event);
@ -294,10 +294,10 @@ $.widget("ui.draggable", $.ui.mouse, {
_createHelper: function(event) { _createHelper: function(event) {
var o = this.options, var o = this.options,
helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event])) : (o.helper === 'clone' ? this.element.clone().removeAttr('id') : this.element); helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event])) : (o.helper === "clone" ? this.element.clone().removeAttr("id") : this.element);
if(!helper.parents('body').length) { if(!helper.parents("body").length) {
helper.appendTo((o.appendTo === 'parent' ? this.element[0].parentNode : o.appendTo)); helper.appendTo((o.appendTo === "parent" ? this.element[0].parentNode : o.appendTo));
} }
if(helper[0] !== this.element[0] && !(/(fixed|absolute)/).test(helper.css("position"))) { if(helper[0] !== this.element[0] && !(/(fixed|absolute)/).test(helper.css("position"))) {
@ -309,22 +309,22 @@ $.widget("ui.draggable", $.ui.mouse, {
}, },
_adjustOffsetFromHelper: function(obj) { _adjustOffsetFromHelper: function(obj) {
if (typeof obj === 'string') { if (typeof obj === "string") {
obj = obj.split(' '); obj = obj.split(" ");
} }
if ($.isArray(obj)) { if ($.isArray(obj)) {
obj = {left: +obj[0], top: +obj[1] || 0}; obj = {left: +obj[0], top: +obj[1] || 0};
} }
if ('left' in obj) { if ("left" in obj) {
this.offset.click.left = obj.left + this.margins.left; this.offset.click.left = obj.left + this.margins.left;
} }
if ('right' in obj) { if ("right" in obj) {
this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left; this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
} }
if ('top' in obj) { if ("top" in obj) {
this.offset.click.top = obj.top + this.margins.top; this.offset.click.top = obj.top + this.margins.top;
} }
if ('bottom' in obj) { if ("bottom" in obj) {
this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top; this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
} }
}, },
@ -339,7 +339,7 @@ $.widget("ui.draggable", $.ui.mouse, {
// 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent // 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent
// 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that // 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that
// the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag // the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag
if(this.cssPosition === 'absolute' && this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) { if(this.cssPosition === "absolute" && this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) {
po.left += this.scrollParent.scrollLeft(); po.left += this.scrollParent.scrollLeft();
po.top += this.scrollParent.scrollTop(); po.top += this.scrollParent.scrollTop();
} }
@ -347,7 +347,7 @@ $.widget("ui.draggable", $.ui.mouse, {
//This needs to be actually done for all browsers, since pageX/pageY includes this information //This needs to be actually done for all browsers, since pageX/pageY includes this information
//Ugly IE fix //Ugly IE fix
if((this.offsetParent[0] === document.body) || if((this.offsetParent[0] === document.body) ||
(this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() === 'html' && $.ui.ie)) { (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() === "html" && $.ui.ie)) {
po = { top: 0, left: 0 }; po = { top: 0, left: 0 };
} }
@ -393,15 +393,15 @@ $.widget("ui.draggable", $.ui.mouse, {
var over, c, ce, var over, c, ce,
o = this.options; o = this.options;
if(o.containment === 'parent') { if(o.containment === "parent") {
o.containment = this.helper[0].parentNode; o.containment = this.helper[0].parentNode;
} }
if(o.containment === 'document' || o.containment === 'window') { if(o.containment === "document" || o.containment === "window") {
this.containment = [ this.containment = [
o.containment === 'document' ? 0 : $(window).scrollLeft() - this.offset.relative.left - this.offset.parent.left, o.containment === "document" ? 0 : $(window).scrollLeft() - this.offset.relative.left - this.offset.parent.left,
o.containment === 'document' ? 0 : $(window).scrollTop() - this.offset.relative.top - this.offset.parent.top, o.containment === "document" ? 0 : $(window).scrollTop() - this.offset.relative.top - this.offset.parent.top,
(o.containment === 'document' ? 0 : $(window).scrollLeft()) + $(o.containment === 'document' ? document : window).width() - this.helperProportions.width - this.margins.left, (o.containment === "document" ? 0 : $(window).scrollLeft()) + $(o.containment === "document" ? document : window).width() - this.helperProportions.width - this.margins.left,
(o.containment === 'document' ? 0 : $(window).scrollTop()) + ($(o.containment === 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top (o.containment === "document" ? 0 : $(window).scrollTop()) + ($(o.containment === "document" ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top
]; ];
} }
@ -413,7 +413,7 @@ $.widget("ui.draggable", $.ui.mouse, {
return; return;
} }
over = ($(ce).css("overflow") !== 'hidden'); over = ($(ce).css("overflow") !== "hidden");
this.containment = [ this.containment = [
(parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0), (parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0),
@ -436,20 +436,20 @@ $.widget("ui.draggable", $.ui.mouse, {
} }
var mod = d === "absolute" ? 1 : -1, var mod = d === "absolute" ? 1 : -1,
scroll = this.cssPosition === 'absolute' && !(this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName); scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
return { return {
top: ( top: (
pos.top + // The absolute mouse position pos.top + // The absolute mouse position
this.offset.relative.top * mod + // Only for relative positioned nodes: Relative offset from element to offset parent this.offset.relative.top * mod + // Only for relative positioned nodes: Relative offset from element to offset parent
this.offset.parent.top * mod - // The offsetParent's offset without borders (offset + border) this.offset.parent.top * mod - // The offsetParent's offset without borders (offset + border)
( ( this.cssPosition === 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod) ( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod)
), ),
left: ( left: (
pos.left + // The absolute mouse position pos.left + // The absolute mouse position
this.offset.relative.left * mod + // Only for relative positioned nodes: Relative offset from element to offset parent this.offset.relative.left * mod + // Only for relative positioned nodes: Relative offset from element to offset parent
this.offset.parent.left * mod - // The offsetParent's offset without borders (offset + border) this.offset.parent.left * mod - // The offsetParent's offset without borders (offset + border)
( ( this.cssPosition === 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod) ( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod)
) )
}; };
@ -459,7 +459,7 @@ $.widget("ui.draggable", $.ui.mouse, {
var containment, co, top, left, var containment, co, top, left,
o = this.options, o = this.options,
scroll = this.cssPosition === 'absolute' && !(this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent,
scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName), scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName),
pageX = event.pageX, pageX = event.pageX,
pageY = event.pageY; pageY = event.pageY;
@ -513,14 +513,14 @@ $.widget("ui.draggable", $.ui.mouse, {
this.offset.click.top - // Click offset (relative to the element) this.offset.click.top - // Click offset (relative to the element)
this.offset.relative.top - // Only for relative positioned nodes: Relative offset from element to offset parent this.offset.relative.top - // Only for relative positioned nodes: Relative offset from element to offset parent
this.offset.parent.top + // The offsetParent's offset without borders (offset + border) this.offset.parent.top + // The offsetParent's offset without borders (offset + border)
( ( this.cssPosition === 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) )) ( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ))
), ),
left: ( left: (
pageX - // The absolute mouse position pageX - // The absolute mouse position
this.offset.click.left - // Click offset (relative to the element) this.offset.click.left - // Click offset (relative to the element)
this.offset.relative.left - // Only for relative positioned nodes: Relative offset from element to offset parent this.offset.relative.left - // Only for relative positioned nodes: Relative offset from element to offset parent
this.offset.parent.left + // The offsetParent's offset without borders (offset + border) this.offset.parent.left + // The offsetParent's offset without borders (offset + border)
( ( this.cssPosition === 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() )) ( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ))
) )
}; };
@ -567,7 +567,7 @@ $.ui.plugin.add("draggable", "connectToSortable", {
uiSortable = $.extend({}, ui, { item: inst.element }); uiSortable = $.extend({}, ui, { item: inst.element });
inst.sortables = []; inst.sortables = [];
$(o.connectToSortable).each(function() { $(o.connectToSortable).each(function() {
var sortable = $.data(this, 'ui-sortable'); var sortable = $.data(this, "ui-sortable");
if (sortable && !sortable.options.disabled) { if (sortable && !sortable.options.disabled) {
inst.sortables.push({ inst.sortables.push({
instance: sortable, instance: sortable,
@ -593,7 +593,7 @@ $.ui.plugin.add("draggable", "connectToSortable", {
inst.cancelHelperRemoval = true; //Don't remove the helper in the draggable instance inst.cancelHelperRemoval = true; //Don't remove the helper in the draggable instance
this.instance.cancelHelperRemoval = false; //Remove it in the sortable instance (so sortable plugins like revert still work) this.instance.cancelHelperRemoval = false; //Remove it in the sortable instance (so sortable plugins like revert still work)
//The sortable revert is supported, and we have to set a temporary dropped variable on the draggable to support revert: 'valid/invalid' //The sortable revert is supported, and we have to set a temporary dropped variable on the draggable to support revert: "valid/invalid"
if(this.shouldRevert) { if(this.shouldRevert) {
this.instance.options.revert = true; this.instance.options.revert = true;
} }
@ -604,8 +604,8 @@ $.ui.plugin.add("draggable", "connectToSortable", {
this.instance.options.helper = this.instance.options._helper; this.instance.options.helper = this.instance.options._helper;
//If the helper has been the original item, restore properties in the sortable //If the helper has been the original item, restore properties in the sortable
if(inst.options.helper === 'original') { if(inst.options.helper === "original") {
this.instance.currentItem.css({ top: 'auto', left: 'auto' }); this.instance.currentItem.css({ top: "auto", left: "auto" });
} }
} else { } else {
@ -655,7 +655,7 @@ $.ui.plugin.add("draggable", "connectToSortable", {
//Now we fake the start of dragging for the sortable instance, //Now we fake the start of dragging for the sortable instance,
//by cloning the list group item, appending it to the sortable and using it as inst.currentItem //by cloning the list group item, appending it to the sortable and using it as inst.currentItem
//We can then fire the start event of the sortable with our passed browser event, and our own helper (so it doesn't create a new one) //We can then fire the start event of the sortable with our passed browser event, and our own helper (so it doesn't create a new one)
this.instance.currentItem = $(that).clone().removeAttr('id').appendTo(this.instance.element).data("ui-sortable-item", true); this.instance.currentItem = $(that).clone().removeAttr("id").appendTo(this.instance.element).data("ui-sortable-item", true);
this.instance.options._helper = this.instance.options.helper; //Store helper option to later restore it this.instance.options._helper = this.instance.options.helper; //Store helper option to later restore it
this.instance.options.helper = function() { return ui.helper[0]; }; this.instance.options.helper = function() { return ui.helper[0]; };
@ -695,7 +695,7 @@ $.ui.plugin.add("draggable", "connectToSortable", {
this.instance.options.revert = false; this.instance.options.revert = false;
// The out event needs to be triggered independently // The out event needs to be triggered independently
this.instance._trigger('out', event, this.instance._uiHash(this.instance)); this.instance._trigger("out", event, this.instance._uiHash(this.instance));
this.instance._mouseStop(event, true); this.instance._mouseStop(event, true);
this.instance.options.helper = this.instance.options._helper; this.instance.options.helper = this.instance.options._helper;
@ -719,32 +719,32 @@ $.ui.plugin.add("draggable", "connectToSortable", {
$.ui.plugin.add("draggable", "cursor", { $.ui.plugin.add("draggable", "cursor", {
start: function() { start: function() {
var t = $('body'), o = $(this).data('ui-draggable').options; var t = $("body"), o = $(this).data("ui-draggable").options;
if (t.css("cursor")) { if (t.css("cursor")) {
o._cursor = t.css("cursor"); o._cursor = t.css("cursor");
} }
t.css("cursor", o.cursor); t.css("cursor", o.cursor);
}, },
stop: function() { stop: function() {
var o = $(this).data('ui-draggable').options; var o = $(this).data("ui-draggable").options;
if (o._cursor) { if (o._cursor) {
$('body').css("cursor", o._cursor); $("body").css("cursor", o._cursor);
} }
} }
}); });
$.ui.plugin.add("draggable", "opacity", { $.ui.plugin.add("draggable", "opacity", {
start: function(event, ui) { start: function(event, ui) {
var t = $(ui.helper), o = $(this).data('ui-draggable').options; var t = $(ui.helper), o = $(this).data("ui-draggable").options;
if(t.css("opacity")) { if(t.css("opacity")) {
o._opacity = t.css("opacity"); o._opacity = t.css("opacity");
} }
t.css('opacity', o.opacity); t.css("opacity", o.opacity);
}, },
stop: function(event, ui) { stop: function(event, ui) {
var o = $(this).data('ui-draggable').options; var o = $(this).data("ui-draggable").options;
if(o._opacity) { if(o._opacity) {
$(ui.helper).css('opacity', o._opacity); $(ui.helper).css("opacity", o._opacity);
} }
} }
}); });
@ -752,7 +752,7 @@ $.ui.plugin.add("draggable", "opacity", {
$.ui.plugin.add("draggable", "scroll", { $.ui.plugin.add("draggable", "scroll", {
start: function() { start: function() {
var i = $(this).data("ui-draggable"); var i = $(this).data("ui-draggable");
if(i.scrollParent[0] !== document && i.scrollParent[0].tagName !== 'HTML') { if(i.scrollParent[0] !== document && i.scrollParent[0].tagName !== "HTML") {
i.overflowOffset = i.scrollParent.offset(); i.overflowOffset = i.scrollParent.offset();
} }
}, },
@ -760,9 +760,9 @@ $.ui.plugin.add("draggable", "scroll", {
var i = $(this).data("ui-draggable"), o = i.options, scrolled = false; var i = $(this).data("ui-draggable"), o = i.options, scrolled = false;
if(i.scrollParent[0] !== document && i.scrollParent[0].tagName !== 'HTML') { if(i.scrollParent[0] !== document && i.scrollParent[0].tagName !== "HTML") {
if(!o.axis || o.axis !== 'x') { if(!o.axis || o.axis !== "x") {
if((i.overflowOffset.top + i.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity) { if((i.overflowOffset.top + i.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity) {
i.scrollParent[0].scrollTop = scrolled = i.scrollParent[0].scrollTop + o.scrollSpeed; i.scrollParent[0].scrollTop = scrolled = i.scrollParent[0].scrollTop + o.scrollSpeed;
} else if(event.pageY - i.overflowOffset.top < o.scrollSensitivity) { } else if(event.pageY - i.overflowOffset.top < o.scrollSensitivity) {
@ -770,7 +770,7 @@ $.ui.plugin.add("draggable", "scroll", {
} }
} }
if(!o.axis || o.axis !== 'y') { if(!o.axis || o.axis !== "y") {
if((i.overflowOffset.left + i.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity) { if((i.overflowOffset.left + i.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity) {
i.scrollParent[0].scrollLeft = scrolled = i.scrollParent[0].scrollLeft + o.scrollSpeed; i.scrollParent[0].scrollLeft = scrolled = i.scrollParent[0].scrollLeft + o.scrollSpeed;
} else if(event.pageX - i.overflowOffset.left < o.scrollSensitivity) { } else if(event.pageX - i.overflowOffset.left < o.scrollSensitivity) {
@ -780,7 +780,7 @@ $.ui.plugin.add("draggable", "scroll", {
} else { } else {
if(!o.axis || o.axis !== 'x') { if(!o.axis || o.axis !== "x") {
if(event.pageY - $(document).scrollTop() < o.scrollSensitivity) { if(event.pageY - $(document).scrollTop() < o.scrollSensitivity) {
scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed); scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
} else if($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity) { } else if($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity) {
@ -788,7 +788,7 @@ $.ui.plugin.add("draggable", "scroll", {
} }
} }
if(!o.axis || o.axis !== 'y') { if(!o.axis || o.axis !== "y") {
if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity) { if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity) {
scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed); scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
} else if($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity) { } else if($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity) {
@ -813,7 +813,7 @@ $.ui.plugin.add("draggable", "snap", {
i.snapElements = []; i.snapElements = [];
$(o.snap.constructor !== String ? ( o.snap.items || ':data(ui-draggable)' ) : o.snap).each(function() { $(o.snap.constructor !== String ? ( o.snap.items || ":data(ui-draggable)" ) : o.snap).each(function() {
var $t = $(this), var $t = $(this),
$o = $t.offset(); $o = $t.offset();
if(this !== i.element[0]) { if(this !== i.element[0]) {
@ -851,7 +851,7 @@ $.ui.plugin.add("draggable", "snap", {
continue; continue;
} }
if(o.snapMode !== 'inner') { if(o.snapMode !== "inner") {
ts = Math.abs(t - y2) <= d; ts = Math.abs(t - y2) <= d;
bs = Math.abs(b - y1) <= d; bs = Math.abs(b - y1) <= d;
ls = Math.abs(l - x2) <= d; ls = Math.abs(l - x2) <= d;
@ -872,7 +872,7 @@ $.ui.plugin.add("draggable", "snap", {
first = (ts || bs || ls || rs); first = (ts || bs || ls || rs);
if(o.snapMode !== 'outer') { if(o.snapMode !== "outer") {
ts = Math.abs(t - y1) <= d; ts = Math.abs(t - y1) <= d;
bs = Math.abs(b - y2) <= d; bs = Math.abs(b - y2) <= d;
ls = Math.abs(l - x1) <= d; ls = Math.abs(l - x1) <= d;
@ -928,12 +928,12 @@ $.ui.plugin.add("draggable", "zIndex", {
if(t.css("zIndex")) { if(t.css("zIndex")) {
o._zIndex = t.css("zIndex"); o._zIndex = t.css("zIndex");
} }
t.css('zIndex', o.zIndex); t.css("zIndex", o.zIndex);
}, },
stop: function(event, ui) { stop: function(event, ui) {
var o = $(this).data("ui-draggable").options; var o = $(this).data("ui-draggable").options;
if(o._zIndex) { if(o._zIndex) {
$(ui.helper).css('zIndex', o._zIndex); $(ui.helper).css("zIndex", o._zIndex);
} }
} }
}); });

46
ui/jquery.ui.droppable.js vendored
View File

@ -24,13 +24,13 @@ $.widget("ui.droppable", {
version: "@VERSION", version: "@VERSION",
widgetEventPrefix: "drop", widgetEventPrefix: "drop",
options: { options: {
accept: '*', accept: "*",
activeClass: false, activeClass: false,
addClasses: true, addClasses: true,
greedy: false, greedy: false,
hoverClass: false, hoverClass: false,
scope: 'default', scope: "default",
tolerance: 'intersect' tolerance: "intersect"
}, },
_create: function() { _create: function() {
@ -70,7 +70,7 @@ $.widget("ui.droppable", {
_setOption: function(key, value) { _setOption: function(key, value) {
if(key === 'accept') { if(key === "accept") {
this.accept = $.isFunction(value) ? value : function(d) { this.accept = $.isFunction(value) ? value : function(d) {
return d.is(value); return d.is(value);
}; };
@ -84,7 +84,7 @@ $.widget("ui.droppable", {
this.element.addClass(this.options.activeClass); this.element.addClass(this.options.activeClass);
} }
if(draggable){ if(draggable){
this._trigger('activate', event, this.ui(draggable)); this._trigger("activate", event, this.ui(draggable));
} }
}, },
@ -94,7 +94,7 @@ $.widget("ui.droppable", {
this.element.removeClass(this.options.activeClass); this.element.removeClass(this.options.activeClass);
} }
if(draggable){ if(draggable){
this._trigger('deactivate', event, this.ui(draggable)); this._trigger("deactivate", event, this.ui(draggable));
} }
}, },
@ -111,7 +111,7 @@ $.widget("ui.droppable", {
if(this.options.hoverClass) { if(this.options.hoverClass) {
this.element.addClass(this.options.hoverClass); this.element.addClass(this.options.hoverClass);
} }
this._trigger('over', event, this.ui(draggable)); this._trigger("over", event, this.ui(draggable));
} }
}, },
@ -129,7 +129,7 @@ $.widget("ui.droppable", {
if(this.options.hoverClass) { if(this.options.hoverClass) {
this.element.removeClass(this.options.hoverClass); this.element.removeClass(this.options.hoverClass);
} }
this._trigger('out', event, this.ui(draggable)); this._trigger("out", event, this.ui(draggable));
} }
}, },
@ -145,7 +145,7 @@ $.widget("ui.droppable", {
} }
this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function() { this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function() {
var inst = $.data(this, 'ui-droppable'); var inst = $.data(this, "ui-droppable");
if( if(
inst.options.greedy && inst.options.greedy &&
!inst.options.disabled && !inst.options.disabled &&
@ -165,7 +165,7 @@ $.widget("ui.droppable", {
if(this.options.hoverClass) { if(this.options.hoverClass) {
this.element.removeClass(this.options.hoverClass); this.element.removeClass(this.options.hoverClass);
} }
this._trigger('drop', event, this.ui(draggable)); this._trigger("drop", event, this.ui(draggable));
return this.element; return this.element;
} }
@ -197,18 +197,18 @@ $.ui.intersect = function(draggable, droppable, toleranceMode) {
t = droppable.offset.top, b = t + droppable.proportions.height; t = droppable.offset.top, b = t + droppable.proportions.height;
switch (toleranceMode) { switch (toleranceMode) {
case 'fit': case "fit":
return (l <= x1 && x2 <= r && t <= y1 && y2 <= b); return (l <= x1 && x2 <= r && t <= y1 && y2 <= b);
case 'intersect': case "intersect":
return (l < x1 + (draggable.helperProportions.width / 2) && // Right Half return (l < x1 + (draggable.helperProportions.width / 2) && // Right Half
x2 - (draggable.helperProportions.width / 2) < r && // Left Half x2 - (draggable.helperProportions.width / 2) < r && // Left Half
t < y1 + (draggable.helperProportions.height / 2) && // Bottom Half t < y1 + (draggable.helperProportions.height / 2) && // Bottom Half
y2 - (draggable.helperProportions.height / 2) < b ); // Top Half y2 - (draggable.helperProportions.height / 2) < b ); // Top Half
case 'pointer': case "pointer":
draggableLeft = ((draggable.positionAbs || draggable.position.absolute).left + (draggable.clickOffset || draggable.offset.click).left); draggableLeft = ((draggable.positionAbs || draggable.position.absolute).left + (draggable.clickOffset || draggable.offset.click).left);
draggableTop = ((draggable.positionAbs || draggable.position.absolute).top + (draggable.clickOffset || draggable.offset.click).top); draggableTop = ((draggable.positionAbs || draggable.position.absolute).top + (draggable.clickOffset || draggable.offset.click).top);
return isOverAxis( draggableTop, t, droppable.proportions.height ) && isOverAxis( draggableLeft, l, droppable.proportions.width ); return isOverAxis( draggableTop, t, droppable.proportions.height ) && isOverAxis( draggableLeft, l, droppable.proportions.width );
case 'touch': case "touch":
return ( return (
(y1 >= t && y1 <= b) || // Top edge touching (y1 >= t && y1 <= b) || // Top edge touching
(y2 >= t && y2 <= b) || // Bottom edge touching (y2 >= t && y2 <= b) || // Bottom edge touching
@ -229,7 +229,7 @@ $.ui.intersect = function(draggable, droppable, toleranceMode) {
*/ */
$.ui.ddmanager = { $.ui.ddmanager = {
current: null, current: null,
droppables: { 'default': [] }, droppables: { "default": [] },
prepareOffsets: function(t, event) { prepareOffsets: function(t, event) {
var i, j, var i, j,
@ -314,7 +314,7 @@ $.ui.ddmanager = {
var parentInstance, scope, parent, var parentInstance, scope, parent,
intersects = $.ui.intersect(draggable, this, this.options.tolerance), intersects = $.ui.intersect(draggable, this, this.options.tolerance),
c = !intersects && this.isover ? 'isout' : (intersects && !this.isover ? 'isover' : null); c = !intersects && this.isover ? "isout" : (intersects && !this.isover ? "isover" : null);
if(!c) { if(!c) {
return; return;
} }
@ -322,29 +322,29 @@ $.ui.ddmanager = {
if (this.options.greedy) { if (this.options.greedy) {
// find droppable parents with same scope // find droppable parents with same scope
scope = this.options.scope; scope = this.options.scope;
parent = this.element.parents(':data(ui-droppable)').filter(function () { parent = this.element.parents(":data(ui-droppable)").filter(function () {
return $.data(this, 'ui-droppable').options.scope === scope; return $.data(this, "ui-droppable").options.scope === scope;
}); });
if (parent.length) { if (parent.length) {
parentInstance = $.data(parent[0], 'ui-droppable'); parentInstance = $.data(parent[0], "ui-droppable");
parentInstance.greedyChild = (c === 'isover'); parentInstance.greedyChild = (c === "isover");
} }
} }
// we just moved into a greedy child // we just moved into a greedy child
if (parentInstance && c === 'isover') { if (parentInstance && c === "isover") {
parentInstance.isover = false; parentInstance.isover = false;
parentInstance.isout = true; parentInstance.isout = true;
parentInstance._out.call(parentInstance, event); parentInstance._out.call(parentInstance, event);
} }
this[c] = true; this[c] = true;
this[c === 'isout' ? 'isover' : 'isout'] = false; this[c === "isout" ? "isover" : "isout"] = false;
this[c === "isover" ? "_over" : "_out"].call(this, event); this[c === "isover" ? "_over" : "_out"].call(this, event);
// we just moved out of a greedy child // we just moved out of a greedy child
if (parentInstance && c === 'isout') { if (parentInstance && c === "isout") {
parentInstance.isout = false; parentInstance.isout = false;
parentInstance.isover = true; parentInstance.isover = true;
parentInstance._over.call(parentInstance, event); parentInstance._over.call(parentInstance, event);

2
ui/jquery.ui.effect-transfer.js vendored
View File

@ -28,7 +28,7 @@ $.effects.effect.transfer = function( o, done ) {
width: target.innerWidth() width: target.innerWidth()
}, },
startPosition = elem.offset(), startPosition = elem.offset(),
transfer = $( '<div class="ui-effects-transfer"></div>' ) transfer = $( "<div class='ui-effects-transfer'></div>" )
.appendTo( document.body ) .appendTo( document.body )
.addClass( o.className ) .addClass( o.className )
.css({ .css({

2
ui/jquery.ui.effect.js vendored
View File

@ -818,7 +818,7 @@ $.effects.animateClass = function( value, duration, easing, callback ) {
$.each( arguments, function() { $.each( arguments, function() {
var el = this.el; var el = this.el;
$.each( this.diff, function(key) { $.each( this.diff, function(key) {
el.css( key, '' ); el.css( key, "" );
}); });
}); });

30
ui/jquery.ui.mouse.js vendored
View File

@ -21,7 +21,7 @@ $( document ).mouseup( function() {
$.widget("ui.mouse", { $.widget("ui.mouse", {
version: "@VERSION", version: "@VERSION",
options: { options: {
cancel: 'input,textarea,button,select,option', cancel: "input,textarea,button,select,option",
distance: 1, distance: 1,
delay: 0 delay: 0
}, },
@ -29,12 +29,12 @@ $.widget("ui.mouse", {
var that = this; var that = this;
this.element this.element
.bind('mousedown.'+this.widgetName, function(event) { .bind("mousedown."+this.widgetName, function(event) {
return that._mouseDown(event); return that._mouseDown(event);
}) })
.bind('click.'+this.widgetName, function(event) { .bind("click."+this.widgetName, function(event) {
if (true === $.data(event.target, that.widgetName + '.preventClickEvent')) { if (true === $.data(event.target, that.widgetName + ".preventClickEvent")) {
$.removeData(event.target, that.widgetName + '.preventClickEvent'); $.removeData(event.target, that.widgetName + ".preventClickEvent");
event.stopImmediatePropagation(); event.stopImmediatePropagation();
return false; return false;
} }
@ -46,11 +46,11 @@ $.widget("ui.mouse", {
// TODO: make sure destroying one instance of mouse doesn't mess with // TODO: make sure destroying one instance of mouse doesn't mess with
// other instances of mouse // other instances of mouse
_mouseDestroy: function() { _mouseDestroy: function() {
this.element.unbind('.'+this.widgetName); this.element.unbind("."+this.widgetName);
if ( this._mouseMoveDelegate ) { if ( this._mouseMoveDelegate ) {
$(document) $(document)
.unbind('mousemove.'+this.widgetName, this._mouseMoveDelegate) .unbind("mousemove."+this.widgetName, this._mouseMoveDelegate)
.unbind('mouseup.'+this.widgetName, this._mouseUpDelegate); .unbind("mouseup."+this.widgetName, this._mouseUpDelegate);
} }
}, },
@ -88,8 +88,8 @@ $.widget("ui.mouse", {
} }
// Click event may never have fired (Gecko & Opera) // Click event may never have fired (Gecko & Opera)
if (true === $.data(event.target, this.widgetName + '.preventClickEvent')) { if (true === $.data(event.target, this.widgetName + ".preventClickEvent")) {
$.removeData(event.target, this.widgetName + '.preventClickEvent'); $.removeData(event.target, this.widgetName + ".preventClickEvent");
} }
// these delegates are required to keep context // these delegates are required to keep context
@ -100,8 +100,8 @@ $.widget("ui.mouse", {
return that._mouseUp(event); return that._mouseUp(event);
}; };
$(document) $(document)
.bind('mousemove.'+this.widgetName, this._mouseMoveDelegate) .bind("mousemove."+this.widgetName, this._mouseMoveDelegate)
.bind('mouseup.'+this.widgetName, this._mouseUpDelegate); .bind("mouseup."+this.widgetName, this._mouseUpDelegate);
event.preventDefault(); event.preventDefault();
@ -131,14 +131,14 @@ $.widget("ui.mouse", {
_mouseUp: function(event) { _mouseUp: function(event) {
$(document) $(document)
.unbind('mousemove.'+this.widgetName, this._mouseMoveDelegate) .unbind("mousemove."+this.widgetName, this._mouseMoveDelegate)
.unbind('mouseup.'+this.widgetName, this._mouseUpDelegate); .unbind("mouseup."+this.widgetName, this._mouseUpDelegate);
if (this._mouseStarted) { if (this._mouseStarted) {
this._mouseStarted = false; this._mouseStarted = false;
if (event.target === this._mouseDownEvent.target) { if (event.target === this._mouseDownEvent.target) {
$.data(event.target, this.widgetName + '.preventClickEvent', true); $.data(event.target, this.widgetName + ".preventClickEvent", true);
} }
this._mouseStop(event); this._mouseStop(event);

140
ui/jquery.ui.resizable.js vendored
View File

@ -57,7 +57,7 @@ $.widget("ui.resizable", $.ui.mouse, {
aspectRatio: o.aspectRatio, aspectRatio: o.aspectRatio,
originalElement: this.element, originalElement: this.element,
_proportionallyResizeElements: [], _proportionallyResizeElements: [],
_helper: o.helper || o.ghost || o.animate ? o.helper || 'ui-resizable-helper' : null _helper: o.helper || o.ghost || o.animate ? o.helper || "ui-resizable-helper" : null
}); });
//Wrap the element if it cannot hold child nodes //Wrap the element if it cannot hold child nodes
@ -65,18 +65,18 @@ $.widget("ui.resizable", $.ui.mouse, {
//Create a wrapper element and set the wrapper to the new current internal element //Create a wrapper element and set the wrapper to the new current internal element
this.element.wrap( this.element.wrap(
$('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({ $("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({
position: this.element.css('position'), position: this.element.css("position"),
width: this.element.outerWidth(), width: this.element.outerWidth(),
height: this.element.outerHeight(), height: this.element.outerHeight(),
top: this.element.css('top'), top: this.element.css("top"),
left: this.element.css('left') left: this.element.css("left")
}) })
); );
//Overwrite the original this.element //Overwrite the original this.element
this.element = this.element.parent().data( this.element = this.element.parent().data(
"ui-resizable", this.element.data('ui-resizable') "ui-resizable", this.element.data("ui-resizable")
); );
this.elementIsWrapper = true; this.elementIsWrapper = true;
@ -86,25 +86,25 @@ $.widget("ui.resizable", $.ui.mouse, {
this.originalElement.css({ marginLeft: 0, marginTop: 0, marginRight: 0, marginBottom: 0}); this.originalElement.css({ marginLeft: 0, marginTop: 0, marginRight: 0, marginBottom: 0});
//Prevent Safari textarea resize //Prevent Safari textarea resize
this.originalResizeStyle = this.originalElement.css('resize'); this.originalResizeStyle = this.originalElement.css("resize");
this.originalElement.css('resize', 'none'); this.originalElement.css("resize", "none");
//Push the actual element to our proportionallyResize internal array //Push the actual element to our proportionallyResize internal array
this._proportionallyResizeElements.push(this.originalElement.css({ position: 'static', zoom: 1, display: 'block' })); this._proportionallyResizeElements.push(this.originalElement.css({ position: "static", zoom: 1, display: "block" }));
// avoid IE jump (hard set the margin) // avoid IE jump (hard set the margin)
this.originalElement.css({ margin: this.originalElement.css('margin') }); this.originalElement.css({ margin: this.originalElement.css("margin") });
// fix handlers offset // fix handlers offset
this._proportionallyResize(); this._proportionallyResize();
} }
this.handles = o.handles || (!$('.ui-resizable-handle', this.element).length ? "e,s,se" : { n: '.ui-resizable-n', e: '.ui-resizable-e', s: '.ui-resizable-s', w: '.ui-resizable-w', se: '.ui-resizable-se', sw: '.ui-resizable-sw', ne: '.ui-resizable-ne', nw: '.ui-resizable-nw' }); this.handles = o.handles || (!$(".ui-resizable-handle", this.element).length ? "e,s,se" : { n: ".ui-resizable-n", e: ".ui-resizable-e", s: ".ui-resizable-s", w: ".ui-resizable-w", se: ".ui-resizable-se", sw: ".ui-resizable-sw", ne: ".ui-resizable-ne", nw: ".ui-resizable-nw" });
if(this.handles.constructor === String) { if(this.handles.constructor === String) {
if ( this.handles === 'all') { if ( this.handles === "all") {
this.handles = 'n,e,s,w,se,sw,ne,nw'; this.handles = "n,e,s,w,se,sw,ne,nw";
} }
n = this.handles.split(","); n = this.handles.split(",");
@ -113,19 +113,19 @@ $.widget("ui.resizable", $.ui.mouse, {
for(i = 0; i < n.length; i++) { for(i = 0; i < n.length; i++) {
handle = $.trim(n[i]); handle = $.trim(n[i]);
hname = 'ui-resizable-'+handle; hname = "ui-resizable-"+handle;
axis = $('<div class="ui-resizable-handle ' + hname + '"></div>'); axis = $("<div class='ui-resizable-handle " + hname + "'></div>");
// Apply zIndex to all handles - see #7960 // Apply zIndex to all handles - see #7960
axis.css({ zIndex: o.zIndex }); axis.css({ zIndex: o.zIndex });
//TODO : What's going on here? //TODO : What's going on here?
if ('se' === handle) { if ("se" === handle) {
axis.addClass('ui-icon ui-icon-gripsmall-diagonal-se'); axis.addClass("ui-icon ui-icon-gripsmall-diagonal-se");
} }
//Insert into internal handles object and append to element //Insert into internal handles object and append to element
this.handles[handle] = '.ui-resizable-'+handle; this.handles[handle] = ".ui-resizable-"+handle;
this.element.append(axis); this.element.append(axis);
} }
@ -152,10 +152,10 @@ $.widget("ui.resizable", $.ui.mouse, {
padWrapper = /sw|ne|nw|se|n|s/.test(i) ? axis.outerHeight() : axis.outerWidth(); padWrapper = /sw|ne|nw|se|n|s/.test(i) ? axis.outerHeight() : axis.outerWidth();
//The padding type i have to apply... //The padding type i have to apply...
padPos = [ 'padding', padPos = [ "padding",
/ne|nw|n/.test(i) ? 'Top' : /ne|nw|n/.test(i) ? "Top" :
/se|sw|s/.test(i) ? 'Bottom' : /se|sw|s/.test(i) ? "Bottom" :
/^e$/.test(i) ? 'Right' : 'Left' ].join(""); /^e$/.test(i) ? "Right" : "Left" ].join("");
target.css(padPos, padWrapper); target.css(padPos, padWrapper);
@ -173,7 +173,7 @@ $.widget("ui.resizable", $.ui.mouse, {
//TODO: make renderAxis a prototype function //TODO: make renderAxis a prototype function
this._renderAxis(this.element); this._renderAxis(this.element);
this._handles = $('.ui-resizable-handle', this.element) this._handles = $(".ui-resizable-handle", this.element)
.disableSelection(); .disableSelection();
//Matching axis name //Matching axis name
@ -183,7 +183,7 @@ $.widget("ui.resizable", $.ui.mouse, {
axis = this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i); axis = this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);
} }
//Axis, default = se //Axis, default = se
that.axis = axis && axis[1] ? axis[1] : 'se'; that.axis = axis && axis[1] ? axis[1] : "se";
} }
}); });
@ -222,7 +222,7 @@ $.widget("ui.resizable", $.ui.mouse, {
var wrapper, var wrapper,
_destroy = function(exp) { _destroy = function(exp) {
$(exp).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing") $(exp).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing")
.removeData("resizable").removeData("ui-resizable").unbind(".resizable").find('.ui-resizable-handle').remove(); .removeData("resizable").removeData("ui-resizable").unbind(".resizable").find(".ui-resizable-handle").remove();
}; };
//TODO: Unwrap at same DOM position //TODO: Unwrap at same DOM position
@ -230,16 +230,16 @@ $.widget("ui.resizable", $.ui.mouse, {
_destroy(this.element); _destroy(this.element);
wrapper = this.element; wrapper = this.element;
this.originalElement.css({ this.originalElement.css({
position: wrapper.css('position'), position: wrapper.css("position"),
width: wrapper.outerWidth(), width: wrapper.outerWidth(),
height: wrapper.outerHeight(), height: wrapper.outerHeight(),
top: wrapper.css('top'), top: wrapper.css("top"),
left: wrapper.css('left') left: wrapper.css("left")
}).insertAfter( wrapper ); }).insertAfter( wrapper );
wrapper.remove(); wrapper.remove();
} }
this.originalElement.css('resize', this.originalResizeStyle); this.originalElement.css("resize", this.originalResizeStyle);
_destroy(this.originalElement); _destroy(this.originalElement);
return this; return this;
@ -269,16 +269,16 @@ $.widget("ui.resizable", $.ui.mouse, {
this.resizing = true; this.resizing = true;
// bugfix for http://dev.jquery.com/ticket/1749 // bugfix for http://dev.jquery.com/ticket/1749
if ( (/absolute/).test( el.css('position') ) ) { if ( (/absolute/).test( el.css("position") ) ) {
el.css({ position: 'absolute', top: el.css('top'), left: el.css('left') }); el.css({ position: "absolute", top: el.css("top"), left: el.css("left") });
} else if (el.is('.ui-draggable')) { } else if (el.is(".ui-draggable")) {
el.css({ position: 'absolute', top: iniPos.top, left: iniPos.left }); el.css({ position: "absolute", top: iniPos.top, left: iniPos.left });
} }
this._renderProxy(); this._renderProxy();
curleft = num(this.helper.css('left')); curleft = num(this.helper.css("left"));
curtop = num(this.helper.css('top')); curtop = num(this.helper.css("top"));
if (o.containment) { if (o.containment) {
curleft += $(o.containment).scrollLeft() || 0; curleft += $(o.containment).scrollLeft() || 0;
@ -295,10 +295,10 @@ $.widget("ui.resizable", $.ui.mouse, {
this.originalMousePosition = { left: event.pageX, top: event.pageY }; this.originalMousePosition = { left: event.pageX, top: event.pageY };
//Aspect Ratio //Aspect Ratio
this.aspectRatio = (typeof o.aspectRatio === 'number') ? o.aspectRatio : ((this.originalSize.width / this.originalSize.height) || 1); this.aspectRatio = (typeof o.aspectRatio === "number") ? o.aspectRatio : ((this.originalSize.width / this.originalSize.height) || 1);
cursor = $('.ui-resizable-' + this.axis).css('cursor'); cursor = $(".ui-resizable-" + this.axis).css("cursor");
$('body').css('cursor', cursor === 'auto' ? this.axis + '-resize' : cursor); $("body").css("cursor", cursor === "auto" ? this.axis + "-resize" : cursor);
el.addClass("ui-resizable-resizing"); el.addClass("ui-resizable-resizing");
this._propagate("start", event); this._propagate("start", event);
@ -360,7 +360,7 @@ $.widget("ui.resizable", $.ui.mouse, {
// Call the user callback if the element was resized // Call the user callback if the element was resized
if ( ! $.isEmptyObject(props) ) { if ( ! $.isEmptyObject(props) ) {
this._trigger('resize', event, this.ui()); this._trigger("resize", event, this.ui());
} }
return false; return false;
@ -376,12 +376,12 @@ $.widget("ui.resizable", $.ui.mouse, {
pr = this._proportionallyResizeElements; pr = this._proportionallyResizeElements;
ista = pr.length && (/textarea/i).test(pr[0].nodeName); ista = pr.length && (/textarea/i).test(pr[0].nodeName);
soffseth = ista && $.ui.hasScroll(pr[0], 'left') /* TODO - jump height */ ? 0 : that.sizeDiff.height; soffseth = ista && $.ui.hasScroll(pr[0], "left") /* TODO - jump height */ ? 0 : that.sizeDiff.height;
soffsetw = ista ? 0 : that.sizeDiff.width; soffsetw = ista ? 0 : that.sizeDiff.width;
s = { width: (that.helper.width() - soffsetw), height: (that.helper.height() - soffseth) }; s = { width: (that.helper.width() - soffsetw), height: (that.helper.height() - soffseth) };
left = (parseInt(that.element.css('left'), 10) + (that.position.left - that.originalPosition.left)) || null; left = (parseInt(that.element.css("left"), 10) + (that.position.left - that.originalPosition.left)) || null;
top = (parseInt(that.element.css('top'), 10) + (that.position.top - that.originalPosition.top)) || null; top = (parseInt(that.element.css("top"), 10) + (that.position.top - that.originalPosition.top)) || null;
if (!o.animate) { if (!o.animate) {
this.element.css($.extend(s, { top: top, left: left })); this.element.css($.extend(s, { top: top, left: left }));
@ -395,7 +395,7 @@ $.widget("ui.resizable", $.ui.mouse, {
} }
} }
$('body').css('cursor', 'auto'); $("body").css("cursor", "auto");
this.element.removeClass("ui-resizable-resizing"); this.element.removeClass("ui-resizable-resizing");
@ -472,11 +472,11 @@ $.widget("ui.resizable", $.ui.mouse, {
data.height = (data.width / this.aspectRatio); data.height = (data.width / this.aspectRatio);
} }
if (a === 'sw') { if (a === "sw") {
data.left = cpos.left + (csize.width - data.width); data.left = cpos.left + (csize.width - data.width);
data.top = null; data.top = null;
} }
if (a === 'nw') { if (a === "nw") {
data.top = cpos.top + (csize.height - data.height); data.top = cpos.top + (csize.height - data.height);
data.left = cpos.left + (csize.width - data.width); data.left = cpos.left + (csize.width - data.width);
} }
@ -544,8 +544,8 @@ $.widget("ui.resizable", $.ui.mouse, {
if (!this.borderDif) { if (!this.borderDif) {
this.borderDif = []; this.borderDif = [];
borders = [prel.css('borderTopWidth'), prel.css('borderRightWidth'), prel.css('borderBottomWidth'), prel.css('borderLeftWidth')]; borders = [prel.css("borderTopWidth"), prel.css("borderRightWidth"), prel.css("borderBottomWidth"), prel.css("borderLeftWidth")];
paddings = [prel.css('paddingTop'), prel.css('paddingRight'), prel.css('paddingBottom'), prel.css('paddingLeft')]; paddings = [prel.css("paddingTop"), prel.css("paddingRight"), prel.css("paddingBottom"), prel.css("paddingLeft")];
for ( j = 0; j < borders.length; j++ ) { for ( j = 0; j < borders.length; j++ ) {
this.borderDif[ j ] = ( parseInt( borders[ j ], 10 ) || 0 ) + ( parseInt( paddings[ j ], 10 ) || 0 ); this.borderDif[ j ] = ( parseInt( borders[ j ], 10 ) || 0 ) + ( parseInt( paddings[ j ], 10 ) || 0 );
@ -568,14 +568,14 @@ $.widget("ui.resizable", $.ui.mouse, {
if(this._helper) { if(this._helper) {
this.helper = this.helper || $('<div style="overflow:hidden;"></div>'); this.helper = this.helper || $("<div style='overflow:hidden;'></div>");
this.helper.addClass(this._helper).css({ this.helper.addClass(this._helper).css({
width: this.element.outerWidth() - 1, width: this.element.outerWidth() - 1,
height: this.element.outerHeight() - 1, height: this.element.outerHeight() - 1,
position: 'absolute', position: "absolute",
left: this.elementOffset.left +'px', left: this.elementOffset.left +"px",
top: this.elementOffset.top +'px', top: this.elementOffset.top +"px",
zIndex: ++o.zIndex //TODO: Don't modify option zIndex: ++o.zIndex //TODO: Don't modify option
}); });
@ -650,11 +650,11 @@ $.ui.plugin.add("resizable", "animate", {
o = that.options, o = that.options,
pr = that._proportionallyResizeElements, pr = that._proportionallyResizeElements,
ista = pr.length && (/textarea/i).test(pr[0].nodeName), ista = pr.length && (/textarea/i).test(pr[0].nodeName),
soffseth = ista && $.ui.hasScroll(pr[0], 'left') /* TODO - jump height */ ? 0 : that.sizeDiff.height, soffseth = ista && $.ui.hasScroll(pr[0], "left") /* TODO - jump height */ ? 0 : that.sizeDiff.height,
soffsetw = ista ? 0 : that.sizeDiff.width, soffsetw = ista ? 0 : that.sizeDiff.width,
style = { width: (that.size.width - soffsetw), height: (that.size.height - soffseth) }, style = { width: (that.size.width - soffsetw), height: (that.size.height - soffseth) },
left = (parseInt(that.element.css('left'), 10) + (that.position.left - that.originalPosition.left)) || null, left = (parseInt(that.element.css("left"), 10) + (that.position.left - that.originalPosition.left)) || null,
top = (parseInt(that.element.css('top'), 10) + (that.position.top - that.originalPosition.top)) || null; top = (parseInt(that.element.css("top"), 10) + (that.position.top - that.originalPosition.top)) || null;
that.element.animate( that.element.animate(
$.extend(style, top && left ? { top: top, left: left } : {}), { $.extend(style, top && left ? { top: top, left: left } : {}), {
@ -663,10 +663,10 @@ $.ui.plugin.add("resizable", "animate", {
step: function() { step: function() {
var data = { var data = {
width: parseInt(that.element.css('width'), 10), width: parseInt(that.element.css("width"), 10),
height: parseInt(that.element.css('height'), 10), height: parseInt(that.element.css("height"), 10),
top: parseInt(that.element.css('top'), 10), top: parseInt(that.element.css("top"), 10),
left: parseInt(that.element.css('left'), 10) left: parseInt(that.element.css("left"), 10)
}; };
if (pr && pr.length) { if (pr && pr.length) {
@ -740,7 +740,7 @@ $.ui.plugin.add("resizable", "containment", {
pRatio = that._aspectRatio || event.shiftKey, pRatio = that._aspectRatio || event.shiftKey,
cop = { top:0, left:0 }, ce = that.containerElement; cop = { top:0, left:0 }, ce = that.containerElement;
if (ce[0] !== document && (/static/).test(ce.css('position'))) { if (ce[0] !== document && (/static/).test(ce.css("position"))) {
cop = co; cop = co;
} }
@ -767,7 +767,7 @@ $.ui.plugin.add("resizable", "containment", {
hoset = Math.abs( (that._helper ? that.offset.top - cop.top : (that.offset.top - co.top)) + that.sizeDiff.height ); hoset = Math.abs( (that._helper ? that.offset.top - cop.top : (that.offset.top - co.top)) + that.sizeDiff.height );
isParent = that.containerElement.get(0) === that.element.parent().get(0); isParent = that.containerElement.get(0) === that.element.parent().get(0);
isOffsetRelative = /relative|absolute/.test(that.containerElement.css('position')); isOffsetRelative = /relative|absolute/.test(that.containerElement.css("position"));
if(isParent && isOffsetRelative) { if(isParent && isOffsetRelative) {
woset -= that.parentData.left; woset -= that.parentData.left;
@ -799,11 +799,11 @@ $.ui.plugin.add("resizable", "containment", {
w = helper.outerWidth() - that.sizeDiff.width, w = helper.outerWidth() - that.sizeDiff.width,
h = helper.outerHeight() - that.sizeDiff.height; h = helper.outerHeight() - that.sizeDiff.height;
if (that._helper && !o.animate && (/relative/).test(ce.css('position'))) { if (that._helper && !o.animate && (/relative/).test(ce.css("position"))) {
$(this).css({ left: ho.left - cop.left - co.left, width: w, height: h }); $(this).css({ left: ho.left - cop.left - co.left, width: w, height: h });
} }
if (that._helper && !o.animate && (/static/).test(ce.css('position'))) { if (that._helper && !o.animate && (/static/).test(ce.css("position"))) {
$(this).css({ left: ho.left - cop.left - co.left, width: w, height: h }); $(this).css({ left: ho.left - cop.left - co.left, width: w, height: h });
} }
@ -820,12 +820,12 @@ $.ui.plugin.add("resizable", "alsoResize", {
var el = $(this); var el = $(this);
el.data("ui-resizable-alsoresize", { el.data("ui-resizable-alsoresize", {
width: parseInt(el.width(), 10), height: parseInt(el.height(), 10), width: parseInt(el.width(), 10), height: parseInt(el.height(), 10),
left: parseInt(el.css('left'), 10), top: parseInt(el.css('top'), 10) left: parseInt(el.css("left"), 10), top: parseInt(el.css("top"), 10)
}); });
}); });
}; };
if (typeof(o.alsoResize) === 'object' && !o.alsoResize.parentNode) { if (typeof(o.alsoResize) === "object" && !o.alsoResize.parentNode) {
if (o.alsoResize.length) { o.alsoResize = o.alsoResize[0]; _store(o.alsoResize); } if (o.alsoResize.length) { o.alsoResize = o.alsoResize[0]; _store(o.alsoResize); }
else { $.each(o.alsoResize, function (exp) { _store(exp); }); } else { $.each(o.alsoResize, function (exp) { _store(exp); }); }
}else{ }else{
@ -846,7 +846,7 @@ $.ui.plugin.add("resizable", "alsoResize", {
_alsoResize = function (exp, c) { _alsoResize = function (exp, c) {
$(exp).each(function() { $(exp).each(function() {
var el = $(this), start = $(this).data("ui-resizable-alsoresize"), style = {}, var el = $(this), start = $(this).data("ui-resizable-alsoresize"), style = {},
css = c && c.length ? c : el.parents(ui.originalElement[0]).length ? ['width', 'height'] : ['width', 'height', 'top', 'left']; css = c && c.length ? c : el.parents(ui.originalElement[0]).length ? ["width", "height"] : ["width", "height", "top", "left"];
$.each(css, function (i, prop) { $.each(css, function (i, prop) {
var sum = (start[prop]||0) + (delta[prop]||0); var sum = (start[prop]||0) + (delta[prop]||0);
@ -859,7 +859,7 @@ $.ui.plugin.add("resizable", "alsoResize", {
}); });
}; };
if (typeof(o.alsoResize) === 'object' && !o.alsoResize.nodeType) { if (typeof(o.alsoResize) === "object" && !o.alsoResize.nodeType) {
$.each(o.alsoResize, function (exp, c) { _alsoResize(exp, c); }); $.each(o.alsoResize, function (exp, c) { _alsoResize(exp, c); });
}else{ }else{
_alsoResize(o.alsoResize); _alsoResize(o.alsoResize);
@ -879,9 +879,9 @@ $.ui.plugin.add("resizable", "ghost", {
that.ghost = that.originalElement.clone(); that.ghost = that.originalElement.clone();
that.ghost that.ghost
.css({ opacity: 0.25, display: 'block', position: 'relative', height: cs.height, width: cs.width, margin: 0, left: 0, top: 0 }) .css({ opacity: 0.25, display: "block", position: "relative", height: cs.height, width: cs.width, margin: 0, left: 0, top: 0 })
.addClass('ui-resizable-ghost') .addClass("ui-resizable-ghost")
.addClass(typeof o.ghost === 'string' ? o.ghost : ''); .addClass(typeof o.ghost === "string" ? o.ghost : "");
that.ghost.appendTo(that.helper); that.ghost.appendTo(that.helper);
@ -890,7 +890,7 @@ $.ui.plugin.add("resizable", "ghost", {
resize: function(){ resize: function(){
var that = $(this).data("ui-resizable"); var that = $(this).data("ui-resizable");
if (that.ghost) { if (that.ghost) {
that.ghost.css({ position: 'relative', height: that.size.height, width: that.size.width }); that.ghost.css({ position: "relative", height: that.size.height, width: that.size.width });
} }
}, },

50
ui/jquery.ui.selectable.js vendored
View File

@ -18,11 +18,11 @@
$.widget("ui.selectable", $.ui.mouse, { $.widget("ui.selectable", $.ui.mouse, {
version: "@VERSION", version: "@VERSION",
options: { options: {
appendTo: 'body', appendTo: "body",
autoRefresh: true, autoRefresh: true,
distance: 0, distance: 0,
filter: '*', filter: "*",
tolerance: 'touch' tolerance: "touch"
}, },
_create: function() { _create: function() {
var selectees, var selectees,
@ -47,9 +47,9 @@ $.widget("ui.selectable", $.ui.mouse, {
right: pos.left + $this.outerWidth(), right: pos.left + $this.outerWidth(),
bottom: pos.top + $this.outerHeight(), bottom: pos.top + $this.outerHeight(),
startselected: false, startselected: false,
selected: $this.hasClass('ui-selected'), selected: $this.hasClass("ui-selected"),
selecting: $this.hasClass('ui-selecting'), selecting: $this.hasClass("ui-selecting"),
unselecting: $this.hasClass('ui-unselecting') unselecting: $this.hasClass("ui-unselecting")
}); });
}); });
}; };
@ -98,13 +98,13 @@ $.widget("ui.selectable", $.ui.mouse, {
this.refresh(); this.refresh();
} }
this.selectees.filter('.ui-selected').each(function() { this.selectees.filter(".ui-selected").each(function() {
var selectee = $.data(this, "selectable-item"); var selectee = $.data(this, "selectable-item");
selectee.startselected = true; selectee.startselected = true;
if (!event.metaKey && !event.ctrlKey) { if (!event.metaKey && !event.ctrlKey) {
selectee.$element.removeClass('ui-selected'); selectee.$element.removeClass("ui-selected");
selectee.selected = false; selectee.selected = false;
selectee.$element.addClass('ui-unselecting'); selectee.$element.addClass("ui-unselecting");
selectee.unselecting = true; selectee.unselecting = true;
// selectable UNSELECTING callback // selectable UNSELECTING callback
that._trigger("unselecting", event, { that._trigger("unselecting", event, {
@ -117,7 +117,7 @@ $.widget("ui.selectable", $.ui.mouse, {
var doSelect, var doSelect,
selectee = $.data(this, "selectable-item"); selectee = $.data(this, "selectable-item");
if (selectee) { if (selectee) {
doSelect = (!event.metaKey && !event.ctrlKey) || !selectee.$element.hasClass('ui-selected'); doSelect = (!event.metaKey && !event.ctrlKey) || !selectee.$element.hasClass("ui-selected");
selectee.$element selectee.$element
.removeClass(doSelect ? "ui-unselecting" : "ui-selected") .removeClass(doSelect ? "ui-unselecting" : "ui-selected")
.addClass(doSelect ? "ui-selecting" : "ui-unselecting"); .addClass(doSelect ? "ui-selecting" : "ui-unselecting");
@ -169,24 +169,24 @@ $.widget("ui.selectable", $.ui.mouse, {
return; return;
} }
if (options.tolerance === 'touch') { if (options.tolerance === "touch") {
hit = ( !(selectee.left > x2 || selectee.right < x1 || selectee.top > y2 || selectee.bottom < y1) ); hit = ( !(selectee.left > x2 || selectee.right < x1 || selectee.top > y2 || selectee.bottom < y1) );
} else if (options.tolerance === 'fit') { } else if (options.tolerance === "fit") {
hit = (selectee.left > x1 && selectee.right < x2 && selectee.top > y1 && selectee.bottom < y2); hit = (selectee.left > x1 && selectee.right < x2 && selectee.top > y1 && selectee.bottom < y2);
} }
if (hit) { if (hit) {
// SELECT // SELECT
if (selectee.selected) { if (selectee.selected) {
selectee.$element.removeClass('ui-selected'); selectee.$element.removeClass("ui-selected");
selectee.selected = false; selectee.selected = false;
} }
if (selectee.unselecting) { if (selectee.unselecting) {
selectee.$element.removeClass('ui-unselecting'); selectee.$element.removeClass("ui-unselecting");
selectee.unselecting = false; selectee.unselecting = false;
} }
if (!selectee.selecting) { if (!selectee.selecting) {
selectee.$element.addClass('ui-selecting'); selectee.$element.addClass("ui-selecting");
selectee.selecting = true; selectee.selecting = true;
// selectable SELECTING callback // selectable SELECTING callback
that._trigger("selecting", event, { that._trigger("selecting", event, {
@ -197,15 +197,15 @@ $.widget("ui.selectable", $.ui.mouse, {
// UNSELECT // UNSELECT
if (selectee.selecting) { if (selectee.selecting) {
if ((event.metaKey || event.ctrlKey) && selectee.startselected) { if ((event.metaKey || event.ctrlKey) && selectee.startselected) {
selectee.$element.removeClass('ui-selecting'); selectee.$element.removeClass("ui-selecting");
selectee.selecting = false; selectee.selecting = false;
selectee.$element.addClass('ui-selected'); selectee.$element.addClass("ui-selected");
selectee.selected = true; selectee.selected = true;
} else { } else {
selectee.$element.removeClass('ui-selecting'); selectee.$element.removeClass("ui-selecting");
selectee.selecting = false; selectee.selecting = false;
if (selectee.startselected) { if (selectee.startselected) {
selectee.$element.addClass('ui-unselecting'); selectee.$element.addClass("ui-unselecting");
selectee.unselecting = true; selectee.unselecting = true;
} }
// selectable UNSELECTING callback // selectable UNSELECTING callback
@ -216,10 +216,10 @@ $.widget("ui.selectable", $.ui.mouse, {
} }
if (selectee.selected) { if (selectee.selected) {
if (!event.metaKey && !event.ctrlKey && !selectee.startselected) { if (!event.metaKey && !event.ctrlKey && !selectee.startselected) {
selectee.$element.removeClass('ui-selected'); selectee.$element.removeClass("ui-selected");
selectee.selected = false; selectee.selected = false;
selectee.$element.addClass('ui-unselecting'); selectee.$element.addClass("ui-unselecting");
selectee.unselecting = true; selectee.unselecting = true;
// selectable UNSELECTING callback // selectable UNSELECTING callback
that._trigger("unselecting", event, { that._trigger("unselecting", event, {
@ -238,18 +238,18 @@ $.widget("ui.selectable", $.ui.mouse, {
this.dragged = false; this.dragged = false;
$('.ui-unselecting', this.element[0]).each(function() { $(".ui-unselecting", this.element[0]).each(function() {
var selectee = $.data(this, "selectable-item"); var selectee = $.data(this, "selectable-item");
selectee.$element.removeClass('ui-unselecting'); selectee.$element.removeClass("ui-unselecting");
selectee.unselecting = false; selectee.unselecting = false;
selectee.startselected = false; selectee.startselected = false;
that._trigger("unselected", event, { that._trigger("unselected", event, {
unselected: selectee.element unselected: selectee.element
}); });
}); });
$('.ui-selecting', this.element[0]).each(function() { $(".ui-selecting", this.element[0]).each(function() {
var selectee = $.data(this, "selectable-item"); var selectee = $.data(this, "selectable-item");
selectee.$element.removeClass('ui-selecting').addClass('ui-selected'); selectee.$element.removeClass("ui-selecting").addClass("ui-selected");
selectee.selecting = false; selectee.selecting = false;
selectee.selected = true; selectee.selected = true;
selectee.startselected = true; selectee.startselected = true;

120
ui/jquery.ui.sortable.js vendored
View File

@ -30,7 +30,7 @@ $.widget("ui.sortable", $.ui.mouse, {
axis: false, axis: false,
connectWith: false, connectWith: false,
containment: false, containment: false,
cursor: 'auto', cursor: "auto",
cursorAt: false, cursorAt: false,
dropOnEmpty: true, dropOnEmpty: true,
forcePlaceholderSize: false, forcePlaceholderSize: false,
@ -38,7 +38,7 @@ $.widget("ui.sortable", $.ui.mouse, {
grid: false, grid: false,
handle: false, handle: false,
helper: "original", helper: "original",
items: '> *', items: "> *",
opacity: false, opacity: false,
placeholder: false, placeholder: false,
revert: false, revert: false,
@ -59,7 +59,7 @@ $.widget("ui.sortable", $.ui.mouse, {
this.refresh(); this.refresh();
//Let's determine if the items are being displayed horizontally //Let's determine if the items are being displayed horizontally
this.floating = this.items.length ? o.axis === 'x' || (/left|right/).test(this.items[0].item.css('float')) || (/inline|table-cell/).test(this.items[0].item.css('display')) : false; this.floating = this.items.length ? o.axis === "x" || (/left|right/).test(this.items[0].item.css("float")) || (/inline|table-cell/).test(this.items[0].item.css("display")) : false;
//Let's determine the parent's offset //Let's determine the parent's offset
this.offset = this.element.offset(); this.offset = this.element.offset();
@ -104,7 +104,7 @@ $.widget("ui.sortable", $.ui.mouse, {
return false; return false;
} }
if(this.options.disabled || this.options.type === 'static') { if(this.options.disabled || this.options.type === "static") {
return false; return false;
} }
@ -113,12 +113,12 @@ $.widget("ui.sortable", $.ui.mouse, {
//Find out if the clicked node (or one of its parents) is a actual item in this.items //Find out if the clicked node (or one of its parents) is a actual item in this.items
$(event.target).parents().each(function() { $(event.target).parents().each(function() {
if($.data(this, that.widgetName + '-item') === that) { if($.data(this, that.widgetName + "-item") === that) {
currentItem = $(this); currentItem = $(this);
return false; return false;
} }
}); });
if($.data(event.target, that.widgetName + '-item') === that) { if($.data(event.target, that.widgetName + "-item") === that) {
currentItem = $(event.target); currentItem = $(event.target);
} }
@ -195,7 +195,7 @@ $.widget("ui.sortable", $.ui.mouse, {
this.originalPageX = event.pageX; this.originalPageX = event.pageX;
this.originalPageY = event.pageY; this.originalPageY = event.pageY;
//Adjust the mouse offset relative to the helper if 'cursorAt' is supplied //Adjust the mouse offset relative to the helper if "cursorAt" is supplied
(o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt)); (o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt));
//Cache the former DOM position //Cache the former DOM position
@ -215,10 +215,10 @@ $.widget("ui.sortable", $.ui.mouse, {
} }
if(o.cursor) { // cursor option if(o.cursor) { // cursor option
if ($('body').css("cursor")) { if ($("body").css("cursor")) {
this._storedCursor = $('body').css("cursor"); this._storedCursor = $("body").css("cursor");
} }
$('body').css("cursor", o.cursor); $("body").css("cursor", o.cursor);
} }
if(o.opacity) { // opacity option if(o.opacity) { // opacity option
@ -236,7 +236,7 @@ $.widget("ui.sortable", $.ui.mouse, {
} }
//Prepare scrolling //Prepare scrolling
if(this.scrollParent[0] !== document && this.scrollParent[0].tagName !== 'HTML') { if(this.scrollParent[0] !== document && this.scrollParent[0].tagName !== "HTML") {
this.overflowOffset = this.scrollParent.offset(); this.overflowOffset = this.scrollParent.offset();
} }
@ -249,7 +249,7 @@ $.widget("ui.sortable", $.ui.mouse, {
} }
//Post 'activate' events to possible containers //Post "activate" events to possible containers
if( !noActivation ) { if( !noActivation ) {
for ( i = this.containers.length - 1; i >= 0; i-- ) { for ( i = this.containers.length - 1; i >= 0; i-- ) {
this.containers[ i ]._trigger( "activate", event, this._uiHash( this ) ); this.containers[ i ]._trigger( "activate", event, this._uiHash( this ) );
@ -288,7 +288,7 @@ $.widget("ui.sortable", $.ui.mouse, {
//Do scrolling //Do scrolling
if(this.options.scroll) { if(this.options.scroll) {
if(this.scrollParent[0] !== document && this.scrollParent[0].tagName !== 'HTML') { if(this.scrollParent[0] !== document && this.scrollParent[0].tagName !== "HTML") {
if((this.overflowOffset.top + this.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity) { if((this.overflowOffset.top + this.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity) {
this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop + o.scrollSpeed; this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop + o.scrollSpeed;
@ -328,10 +328,10 @@ $.widget("ui.sortable", $.ui.mouse, {
//Set the helper position //Set the helper position
if(!this.options.axis || this.options.axis !== "y") { if(!this.options.axis || this.options.axis !== "y") {
this.helper[0].style.left = this.position.left+'px'; this.helper[0].style.left = this.position.left+"px";
} }
if(!this.options.axis || this.options.axis !== "x") { if(!this.options.axis || this.options.axis !== "x") {
this.helper[0].style.top = this.position.top+'px'; this.helper[0].style.top = this.position.top+"px";
} }
//Rearrange //Rearrange
@ -362,7 +362,7 @@ $.widget("ui.sortable", $.ui.mouse, {
if (itemElement !== this.currentItem[0] && if (itemElement !== this.currentItem[0] &&
this.placeholder[intersection === 1 ? "next" : "prev"]()[0] !== itemElement && this.placeholder[intersection === 1 ? "next" : "prev"]()[0] !== itemElement &&
!$.contains(this.placeholder[0], itemElement) && !$.contains(this.placeholder[0], itemElement) &&
(this.options.type === 'semi-dynamic' ? !$.contains(this.element[0], itemElement) : true) (this.options.type === "semi-dynamic" ? !$.contains(this.element[0], itemElement) : true)
) { ) {
this.direction = intersection === 1 ? "down" : "up"; this.direction = intersection === 1 ? "down" : "up";
@ -387,7 +387,7 @@ $.widget("ui.sortable", $.ui.mouse, {
} }
//Call callbacks //Call callbacks
this._trigger('sort', event, this._uiHash()); this._trigger("sort", event, this._uiHash());
this.lastPositionAbs = this.positionAbs; this.lastPositionAbs = this.positionAbs;
return false; return false;
@ -482,17 +482,17 @@ $.widget("ui.sortable", $.ui.mouse, {
o = o || {}; o = o || {};
$(items).each(function() { $(items).each(function() {
var res = ($(o.item || this).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[\-=_](.+)/)); var res = ($(o.item || this).attr(o.attribute || "id") || "").match(o.expression || (/(.+)[\-=_](.+)/));
if (res) { if (res) {
str.push((o.key || res[1]+'[]')+'='+(o.key && o.expression ? res[1] : res[2])); str.push((o.key || res[1]+"[]")+"="+(o.key && o.expression ? res[1] : res[2]));
} }
}); });
if(!str.length && o.key) { if(!str.length && o.key) {
str.push(o.key + '='); str.push(o.key + "=");
} }
return str.join('&'); return str.join("&");
}, },
@ -503,7 +503,7 @@ $.widget("ui.sortable", $.ui.mouse, {
o = o || {}; o = o || {};
items.each(function() { ret.push($(o.item || this).attr(o.attribute || 'id') || ''); }); items.each(function() { ret.push($(o.item || this).attr(o.attribute || "id") || ""); });
return ret; return ret;
}, },
@ -525,7 +525,7 @@ $.widget("ui.sortable", $.ui.mouse, {
if ( this.options.tolerance === "pointer" || if ( this.options.tolerance === "pointer" ||
this.options.forcePointerForContainers || this.options.forcePointerForContainers ||
(this.options.tolerance !== "pointer" && this.helperProportions[this.floating ? 'width' : 'height'] > item[this.floating ? 'width' : 'height']) (this.options.tolerance !== "pointer" && this.helperProportions[this.floating ? "width" : "height"] > item[this.floating ? "width" : "height"])
) { ) {
return isOverElement; return isOverElement;
} else { } else {
@ -540,8 +540,8 @@ $.widget("ui.sortable", $.ui.mouse, {
_intersectsWithPointer: function(item) { _intersectsWithPointer: function(item) {
var isOverElementHeight = (this.options.axis === 'x') || isOverAxis(this.positionAbs.top + this.offset.click.top, item.top, item.height), var isOverElementHeight = (this.options.axis === "x") || isOverAxis(this.positionAbs.top + this.offset.click.top, item.top, item.height),
isOverElementWidth = (this.options.axis === 'y') || isOverAxis(this.positionAbs.left + this.offset.click.left, item.left, item.width), isOverElementWidth = (this.options.axis === "y") || isOverAxis(this.positionAbs.left + this.offset.click.left, item.left, item.width),
isOverElement = isOverElementHeight && isOverElementWidth, isOverElement = isOverElementHeight && isOverElementWidth,
verticalDirection = this._getDragVerticalDirection(), verticalDirection = this._getDragVerticalDirection(),
horizontalDirection = this._getDragHorizontalDirection(); horizontalDirection = this._getDragHorizontalDirection();
@ -605,13 +605,13 @@ $.widget("ui.sortable", $.ui.mouse, {
for ( j = cur.length - 1; j >= 0; j--){ for ( j = cur.length - 1; j >= 0; j--){
inst = $.data(cur[j], this.widgetFullName); inst = $.data(cur[j], this.widgetFullName);
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(".ui-sortable-helper").not('.ui-sortable-placeholder'), inst]); queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element) : $(inst.options.items, inst.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"), 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(".ui-sortable-helper").not('.ui-sortable-placeholder'), 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").not(".ui-sortable-placeholder"), this]);
for (i = queries.length - 1; i >= 0; i--){ for (i = queries.length - 1; i >= 0; i--){
queries[i][0].each(function() { queries[i][0].each(function() {
@ -668,7 +668,7 @@ $.widget("ui.sortable", $.ui.mouse, {
for (j=0, queriesLength = _queries.length; j < queriesLength; j++) { for (j=0, queriesLength = _queries.length; j < queriesLength; j++) {
item = $(_queries[j]); item = $(_queries[j]);
item.data(this.widgetName + '-item', targetData); // Data for target checking (mouse manager) item.data(this.widgetName + "-item", targetData); // Data for target checking (mouse manager)
items.push({ items.push({
item: item, item: item,
@ -754,8 +754,8 @@ $.widget("ui.sortable", $.ui.mouse, {
} }
//If the element doesn't have a actual height by itself (without styles coming from a stylesheet), it receives the inline height from the dragged item //If the element doesn't have a actual height by itself (without styles coming from a stylesheet), it receives the inline height from the dragged item
if(!p.height()) { p.height(that.currentItem.innerHeight() - parseInt(that.currentItem.css('paddingTop')||0, 10) - parseInt(that.currentItem.css('paddingBottom')||0, 10)); } if(!p.height()) { p.height(that.currentItem.innerHeight() - parseInt(that.currentItem.css("paddingTop")||0, 10) - parseInt(that.currentItem.css("paddingBottom")||0, 10)); }
if(!p.width()) { p.width(that.currentItem.innerWidth() - parseInt(that.currentItem.css('paddingLeft')||0, 10) - parseInt(that.currentItem.css('paddingRight')||0, 10)); } if(!p.width()) { p.width(that.currentItem.innerWidth() - parseInt(that.currentItem.css("paddingLeft")||0, 10) - parseInt(that.currentItem.css("paddingRight")||0, 10)); }
} }
}; };
} }
@ -818,8 +818,8 @@ $.widget("ui.sortable", $.ui.mouse, {
//When entering a new container, we will find the item with the least distance and append our item near it //When entering a new container, we will find the item with the least distance and append our item near it
dist = 10000; dist = 10000;
itemWithLeastDistance = null; itemWithLeastDistance = null;
posProperty = this.containers[innermostIndex].floating ? 'left' : 'top'; posProperty = this.containers[innermostIndex].floating ? "left" : "top";
sizeProperty = this.containers[innermostIndex].floating ? 'width' : 'height'; sizeProperty = this.containers[innermostIndex].floating ? "width" : "height";
base = this.positionAbs[posProperty] + this.offset.click[posProperty]; base = this.positionAbs[posProperty] + this.offset.click[posProperty];
for (j = this.items.length - 1; j >= 0; j--) { for (j = this.items.length - 1; j >= 0; j--) {
if(!$.contains(this.containers[innermostIndex].element[0], this.items[j].item[0])) { if(!$.contains(this.containers[innermostIndex].element[0], this.items[j].item[0])) {
@ -864,11 +864,11 @@ $.widget("ui.sortable", $.ui.mouse, {
_createHelper: function(event) { _createHelper: function(event) {
var o = this.options, var o = this.options,
helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event, this.currentItem])) : (o.helper === 'clone' ? this.currentItem.clone() : this.currentItem); helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event, this.currentItem])) : (o.helper === "clone" ? this.currentItem.clone() : this.currentItem);
//Add the helper to the DOM if that didn't happen already //Add the helper to the DOM if that didn't happen already
if(!helper.parents('body').length) { if(!helper.parents("body").length) {
$(o.appendTo !== 'parent' ? o.appendTo : this.currentItem[0].parentNode)[0].appendChild(helper[0]); $(o.appendTo !== "parent" ? o.appendTo : this.currentItem[0].parentNode)[0].appendChild(helper[0]);
} }
if(helper[0] === this.currentItem[0]) { if(helper[0] === this.currentItem[0]) {
@ -887,22 +887,22 @@ $.widget("ui.sortable", $.ui.mouse, {
}, },
_adjustOffsetFromHelper: function(obj) { _adjustOffsetFromHelper: function(obj) {
if (typeof obj === 'string') { if (typeof obj === "string") {
obj = obj.split(' '); obj = obj.split(" ");
} }
if ($.isArray(obj)) { if ($.isArray(obj)) {
obj = {left: +obj[0], top: +obj[1] || 0}; obj = {left: +obj[0], top: +obj[1] || 0};
} }
if ('left' in obj) { if ("left" in obj) {
this.offset.click.left = obj.left + this.margins.left; this.offset.click.left = obj.left + this.margins.left;
} }
if ('right' in obj) { if ("right" in obj) {
this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left; this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
} }
if ('top' in obj) { if ("top" in obj) {
this.offset.click.top = obj.top + this.margins.top; this.offset.click.top = obj.top + this.margins.top;
} }
if ('bottom' in obj) { if ("bottom" in obj) {
this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top; this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
} }
}, },
@ -918,14 +918,14 @@ $.widget("ui.sortable", $.ui.mouse, {
// 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent // 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent
// 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that // 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that
// the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag // the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag
if(this.cssPosition === 'absolute' && this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) { if(this.cssPosition === "absolute" && this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) {
po.left += this.scrollParent.scrollLeft(); po.left += this.scrollParent.scrollLeft();
po.top += this.scrollParent.scrollTop(); po.top += this.scrollParent.scrollTop();
} }
// This needs to be actually done for all browsers, since pageX/pageY includes this information // This needs to be actually done for all browsers, since pageX/pageY includes this information
// with an ugly IE fix // with an ugly IE fix
if( this.offsetParent[0] === document.body || (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() === 'html' && $.ui.ie)) { if( this.offsetParent[0] === document.body || (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() === "html" && $.ui.ie)) {
po = { top: 0, left: 0 }; po = { top: 0, left: 0 };
} }
@ -968,22 +968,22 @@ $.widget("ui.sortable", $.ui.mouse, {
var ce, co, over, var ce, co, over,
o = this.options; o = this.options;
if(o.containment === 'parent') { if(o.containment === "parent") {
o.containment = this.helper[0].parentNode; o.containment = this.helper[0].parentNode;
} }
if(o.containment === 'document' || o.containment === 'window') { if(o.containment === "document" || o.containment === "window") {
this.containment = [ this.containment = [
0 - this.offset.relative.left - this.offset.parent.left, 0 - this.offset.relative.left - this.offset.parent.left,
0 - this.offset.relative.top - this.offset.parent.top, 0 - this.offset.relative.top - this.offset.parent.top,
$(o.containment === 'document' ? document : window).width() - this.helperProportions.width - this.margins.left, $(o.containment === "document" ? document : window).width() - this.helperProportions.width - this.margins.left,
($(o.containment === 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top ($(o.containment === "document" ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top
]; ];
} }
if(!(/^(document|window|parent)$/).test(o.containment)) { if(!(/^(document|window|parent)$/).test(o.containment)) {
ce = $(o.containment)[0]; ce = $(o.containment)[0];
co = $(o.containment).offset(); co = $(o.containment).offset();
over = ($(ce).css("overflow") !== 'hidden'); over = ($(ce).css("overflow") !== "hidden");
this.containment = [ this.containment = [
co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0) - this.margins.left, co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0) - this.margins.left,
@ -1001,7 +1001,7 @@ $.widget("ui.sortable", $.ui.mouse, {
pos = this.position; pos = this.position;
} }
var mod = d === "absolute" ? 1 : -1, var mod = d === "absolute" ? 1 : -1,
scroll = this.cssPosition === 'absolute' && !(this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent,
scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName); scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
return { return {
@ -1009,13 +1009,13 @@ $.widget("ui.sortable", $.ui.mouse, {
pos.top + // The absolute mouse position pos.top + // The absolute mouse position
this.offset.relative.top * mod + // Only for relative positioned nodes: Relative offset from element to offset parent this.offset.relative.top * mod + // Only for relative positioned nodes: Relative offset from element to offset parent
this.offset.parent.top * mod - // The offsetParent's offset without borders (offset + border) this.offset.parent.top * mod - // The offsetParent's offset without borders (offset + border)
( ( this.cssPosition === 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod) ( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod)
), ),
left: ( left: (
pos.left + // The absolute mouse position pos.left + // The absolute mouse position
this.offset.relative.left * mod + // Only for relative positioned nodes: Relative offset from element to offset parent this.offset.relative.left * mod + // Only for relative positioned nodes: Relative offset from element to offset parent
this.offset.parent.left * mod - // The offsetParent's offset without borders (offset + border) this.offset.parent.left * mod - // The offsetParent's offset without borders (offset + border)
( ( this.cssPosition === 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod) ( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod)
) )
}; };
@ -1027,13 +1027,13 @@ $.widget("ui.sortable", $.ui.mouse, {
o = this.options, o = this.options,
pageX = event.pageX, pageX = event.pageX,
pageY = event.pageY, pageY = event.pageY,
scroll = this.cssPosition === 'absolute' && !(this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName); scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
// This is another very weird special case that only happens for relative elements: // This is another very weird special case that only happens for relative elements:
// 1. If the css position is relative // 1. If the css position is relative
// 2. and the scroll parent is the document or similar to the offset parent // 2. and the scroll parent is the document or similar to the offset parent
// we have to refresh the relative offset during the scroll so there are no jumps // we have to refresh the relative offset during the scroll so there are no jumps
if(this.cssPosition === 'relative' && !(this.scrollParent[0] !== document && this.scrollParent[0] !== this.offsetParent[0])) { if(this.cssPosition === "relative" && !(this.scrollParent[0] !== document && this.scrollParent[0] !== this.offsetParent[0])) {
this.offset.relative = this._getRelativeOffset(); this.offset.relative = this._getRelativeOffset();
} }
@ -1075,14 +1075,14 @@ $.widget("ui.sortable", $.ui.mouse, {
this.offset.click.top - // Click offset (relative to the element) this.offset.click.top - // Click offset (relative to the element)
this.offset.relative.top - // Only for relative positioned nodes: Relative offset from element to offset parent this.offset.relative.top - // Only for relative positioned nodes: Relative offset from element to offset parent
this.offset.parent.top + // The offsetParent's offset without borders (offset + border) this.offset.parent.top + // The offsetParent's offset without borders (offset + border)
( ( this.cssPosition === 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) )) ( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ))
), ),
left: ( left: (
pageX - // The absolute mouse position pageX - // The absolute mouse position
this.offset.click.left - // Click offset (relative to the element) this.offset.click.left - // Click offset (relative to the element)
this.offset.relative.left - // Only for relative positioned nodes: Relative offset from element to offset parent this.offset.relative.left - // Only for relative positioned nodes: Relative offset from element to offset parent
this.offset.parent.left + // The offsetParent's offset without borders (offset + border) this.offset.parent.left + // The offsetParent's offset without borders (offset + border)
( ( this.cssPosition === 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() )) ( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ))
) )
}; };
@ -1090,7 +1090,7 @@ $.widget("ui.sortable", $.ui.mouse, {
_rearrange: function(event, i, a, hardRefresh) { _rearrange: function(event, i, a, hardRefresh) {
a ? a[0].appendChild(this.placeholder[0]) : i.item[0].parentNode.insertBefore(this.placeholder[0], (this.direction === 'down' ? i.item[0] : i.item[0].nextSibling)); a ? a[0].appendChild(this.placeholder[0]) : i.item[0].parentNode.insertBefore(this.placeholder[0], (this.direction === "down" ? i.item[0] : i.item[0].nextSibling));
//Various things done here to improve the performance: //Various things done here to improve the performance:
// 1. we create a setTimeout, that calls refreshPositions // 1. we create a setTimeout, that calls refreshPositions
@ -1125,8 +1125,8 @@ $.widget("ui.sortable", $.ui.mouse, {
if(this.helper[0] === this.currentItem[0]) { if(this.helper[0] === this.currentItem[0]) {
for(i in this._storedCSS) { for(i in this._storedCSS) {
if(this._storedCSS[i] === 'auto' || this._storedCSS[i] === 'static') { if(this._storedCSS[i] === "auto" || this._storedCSS[i] === "static") {
this._storedCSS[i] = ''; this._storedCSS[i] = "";
} }
} }
this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"); this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
@ -1165,13 +1165,13 @@ $.widget("ui.sortable", $.ui.mouse, {
//Do what was originally in plugins //Do what was originally in plugins
if(this._storedCursor) { if(this._storedCursor) {
$('body').css("cursor", this._storedCursor); $("body").css("cursor", this._storedCursor);
} }
if(this._storedOpacity) { if(this._storedOpacity) {
this.helper.css("opacity", this._storedOpacity); this.helper.css("opacity", this._storedOpacity);
} }
if(this._storedZIndex) { if(this._storedZIndex) {
this.helper.css("zIndex", this._storedZIndex === 'auto' ? '' : this._storedZIndex); this.helper.css("zIndex", this._storedZIndex === "auto" ? "" : this._storedZIndex);
} }
this.dragging = false; this.dragging = false;