|
139 | 139 | djdt.show_toolbar(); |
140 | 140 | } |
141 | 141 | }); |
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) { |
145 | 145 | // Chrome can send spurious mousemove events, so don't do anything unless the |
146 | 146 | // cursor really moved. Otherwise, it will be impossible to expand the toolbar |
147 | 147 | // due to djdt.handleDragged being set to true. |
148 | 148 | if (djdt.handleDragged || event.pageY != startPageY) { |
149 | | - var top = baseY + event.clientY; |
| 149 | + var top = baseY + event.pageY; |
150 | 150 |
|
151 | 151 | if (top < 0) { |
152 | 152 | 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; |
155 | 155 | } |
156 | 156 |
|
157 | | - handle.css({top: top}); |
| 157 | + handle.style.top = top + 'px'; |
158 | 158 | djdt.handleDragged = true; |
159 | 159 | } |
160 | 160 | }; |
161 | 161 | djDebug.querySelector('#djShowToolBarButton').addEventListener('mousedown', function(event) { |
162 | 162 | event.preventDefault(); |
163 | 163 | 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); |
167 | 166 | }); |
168 | | - document.addEventListener('mouseup', function(event) { |
169 | | - document.removeEventListener('mousemove', onMouseMove); |
| 167 | + document.addEventListener('mouseup', function (event) { |
| 168 | + document.removeEventListener('mousemove', onHandleMove); |
170 | 169 | if (djdt.handleDragged) { |
171 | 170 | event.preventDefault(); |
172 | | - var top = handle.offset().top - window.pageYOffset; |
173 | | - djdt.cookie.set('djdttop', top, { |
| 171 | + djdt.cookie.set('djdttop', handle.offsetTop, { |
174 | 172 | path: '/', |
175 | 173 | expires: 10 |
176 | 174 | }); |
|
198 | 196 | djdt.hide_panels(); |
199 | 197 | $('#djDebugToolbar').hide('fast'); |
200 | 198 |
|
201 | | - var handle = $('#djDebugToolbarHandle'); |
202 | | - handle.show(); |
| 199 | + var handle = document.querySelector('#djDebugToolbarHandle'); |
| 200 | + $(handle).show(); |
203 | 201 | // set handle position |
204 | 202 | var handleTop = djdt.cookie.get('djdttop'); |
205 | 203 | 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'; |
208 | 206 | } |
209 | 207 |
|
210 | 208 | // Unbind keydown |
|
0 commit comments