aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2011-05-10 07:52:28 -0700
committerScott González <scott.gonzalez@gmail.com>2011-05-10 07:52:28 -0700
commit1a974109ef72fcef04a2632594189387102e9778 (patch)
tree16d376127b0b96bb2e4cdb96ab3a77532b726374
parentce6209b4e492d769839bec490cc7323e4f4faed9 (diff)
parent0e2bc5efe217681c006ae7a16be21520e6563da6 (diff)
downloadjquery-ui-1a974109ef72fcef04a2632594189387102e9778.tar.gz
jquery-ui-1a974109ef72fcef04a2632594189387102e9778.zip
Merge pull request #234 from carsonmcdonald/issue6948
Resizable: Skip autohide hover action when resizable is disabled. Fix #69
-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();