summaryrefslogtreecommitdiff
path: root/static/js/pichat2.js
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2012-07-18 02:05:20 -0400
committerJules Laplace <jules@okfoc.us>2012-07-18 02:05:20 -0400
commit89737bbfcdbd8b9b32fbd047ffea84b1e37d69fe (patch)
treeee0022387837c5d772535629bd41254c8005036e /static/js/pichat2.js
parent8e9978e492eee5d4fc9cf6f5233ca0fa6321b827 (diff)
paletteTimeout
Diffstat (limited to 'static/js/pichat2.js')
-rw-r--r--static/js/pichat2.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/static/js/pichat2.js b/static/js/pichat2.js
index 88956fd..631a0f0 100644
--- a/static/js/pichat2.js
+++ b/static/js/pichat2.js
@@ -617,9 +617,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);
}
};