aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAymeric Augustin2014-04-25 18:59:53 +0200
committerAymeric Augustin2014-04-25 18:59:53 +0200
commit33b8063e1c2bd7349558672df6d5a8f0ed9475b1 (patch)
tree0cb8cda91f1e67eb8c1a3afb4ec2eca470931dab
parent727b4e05f59c15904f7b08388220b7bfc76d59b2 (diff)
parent9bee94d9c00f856be513143927a5299388ee5f59 (diff)
downloaddjango-debug-toolbar-33b8063e1c2bd7349558672df6d5a8f0ed9475b1.tar.bz2
Merge pull request #587 from living180/work_around_chrome_mousemove
Work around spurious mousemove on Chrome.
-rw-r--r--debug_toolbar/static/debug_toolbar/js/toolbar.js16
1 files changed, 11 insertions, 5 deletions
diff --git a/debug_toolbar/static/debug_toolbar/js/toolbar.js b/debug_toolbar/static/debug_toolbar/js/toolbar.js
index 45bea59..771bdda 100644
--- a/debug_toolbar/static/debug_toolbar/js/toolbar.js
+++ b/debug_toolbar/static/debug_toolbar/js/toolbar.js
@@ -132,12 +132,18 @@
});
var handle = $('#djDebugToolbarHandle');
$('#djShowToolBarButton').on('mousedown', function (event) {
- var baseY = handle.offset().top - event.pageY;
+ var startPageY = event.pageY;
+ var baseY = handle.offset().top - startPageY;
$(document).on('mousemove.djDebug', function (event) {
- var offset = handle.offset();
- offset.top = baseY + event.pageY;
- handle.offset(offset);
- djdt.handleDragged = true;
+ // Chrome can send spurious mousemove events, so don't do anything unless the
+ // cursor really moved. Otherwise, it will be impossible to expand the toolbar
+ // due to djdt.handleDragged being set to true.
+ if (djdt.handleDragged || event.pageY != startPageY) {
+ var offset = handle.offset();
+ offset.top = baseY + event.pageY;
+ handle.offset(offset);
+ djdt.handleDragged = true;
+ }
});
return false;
});