Skip to content

Commit

Permalink
jQuery 1.9.1 support
Browse files Browse the repository at this point in the history
  • Loading branch information
@jaukia
jaukia committed Feb 22, 2013
1 parent 73f89cd commit 497e50c
Show file tree
Hide file tree
Showing 16 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion examples/hierarchy/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<title>Hierarchy test</title>
<link rel="stylesheet" href="style.css" type="text/css" media="screen" />

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" type="text/javascript"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js" type="text/javascript"></script>
<script type="text/javascript" src="../../jquery.zoomooz.min.js"></script>

</head>
Expand Down
2 changes: 1 addition & 1 deletion examples/imagestack/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<title>Flickr Image Stack Demo</title>
<link rel="stylesheet" href="style.css" type="text/css" media="screen" />

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" type="text/javascript"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js" type="text/javascript"></script>
<script type="text/javascript" src="../../jquery.zoomooz.min.js"></script>

<script type="text/javascript">
Expand Down
2 changes: 1 addition & 1 deletion examples/isometric/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<title>Isometric test</title>
<link rel="stylesheet" href="style.css" type="text/css" media="screen" />

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" type="text/javascript"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js" type="text/javascript"></script>
<script type="text/javascript" src="../../jquery.zoomooz.min.js"></script>

<script type="text/javascript">
Expand Down
2 changes: 1 addition & 1 deletion examples/rootchange/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<title>Simple test</title>
<link rel="stylesheet" href="style.css" type="text/css" media="screen" />

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" type="text/javascript"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js" type="text/javascript"></script>

<script type="text/javascript" src="../../jquery.zoomooz.min.js"></script>

Expand Down
2 changes: 1 addition & 1 deletion examples/rotate-bug-test/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<title>Isometric test</title>
<link rel="stylesheet" href="style.css" type="text/css" media="screen" />

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" type="text/javascript"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js" type="text/javascript"></script>
<script type="text/javascript" src="../../jquery.zoomooz.min.js"></script>

<script type="text/javascript">
Expand Down
2 changes: 1 addition & 1 deletion examples/rotation/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<title>Rotation test</title>
<link rel="stylesheet" href="style.css" type="text/css" media="screen" />

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" type="text/javascript"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js" type="text/javascript"></script>
<script type="text/javascript" src="../../jquery.zoomooz.min.js"></script>

<script type="text/javascript">
Expand Down
2 changes: 1 addition & 1 deletion examples/scrolling/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<link href='http://fonts.googleapis.com/css?family=Fjord+One' rel='stylesheet' type='text/css'>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" type="text/javascript"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js" type="text/javascript"></script>

<!--<script type="text/javascript" src="../../jquery.zoomooz.min.js"></script>-->

Expand Down
2 changes: 1 addition & 1 deletion examples/simple/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<title>Simple test</title>
<link rel="stylesheet" href="style.css" type="text/css" media="screen" />

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" type="text/javascript"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js" type="text/javascript"></script>
<script type="text/javascript" src="../../jquery.zoomooz.min.js"></script>

</head>
Expand Down
2 changes: 1 addition & 1 deletion examples/skew/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<title>Simple test</title>
<link rel="stylesheet" href="style.css" type="text/css" media="screen" />

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" type="text/javascript"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js" type="text/javascript"></script>
<script type="text/javascript" src="../../jquery.zoomooz.min.js"></script>

</head>
Expand Down
2 changes: 1 addition & 1 deletion examples/svgtree/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<title>Native SVG test</title>
<link rel="stylesheet" href="style.css" type="text/css" media="screen" />

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" type="text/javascript"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js" type="text/javascript"></script>
<script type="text/javascript" src="../../jquery.zoomooz.min.js"></script>

<script type="text/javascript">
Expand Down
2 changes: 1 addition & 1 deletion examples/text/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<title>Webkit text bug</title>
<link rel="stylesheet" href="style.css" type="text/css" media="screen" />

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" type="text/javascript"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js" type="text/javascript"></script>
<!--<script type="text/javascript" src="../../jquery.zoomooz.min.js"></script>-->

<script type="text/javascript" src="../../src/js/jquery.zoomooz-helpers.js"></script>
Expand Down
8 changes: 5 additions & 3 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,18 @@

<meta name="viewport" content="initial-scale=1.0, width=device-width, height=device-height, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" type="text/javascript"></script>
<!--<script type="text/javascript" src="jquery.zoomooz.min.js"></script>-->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js" type="text/javascript"></script>
<script type="text/javascript" src="jquery.zoomooz.min.js"></script>

<!--
<script type="text/javascript" src="src/js/jquery.zoomooz-helpers.js"></script>
<script type="text/javascript" src="src/js/jquery.zoomooz-anim.js"></script>
<script type="text/javascript" src="src/js/jquery.zoomooz-core.js"></script>
<script type="text/javascript" src="src/js/jquery.zoomooz-zoomTarget.js"></script>
<script type="text/javascript" src="src/js/jquery.zoomooz-zoomContainer.js"></script>
<script type="text/javascript" src="src/js/purecssmatrix.js"></script>
<script type="text/javascript" src="src/js/sylvester.src.stripped.js"></script>
-->

