aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--demos/effect/easing.html35
-rw-r--r--ui/jquery.effects.core.js250
2 files changed, 53 insertions, 232 deletions
diff --git a/demos/effect/easing.html b/demos/effect/easing.html
index e3270c070..f3e07a9c5 100644
--- a/demos/effect/easing.html
+++ b/demos/effect/easing.html
@@ -15,10 +15,9 @@
</style>
<script>
$(function() {
- if ( !$( "<canvas/>" )[0].getContext ) {
- $( "<div/>" ).text(
- "Your browser doesn't support canvas, which is required for this demo. " +
- "Give Firefox 3 a try!"
+ if ( !$( "<canvas>" )[0].getContext ) {
+ $( "<div>" ).text(
+ "Your browser doesn't support canvas, which is required for this demo."
).appendTo( "#graphs" );
return;
}
@@ -26,15 +25,13 @@
var i = 0,
width = 100,
height = 100;
+
$.each( $.easing, function( name, impl ) {
- // skip linear/jswing and any non functioning implementation
- if ( !$.isFunction( impl ) || /jswing/.test( name ) ) {
- return;
- }
- var graph = $( "<div/>" ).addClass( "graph" ).appendTo( "#graphs" ),
- text = $( "<div/>" ).text( ++i + ". " + name ).appendTo( graph ),
- wrap = $( "<div/>" ).appendTo( graph ).css( 'overflow', 'hidden' ),
- canvas = $( "<canvas/>" ).appendTo( wrap )[ 0 ];
+ var graph = $( "<div>" ).addClass( "graph" ).appendTo( "#graphs" ),
+ text = $( "<div>" ).text( ++i + ". " + name ).appendTo( graph ),
+ wrap = $( "<div>" ).appendTo( graph ).css( 'overflow', 'hidden' ),
+ canvas = $( "<canvas>" ).appendTo( wrap )[ 0 ];
+
canvas.width = width;
canvas.height = height;
var drawHeight = height * 0.8,
@@ -42,6 +39,7 @@
ctx = canvas.getContext( "2d" );
ctx.fillStyle = "black";
+ // draw background
ctx.beginPath();
ctx.moveTo( cradius, 0 );
ctx.quadraticCurveTo( 0, 0, 0, cradius );
@@ -53,31 +51,34 @@
ctx.lineTo( cradius, 0 );
ctx.fill();
+ // draw bottom line
ctx.strokeStyle = "#555";
ctx.beginPath();
ctx.moveTo( width * 0.1, drawHeight + .5 );
ctx.lineTo( width * 0.9, drawHeight + .5 );
ctx.stroke();
+ // draw top line
ctx.strokeStyle = "#555";
ctx.beginPath();
ctx.moveTo( width * 0.1, drawHeight * .3 - .5 );
ctx.lineTo( width * 0.9, drawHeight * .3 - .5 );
ctx.stroke();
-
+
+ // plot easing
ctx.strokeStyle = "white";
ctx.beginPath();
ctx.lineWidth = 2;
ctx.moveTo( width * 0.1, drawHeight );
$.each( new Array( width ), function( position ) {
- var val = impl( 0, position, 0, 1, height );
- if ( /linear|jswing/.test( name ) ) {
- val = position / width;
- }
+ var state = position / width,
+ val = impl( state, position, 0, 1, width );
ctx.lineTo( position * 0.8 + width * 0.1,
drawHeight - drawHeight * val * 0.7 );
});
ctx.stroke();
+
+ // animate on click
graph.click(function() {
wrap
.animate( { height: "hide" }, 2000, name )
diff --git a/ui/jquery.effects.core.js b/ui/jquery.effects.core.js
index 233b4f96d..68ed637e1 100644
--- a/ui/jquery.effects.core.js
+++ b/ui/jquery.effects.core.js
@@ -662,229 +662,49 @@ $.fn.extend({
/*********************************** EASING ***********************************/
/******************************************************************************/
-/*
- * jQuery Easing v1.3 - http://gsgd.co.uk/sandbox/jquery/easing/
- *
- * Uses the built in easing capabilities added In jQuery 1.1
- * to offer multiple easing options
- *
- * TERMS OF USE - jQuery Easing
- *
- * Open source under the BSD License.
- *
- * Copyright 2008 George McGinley Smith
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this list of
- * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list
- * of conditions and the following disclaimer in the documentation and/or other materials
- * provided with the distribution.
- *
- * Neither the name of the author nor the names of contributors may be used to endorse
- * or promote products derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
-*/
+// based on easing equations from Robert Penner (http://www.robertpenner.com/easing)
-// t: current time, b: begInnIng value, c: change In value, d: duration
-$.easing.jswing = $.easing.swing;
+var baseEasings = {};
-$.extend( $.easing, {
- def: "easeOutQuad",
- swing: function ( x, t, b, c, d ) {
- return $.easing[ $.easing.def ]( x, t, b, c, d );
- },
- easeInQuad: function ( x, t, b, c, d ) {
- return c * ( t /= d ) * t + b;
- },
- easeOutQuad: function ( x, t, b, c, d ) {
- return -c * ( t /= d ) * ( t - 2 ) + b;
- },
- easeInOutQuad: function ( x, t, b, c, d ) {
- if ( ( t /= d / 2 ) < 1 ) return c / 2 * t * t + b;
- return -c / 2 * ( ( --t ) * ( t-2 ) - 1) + b;
- },
- easeInCubic: function ( x, t, b, c, d ) {
- return c * ( t /= d ) * t * t + b;
- },
- easeOutCubic: function ( x, t, b, c, d ) {
- return c * ( ( t = t / d - 1 ) * t * t + 1 ) + b;
- },
- easeInOutCubic: function ( x, t, b, c, d ) {
- if ( ( t /= d / 2 ) < 1 ) return c / 2 * t * t * t + b;
- return c / 2 * ( ( t -= 2 ) * t * t + 2) + b;
- },
- easeInQuart: function ( x, t, b, c, d ) {
- return c * ( t /= d ) * t * t * t + b;
- },
- easeOutQuart: function ( x, t, b, c, d ) {
- return -c * ( ( t = t / d - 1 ) * t * t * t - 1) + b;
- },
- easeInOutQuart: function ( x, t, b, c, d ) {
- if ( (t /= d / 2 ) < 1 ) return c / 2 * t * t * t * t + b;
- return -c / 2 * ( ( t -= 2 ) * t * t * t - 2) + b;
- },
- easeInQuint: function ( x, t, b, c, d ) {
- return c * ( t /= d ) * t * t * t * t + b;
- },
- easeOutQuint: function ( x, t, b, c, d ) {
- return c * ( ( t = t / d - 1 ) * t * t * t * t + 1) + b;
- },
- easeInOutQuint: function ( x, t, b, c, d ) {
- if ( ( t /= d / 2 ) < 1 ) return c / 2 * t * t * t * t * t + b;
- return c / 2 * ( ( t -= 2 ) * t * t * t * t + 2) + b;
- },
- easeInSine: function ( x, t, b, c, d ) {
- return -c * Math.cos( t / d * ( Math.PI / 2 ) ) + c + b;
- },
- easeOutSine: function ( x, t, b, c, d ) {
- return c * Math.sin( t / d * ( Math.PI /2 ) ) + b;
- },
- easeInOutSine: function ( x, t, b, c, d ) {
- return -c / 2 * ( Math.cos( Math.PI * t / d ) - 1 ) + b;
- },
- easeInExpo: function ( x, t, b, c, d ) {
- return ( t==0 ) ? b : c * Math.pow( 2, 10 * ( t / d - 1) ) + b;
- },
- easeOutExpo: function ( x, t, b, c, d ) {
- return ( t==d ) ? b + c : c * ( -Math.pow( 2, -10 * t / d) + 1) + b;
- },
- easeInOutExpo: function ( x, t, b, c, d ) {
- if ( t==0 ) return b;
- if ( t==d ) return b + c;
- if ( ( t /= d / 2) < 1) return c / 2 * Math.pow( 2, 10 * (t - 1) ) + b;
- return c / 2 * ( -Math.pow( 2, -10 * --t ) + 2 ) + b;
- },
- easeInCirc: function ( x, t, b, c, d ) {
- return -c * ( Math.sqrt( 1 - ( t /= d ) * t ) - 1 ) + b;
- },
- easeOutCirc: function ( x, t, b, c, d ) {
- return c * Math.sqrt( 1 - ( t = t / d - 1 ) * t ) + b;
- },
- easeInOutCirc: function ( x, t, b, c, d ) {
- if ( ( t /= d / 2) < 1 ) return -c / 2 * ( Math.sqrt( 1 - t * t ) - 1 ) + b;
- return c / 2 * ( Math.sqrt( 1 - ( t -= 2 ) * t ) + 1 ) + b;
- },
- easeInElastic: function ( x, t, b, c, d ) {
- var s = 1.70158,
- p = d * 0.3,
- a = c;
- if ( t == 0 ) return b;
- if ( ( t /= d ) == 1 ) return b+c;
- if ( a < Math.abs( c ) ) {
- a = c;
- s = p / 4;
- } else {
- s = p / ( 2 * Math.PI ) * Math.asin( c / a );
- }
- return - ( a * Math.pow( 2, 10 * ( t -= 1 ) ) * Math.sin( ( t * d - s) * ( 2 * Math.PI ) / p ) ) + b;
- },
- easeOutElastic: function ( x, t, b, c, d ) {
- var s = 1.70158,
- p = d * 0.3,
- a = c;
- if ( t == 0 ) return b;
- if ( ( t /= d ) == 1 ) return b+c;
- if ( a < Math.abs( c ) ) {
- a = c;
- s = p / 4;
- } else {
- s = p / ( 2 * Math.PI ) * Math.asin( c / a );
- }
- return a * Math.pow( 2, -10 * t ) * Math.sin( ( t * d - s ) * ( 2 * Math.PI ) / p ) + c + b;
- },
- easeInOutElastic: function ( x, t, b, c, d ) {
- var s = 1.70158,
- p = d * ( 0.3 * 1.5 ),
- a = c;
- if ( t == 0 ) return b;
- if ( ( t /= d / 2 ) == 2 ) return b+c;
- if ( a < Math.abs( c ) ) {
- a = c;
- s = p / 4;
- } else {
- s = p / ( 2 * Math.PI ) * Math.asin( c / a );
- }
- if ( t < 1 ) return -.5 * ( a * Math.pow( 2, 10 * ( t -= 1 ) ) * Math.sin( ( t * d - s ) * ( 2 * Math.PI ) / p ) ) + b;
- return a * Math.pow( 2, -10 * ( t -= 1 ) ) * Math.sin( ( t * d - s ) * ( 2 * Math.PI ) / p ) *.5 + c + b;
- },
- easeInBack: function ( x, t, b, c, d, s ) {
- if ( s == undefined ) s = 1.70158;
- return c * ( t /= d ) * t * ( ( s+1 ) * t - s ) + b;
- },
- easeOutBack: function ( x, t, b, c, d, s ) {
- if ( s == undefined ) s = 1.70158;
- return c * ( ( t = t / d - 1 ) * t * ( ( s + 1 ) * t + s) + 1) + b;
+$.each( [ "Quad", "Cubic", "Quart", "Quint", "Expo" ], function( i, name ) {
+ baseEasings[ name ] = function( p ) {
+ return Math.pow( p, i + 2 );
+ };
+});
+
+$.extend( baseEasings, {
+ Sine: function ( p ) {
+ return 1 - Math.cos( p * Math.PI / 2 );
},
- easeInOutBack: function ( x, t, b, c, d, s ) {
- if ( s == undefined ) s = 1.70158;
- if ( ( t /= d / 2 ) < 1 ) return c / 2 * ( t * t * ( ( ( s *= 1.525 ) + 1 ) * t - s ) ) + b;
- return c / 2 * ( ( t -= 2 ) * t * ( ( ( s *= 1.525 ) + 1 ) * t + s) + 2) + b;
+ Circ: function ( p ) {
+ return 1 - Math.sqrt( 1 - p * p );
},
- easeInBounce: function ( x, t, b, c, d ) {
- return c - $.easing.easeOutBounce( x, d - t, 0, c, d ) + b;
+ Elastic: function( p ) {
+ return p === 0 || p === 1 ? p :
+ -Math.pow( 2, 8 * (p - 1) ) * Math.sin( ( (p - 1) * 80 - 7.5 ) * Math.PI / 15 );
},
- easeOutBounce: function ( x, t, b, c, d ) {
- if ( ( t /= d ) < ( 1 / 2.75 ) ) {
- return c * ( 7.5625 * t * t ) + b;
- } else if ( t < ( 2 / 2.75 ) ) {
- return c * ( 7.5625 * ( t -= ( 1.5 / 2.75 ) ) * t + .75 ) + b;
- } else if ( t < ( 2.5 / 2.75 ) ) {
- return c * ( 7.5625 * ( t -= ( 2.25/ 2.75 ) ) * t + .9375 ) + b;
- } else {
- return c * ( 7.5625 * ( t -= ( 2.625 / 2.75 ) ) * t + .984375 ) + b;
- }
+ Back: function( p ) {
+ return p * p * ( 3 * p - 2 );
},
- easeInOutBounce: function ( x, t, b, c, d ) {
- if ( t < d / 2 ) return $.easing.easeInBounce( x, t * 2, 0, c, d ) * .5 + b;
- return $.easing.easeOutBounce( x, t * 2 - d, 0, c, d ) * .5 + c * .5 + b;
+ Bounce: function ( p ) {
+ var pow2,
+ bounce = 4;
+
+ while ( p < ( ( pow2 = Math.pow( 2, --bounce ) ) - 1 ) / 11 ) {}
+ return 1 / Math.pow( 4, 3 - bounce ) - 7.5625 * Math.pow( ( pow2 * 3 - 2 ) / 22 - p, 2 );
}
});
-/*
- *
- * TERMS OF USE - EASING EQUATIONS
- *
- * Open source under the BSD License.
- *
- * Copyright 2001 Robert Penner
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this list of
- * conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list
- * of conditions and the following disclaimer in the documentation and/or other materials
- * provided with the distribution.
- *
- * Neither the name of the author nor the names of contributors may be used to endorse
- * or promote products derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
+$.each( baseEasings, function( name, easeIn ) {
+ $.easing[ "easeIn" + name ] = easeIn;
+ $.easing[ "easeOut" + name ] = function( p ) {
+ return 1 - easeIn( 1 - p );
+ };
+ $.easing[ "easeInOut" + name ] = function( p ) {
+ return p < .5 ?
+ easeIn( p * 2 ) / 2 :
+ easeIn( p * -2 + 2 ) / -2 + 1;
+ };
+});
})(jQuery);
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-07 12:27:24 +0000