From 8ce8b77bfc07bd037bda8e204c673907242360a8 Mon Sep 17 00:00:00 2001
From: TJ VanToll <tj.vantoll@gmail.com>
Date: Mon, 9 Jan 2012 21:42:56 -0500
Subject: [PATCH] Resizable: Apply zIndex option to all handles. Partial Fix
 for #7960- Modal dialog does not disable resizables on the page. (cherry
 picked from commit 6150abae49f77a3b2f67c39a3c60a06792b4de8f)

---
 tests/unit/resizable/resizable_options.js | 9 +++++++++
 themes/base/jquery.ui.resizable.css       | 2 +-
 ui/jquery.ui.resizable.js                 | 5 ++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/tests/unit/resizable/resizable_options.js b/tests/unit/resizable/resizable_options.js
index 389931f92f1..ea786ca547c 100644
--- a/tests/unit/resizable/resizable_options.js
+++ b/tests/unit/resizable/resizable_options.js
@@ -187,4 +187,13 @@ test("ui-resizable-nw { handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 1
 	equals( target.height(), 100, "compare maxHeight" );
 });
 
+test("zIndex, applied to all handles", function() {
+	expect(8);
+	
+	var target = $('<div></div>').resizable({ handles: 'all', zIndex: 100 });
+	target.children( '.ui-resizable-handle' ).each( function( index, handle ) {
+		equals( $( handle ).css( 'zIndex' ), 100, 'compare zIndex' );
+	});
+});
+
 })(jQuery);
diff --git a/themes/base/jquery.ui.resizable.css b/themes/base/jquery.ui.resizable.css
index 0bf680482ff..0bb688d5b53 100644
--- a/themes/base/jquery.ui.resizable.css
+++ b/themes/base/jquery.ui.resizable.css
@@ -8,7 +8,7 @@
  * http://docs.jquery.com/UI/Resizable#theming
  */
 .ui-resizable { position: relative;}
-.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block; }
+.ui-resizable-handle { position: absolute;font-size: 0.1px; display: block; }
 .ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
 .ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
 .ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
diff --git a/ui/jquery.ui.resizable.js b/ui/jquery.ui.resizable.js
index 12383e1f9e0..3e5ad9dcb84 100644
--- a/ui/jquery.ui.resizable.js
+++ b/ui/jquery.ui.resizable.js
@@ -98,9 +98,8 @@ $.widget("ui.resizable", $.ui.mouse, {
 				var handle = $.trim(n[i]), hname = 'ui-resizable-'+handle;
 				var axis = $('<div class="ui-resizable-handle ' + hname + '"></div>');
 
-				// increase zIndex of sw, se, ne, nw axis
-				//TODO : this modifies original option
-				if(/sw|se|ne|nw/.test(handle)) axis.css({ zIndex: ++o.zIndex });
+				// Apply zIndex to all handles - see #7960
+				axis.css({ zIndex: o.zIndex });
 
 				//TODO : What's going on here?
 				if ('se' == handle) {