Skip to content

Commit c78e474

Browse files
committed
port handle movement
1 parent 1ed21d5 commit c78e474

File tree

1 file changed

+16
-18
lines changed

1 file changed

+16
-18
lines changed

debug_toolbar/static/debug_toolbar/js/toolbar.js

+16-18
Original file line numberDiff line numberDiff line change
@@ -139,38 +139,36 @@
139139
djdt.show_toolbar();
140140
}
141141
});
142-
var startPageY, baseY, windowHeight;
143-
var handle = $('#djDebugToolbarHandle');
144-
var onMouseMove = function(event) {
142+
var startPageY, baseY;
143+
var handle = document.querySelector('#djDebugToolbarHandle');
144+
var onHandleMove = function(event) {
145145
// Chrome can send spurious mousemove events, so don't do anything unless the
146146
// cursor really moved. Otherwise, it will be impossible to expand the toolbar
147147
// due to djdt.handleDragged being set to true.
148148
if (djdt.handleDragged || event.pageY != startPageY) {
149-
var top = baseY + event.clientY;
149+
var top = baseY + event.pageY;
150150

151151
if (top < 0) {
152152
top = 0;
153-
} else if (top + handle.height() > windowHeight) {
154-
top = windowHeight - handle.height();
153+
} else if (top + handle.offsetHeight > window.innerHeight) {
154+
top = window.innerHeight - handle.offsetHeight;
155155
}
156156

157-
handle.css({top: top});
157+
handle.style.top = top + 'px';
158158
djdt.handleDragged = true;
159159
}
160160
};
161161
djDebug.querySelector('#djShowToolBarButton').addEventListener('mousedown', function(event) {
162162
event.preventDefault();
163163
startPageY = event.pageY;
164-
baseY = handle.offset().top - startPageY;
165-
windowHeight = $(window).height();
166-
document.addEventListener('mousemove', onMouseMove);
164+
baseY = handle.offsetTop - startPageY;
165+
document.addEventListener('mousemove', onHandleMove);
167166
});
168-
document.addEventListener('mouseup', function(event) {
169-
document.removeEventListener('mousemove', onMouseMove);
167+
document.addEventListener('mouseup', function (event) {
168+
document.removeEventListener('mousemove', onHandleMove);
170169
if (djdt.handleDragged) {
171170
event.preventDefault();
172-
var top = handle.offset().top - window.pageYOffset;
173-
djdt.cookie.set('djdttop', top, {
171+
djdt.cookie.set('djdttop', handle.offsetTop, {
174172
path: '/',
175173
expires: 10
176174
});
@@ -198,13 +196,13 @@
198196
djdt.hide_panels();
199197
$('#djDebugToolbar').hide('fast');
200198

201-
var handle = $('#djDebugToolbarHandle');
202-
handle.show();
199+
var handle = document.querySelector('#djDebugToolbarHandle');
200+
$(handle).show();
203201
// set handle position
204202
var handleTop = djdt.cookie.get('djdttop');
205203
if (handleTop) {
206-
handleTop = Math.min(handleTop, window.innerHeight - handle.outerHeight() - 10);
207-
handle.css({top: handleTop + 'px'});
204+
handleTop = Math.min(handleTop, window.innerHeight - handle.offsetHeight);
205+
handle.style.top = handleTop + 'px';
208206
}
209207

210208
// Unbind keydown

0 commit comments

Comments
 (0)