summaryrefslogtreecommitdiff
path: root/static/js/src
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2012-07-18 02:05:15 -0400
committerJules Laplace <jules@okfoc.us>2012-07-18 02:05:15 -0400
commit8e9978e492eee5d4fc9cf6f5233ca0fa6321b827 (patch)
tree91ad7833b31c88617143676b9e6c704e73e1fd0d /static/js/src
parent65a30a24ef122b21bc94c8d50472713211006169 (diff)
paletteTimeout
Diffstat (limited to 'static/js/src')
-rw-r--r--static/js/src/drag.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/static/js/src/drag.js b/static/js/src/drag.js
index 8ac9a9d..f6738db 100644
--- a/static/js/src/drag.js
+++ b/static/js/src/drag.js
@@ -85,9 +85,11 @@ $(function(){
manPaletteShow();
},
'leave': function() {
- paletteTimeout = setTimeout(manPaletteHideUnlessChecked, 500);
+ if (paletteTimeout) clearTimeout(paletteTimeout);
+ paletteTimeout = setTimeout(manPaletteHideUnlessLocked, 500);
},
'drop': function (url) {
+ if (paletteTimeout) clearTimeout(paletteTimeout);
addManualFav(url);
}
};