diff --git a/tests/unit/draggable/draggable.html b/tests/unit/draggable/draggable.html
index cd068eb2086..50bed8caf39 100644
--- a/tests/unit/draggable/draggable.html
+++ b/tests/unit/draggable/draggable.html
@@ -6,6 +6,12 @@
+
+
+
@@ -39,13 +45,14 @@
diff --git a/tests/unit/draggable/draggable_options.js b/tests/unit/draggable/draggable_options.js
index a3f7169f2b8..8496d6182ea 100644
--- a/tests/unit/draggable/draggable_options.js
+++ b/tests/unit/draggable/draggable_options.js
@@ -723,4 +723,39 @@ test("{ zIndex: 10 }", function() {
});
+test( "{ stack }", function() {
+ expect( 4 );
+
+ var draggable1 = $( "#draggable1" ),
+ draggable2 = $( "#draggable2" ),
+ draggable3 = $( "#draggable3" ),
+ draggable4 = $( "#draggable4" );
+
+ // Set z-index as an inline style.
+ $( "#draggable1, #draggable2" )
+ .css( "zIndex", 100 )
+ .draggable({
+ stack: "#draggable1, #draggable2"
+ });
+ // Have z-index applied via CSS, see #9077
+ $( "#draggable3, #draggable4" )
+ .draggable({
+ stack: "#draggable3, #draggable4"
+ });
+
+ draggable1.simulate( "drag", {
+ dx: 1,
+ dy: 1
+ });
+ draggable3.simulate( "drag", {
+ dx: 1,
+ dy: 1
+ });
+
+ equal( draggable1.css( "zIndex" ), 102);
+ equal( draggable2.css( "zIndex" ), 101);
+ equal( draggable3.css( "zIndex" ), 102);
+ equal( draggable4.css( "zIndex" ), 101);
+});
+
})(jQuery);
diff --git a/ui/jquery.ui.draggable.js b/ui/jquery.ui.draggable.js
index 9a31add7c5e..8b388d16650 100644
--- a/ui/jquery.ui.draggable.js
+++ b/ui/jquery.ui.draggable.js
@@ -908,22 +908,19 @@ $.ui.plugin.add("draggable", "snap", {
$.ui.plugin.add("draggable", "stack", {
start: function() {
-
var min,
- o = $(this).data("ui-draggable").options,
+ o = this.data("ui-draggable").options,
group = $.makeArray($(o.stack)).sort(function(a,b) {
return (parseInt($(a).css("zIndex"),10) || 0) - (parseInt($(b).css("zIndex"),10) || 0);
});
if (!group.length) { return; }
- min = parseInt(group[0].style.zIndex, 10) || 0;
+ min = parseInt($(group[0]).css("zIndex"), 10) || 0;
$(group).each(function(i) {
- this.style.zIndex = min + i;
+ $(this).css("zIndex", min + i);
});
-
- this[0].style.zIndex = min + group.length;
-
+ this.css("zIndex", (min + group.length));
}
});