aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathanael Silverman <nathanael.silverman@gmail.com>2013-02-13 17:34:52 +0100
committerScott González <scott.gonzalez@gmail.com>2013-02-18 10:10:01 -0500
commita692bf9b70305de5e9893e717fc71e1e74fb86ac (patch)
treeefe4443a366baa904f28c54ebc7da825a3ed07bc
parentf78c8ca22c12fbfc72f6b9b1964739f864f90dca (diff)
downloadjquery-ui-a692bf9b70305de5e9893e717fc71e1e74fb86ac.tar.gz
jquery-ui-a692bf9b70305de5e9893e717fc71e1e74fb86ac.zip
Sortable: Inject a CSS rule to style the cursor. Fixed #7389 - sortable: 'cursor' option didn't override CSS cursor settings.
-rw-r--r--ui/jquery.ui.sortable.js20
1 files changed, 12 insertions, 8 deletions
diff --git a/ui/jquery.ui.sortable.js b/ui/jquery.ui.sortable.js
index 211ff272e..c9b503bd0 100644
--- a/ui/jquery.ui.sortable.js
+++ b/ui/jquery.ui.sortable.js
@@ -158,7 +158,7 @@ $.widget("ui.sortable", $.ui.mouse, {
_mouseStart: function(event, overrideHandle, noActivation) {
- var i,
+ var i, body,
o = this.options;
this.currentContainer = this;
@@ -228,11 +228,14 @@ $.widget("ui.sortable", $.ui.mouse, {
this._setContainment();
}
- if(o.cursor) { // cursor option
- if ($("body").css("cursor")) {
- this._storedCursor = $("body").css("cursor");
- }
- $("body").css("cursor", o.cursor);
+ if( o.cursor && o.cursor !== "auto" ) { // cursor option
+ body = this.document.find( "body" );
+
+ // support: IE
+ this.storedCursor = body.css( "cursor" );
+ body.css( "cursor", o.cursor );
+
+ this.storedStylesheet = $( "<style>*{ cursor: "+o.cursor+" !important; }</style>" ).appendTo( body );
}
if(o.opacity) { // opacity option
@@ -1178,8 +1181,9 @@ $.widget("ui.sortable", $.ui.mouse, {
}
//Do what was originally in plugins
- if(this._storedCursor) {
- $("body").css("cursor", this._storedCursor);
+ if ( this.storedCursor ) {
+ this.document.find( "body" ).css( "cursor", this.storedCursor );
+ this.storedStylesheet.remove();
}
if(this._storedOpacity) {
this.helper.css("opacity", this._storedOpacity);