Skip to content
This repository was archived by the owner on Jan 21, 2020. It is now read-only.

Commit 1f0fb2b

Browse files
committed
Merge branch 'hotfix/240'
Close #240
2 parents ca72242 + bba01c9 commit 1f0fb2b

2 files changed

Lines changed: 10 additions & 1 deletion

File tree

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ All notable changes to this project will be documented in this file, in reverse
2222

2323
### Fixed
2424

25+
- [#240](https://github.com/zendframework/zend-developer-tools/pull/240) fixes an issue with slide-in of the toolbar when resizing the browser window.
26+
2527
- [#231](https://github.com/zendframework/zend-developer-tools/pull/231) ensures literal `$` characters are escaped within toolbar content.
2628

2729
## 1.1.1 - 2016-09-08

view/zend-developer-tools/toolbar/toolbar.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
var cookieKeyHidden = "zdt-hidden";
2323
/** @type {number} */
2424
var widthHiddenState = 25;
25+
26+
var timer;
2527

2628
self.toggle = function() {
2729
!self.isHidden() ? self.hide() : self.show();
@@ -78,6 +80,11 @@
7880
* @param {number} toPosition
7981
*/
8082
function slide(toPosition) {
83+
84+
// Clear timer
85+
clearTimeout(timer);
86+
87+
8188
var increment = 30;
8289

8390
var currentPosition = (container.style.left.length > 0)
@@ -107,7 +114,7 @@
107114

108115
container.style.left = newPosition + "px";
109116

110-
setTimeout(function() { slide(toPosition); }, 3);
117+
timer = setTimeout(function() { slide(toPosition); }, 3);
111118
}
112119

113120
/**

0 commit comments

Comments
 (0)