aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorCarson McDonald <carson@ioncannon.net>2011-05-09 11:00:12 -0400
committerScott González <scott.gonzalez@gmail.com>2011-05-10 10:53:26 -0400
commit38af07ec4e916bc5fe1268b9878a21801368a78d (patch)
tree4c333d0f953a370a87ccd3c86cb3e07b8997e7b1 /ui
parent7eda94a8c916760de4093df85f58cc694838b52b (diff)
downloadjquery-ui-38af07ec4e916bc5fe1268b9878a21801368a78d.tar.gz
jquery-ui-38af07ec4e916bc5fe1268b9878a21801368a78d.zip
Resizable: Skip autohide hover action when resizable is disabled. Fix #6948 - Resizable autoHide Doesn't Work With Resizable's disable
(cherry picked from commit 0e2bc5efe217681c006ae7a16be21520e6563da6)
Diffstat (limited to 'ui')
-rw-r--r--ui/jquery.ui.resizable.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/ui/jquery.ui.resizable.js b/ui/jquery.ui.resizable.js
index 1e1706a9d..e0579ef84 100644
--- a/ui/jquery.ui.resizable.js
+++ b/ui/jquery.ui.resizable.js
@@ -176,10 +176,12 @@ $.widget("ui.resizable", $.ui.mouse, {
$(this.element)
.addClass("ui-resizable-autohide")
.hover(function() {
+ if (o.disabled) return;
$(this).removeClass("ui-resizable-autohide");
self._handles.show();
},
function(){
+ if (o.disabled) return;
if (!self.resizing) {
$(this).addClass("ui-resizable-autohide");
self._handles.hide();