<link rel="stylesheet" href="website-assets/website.css" type="text/css" media="screen">
<link href='http://fonts.googleapis.com/css?family=Varela+Round' rel='stylesheet' type='text/css'>
Expand All @@ -41,7 +43,7 @@ <h1>Zoomooz.js</h1>
<li><a href="http://github.com/jaukia/zoomooz">Fork On <strong>GitHub</strong></a></li>
</ul>

<div id="version">Latest version: 1.04 (August 7, 2012, fixed examples, iphone tuneups, transform offset fix)</div>
<div id="version">Latest version: 1.05 (February 22, 2013, jQuery 1.9.1 support)</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>

Expand Down
9 changes: 4 additions & 5 deletions jquery.zoomooz.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,15 +285,13 @@ if(!$.zoomooz) {
$.fn.animateTransformation = function(transformation, settings, animateEndCallback, animateStartedCallback) {
settings = jQuery.extend({}, default_settings, settings);

var useNativeAnim = ($.browser.webkit && settings.nativeanimation);

// FIXME: what would be the best way to handle leftover animations?
if(endCallbackTimeout) {
clearTimeout(endCallbackTimeout);
endCallbackTimeout = null;
}

if(useNativeAnim && animateEndCallback) {
if(settings.nativeanimation && animateEndCallback) {
endCallbackTimeout = setTimeout(animateEndCallback, settings.duration);
}

Expand All @@ -305,7 +303,7 @@ if(!$.zoomooz) {
var current_affine = constructAffineFixingRotation($target);
var final_affine = fixRotationToSameLap(current_affine, affineTransformDecompose(transformation));

if(useNativeAnim) {
if(settings.nativeanimation) {
$target.css(constructZoomRootCssTransform(matrixCompose(final_affine), settings.duration, settings.easing));
if(animateStartedCallback) {
animateStartedCallback();
Expand Down Expand Up @@ -608,14 +606,15 @@ if(!$.zoomooz) {
* http://janne.aukia.com/zoomooz
*
* Version history:
* 1.05 support for jQuery 1.9
* 1.04 fixed examples, iphone tuneups, transform offset fix
* 1.03 added closeclick, code structuring
* 1.02 bug fix on endcallback resetting for native animation
* 1.01 declarative syntax and fixes
* 0.92 working scrolling
* 0.91 simplifying code base and scrolling for non-body zoom roots
* 0.90 fixing margin on first body child
* 0.89 support for jquery 1.7
* 0.89 support for jQuery 1.7
* 0.88 fixed a bug with 90 deg rotations
* 0.87 fixed a bug with settings and a couple of demos
* 0.86 fixed a bug with non-body zoom root
Expand Down
2 changes: 1 addition & 1 deletion jquery.zoomooz.min.js
View file

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions src/js/jquery.zoomooz-anim.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,13 @@
$.fn.animateTransformation = function(transformation, settings, animateEndCallback, animateStartedCallback) {
settings = jQuery.extend({}, default_settings, settings);

var useNativeAnim = ($.browser.webkit && settings.nativeanimation);

// FIXME: what would be the best way to handle leftover animations?
if(endCallbackTimeout) {
clearTimeout(endCallbackTimeout);
endCallbackTimeout = null;
}

if(useNativeAnim && animateEndCallback) {
if(settings.nativeanimation && animateEndCallback) {
endCallbackTimeout = setTimeout(animateEndCallback, settings.duration);
}

Expand All @@ -91,7 +89,7 @@
var current_affine = constructAffineFixingRotation($target);
var final_affine = fixRotationToSameLap(current_affine, affineTransformDecompose(transformation));

if(useNativeAnim) {
if(settings.nativeanimation) {
$target.css(constructZoomRootCssTransform(matrixCompose(final_affine), settings.duration, settings.easing));
if(animateStartedCallback) {
animateStartedCallback();
Expand Down
3 changes: 2 additions & 1 deletion src/js/jquery.zoomooz-core.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@
* http://janne.aukia.com/zoomooz
*
* Version history:
* 1.05 support for jQuery 1.9
* 1.04 fixed examples, iphone tuneups, transform offset fix
* 1.03 added closeclick, code structuring
* 1.02 bug fix on endcallback resetting for native animation
* 1.01 declarative syntax and fixes
* 0.92 working scrolling
* 0.91 simplifying code base and scrolling for non-body zoom roots
* 0.90 fixing margin on first body child
* 0.89 support for jquery 1.7
* 0.89 support for jQuery 1.7
* 0.88 fixed a bug with 90 deg rotations
* 0.87 fixed a bug with settings and a couple of demos
* 0.86 fixed a bug with non-body zoom root
Expand Down

0 comments on commit 497e50c

Please sign in to comment.