Skip to content

Commit

Permalink
hacky fix for the back and forward buttons #66
Browse files Browse the repository at this point in the history
  • Loading branch information
jaukia committed Nov 11, 2013
1 parent 7585ad1 commit 4694cf2
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 8 deletions.
2 changes: 1 addition & 1 deletion index.html
Expand Up @@ -42,7 +42,7 @@ <h1>Zoomooz.js</h1>
<li><a href="http://github.com/jaukia/zoomooz">Fork On <strong>GitHub</strong></a></li> <li><a href="http://github.com/jaukia/zoomooz">Fork On <strong>GitHub</strong></a></li>
</ul> </ul>


<div id="version">Latest version: 1.1.8 (Nov 10, 2013, made scroll reset default to true to fix issues on webkit + long zooms #74)</div> <div id="version">Latest version: 1.1.9 (Nov 11, 2013, hacky fix for the back and forward buttons #66)</div>


<p>Zoomooz is a jQuery plugin for making web page elements zoom. It can be used for making Prezi like slideshows and for zooming to images or other details.</p> <p>Zoomooz is a jQuery plugin for making web page elements zoom. It can be used for making Prezi like slideshows and for zooming to images or other details.</p>


Expand Down
9 changes: 6 additions & 3 deletions jquery.zoomooz.js
Expand Up @@ -848,6 +848,7 @@ if(!$.zoomooz) {
* http://janne.aukia.com/zoomooz * http://janne.aukia.com/zoomooz
* *
* Version history: * Version history:
* 1.1.9 hacky fix for the back and forward buttons
* 1.1.8 made scroll reset default to true to fix issues on webkit + long zooms #74 * 1.1.8 made scroll reset default to true to fix issues on webkit + long zooms #74
* 1.1.7 moved Sylvester Matrix to a custom namespace * 1.1.7 moved Sylvester Matrix to a custom namespace
* 1.1.5 zoom for scrolled pages without flickering * 1.1.5 zoom for scrolled pages without flickering
Expand Down Expand Up @@ -1772,7 +1773,7 @@ if(!$.zoomooz) {
}()); }());


clickTarget.on("click", function(evt) { clickTarget.on("click", function(evt) {

var target; var target;
var performZoom = true; var performZoom = true;


Expand Down Expand Up @@ -1806,8 +1807,10 @@ if(!$.zoomooz) {
// not this easy! would need to read the data fields // not this easy! would need to read the data fields
//target.zoomTo(); //target.zoomTo();


// FIXME: hacky... // FIXME: hacky, and i have truly no idea, why the timeout is needed.
target.click(); setTimeout(function() {
target.click();
},10);
} else { } else {
// don't do anything if no wrap // don't do anything if no wrap
// (would be great if the button was disabled) // (would be great if the button was disabled)
Expand Down
2 changes: 1 addition & 1 deletion jquery.zoomooz.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/js/jquery.zoomooz-core.js
Expand Up @@ -3,6 +3,7 @@
* http://janne.aukia.com/zoomooz * http://janne.aukia.com/zoomooz
* *
* Version history: * Version history:
* 1.1.9 hacky fix for the back and forward buttons
* 1.1.8 made scroll reset default to true to fix issues on webkit + long zooms #74 * 1.1.8 made scroll reset default to true to fix issues on webkit + long zooms #74
* 1.1.7 moved Sylvester Matrix to a custom namespace * 1.1.7 moved Sylvester Matrix to a custom namespace
* 1.1.5 zoom for scrolled pages without flickering * 1.1.5 zoom for scrolled pages without flickering
Expand Down
8 changes: 5 additions & 3 deletions src/js/jquery.zoomooz-zoomButton.js
Expand Up @@ -125,7 +125,7 @@
}()); }());


clickTarget.on("click", function(evt) { clickTarget.on("click", function(evt) {

var target; var target;
var performZoom = true; var performZoom = true;


Expand Down Expand Up @@ -159,8 +159,10 @@
// not this easy! would need to read the data fields // not this easy! would need to read the data fields
//target.zoomTo(); //target.zoomTo();


// FIXME: hacky... // FIXME: hacky, and i have truly no idea, why the timeout is needed.
target.click(); setTimeout(function() {
target.click();
},10);
} else { } else {
// don't do anything if no wrap // don't do anything if no wrap
// (would be great if the button was disabled) // (would be great if the button was disabled)
Expand Down

0 comments on commit 4694cf2

Please sign in to comment.