Merge pull request #1690 from ZeroNetPlus/jquery
[Ready to be merged] Updated jQuery
This commit is contained in:
ZeroNet
GitHub
commit
776e214789
2 changed files with 130 additions and 169 deletions
6
src/Ui/media/lib/00-jquery.min.js
vendored
6
src/Ui/media/lib/00-jquery.min.js
vendored
File diff suppressed because one or more lines are too long
|
|
@ -1,205 +1,168 @@
|
||||||
/*
|
/*
|
||||||
* jQuery Easing v1.3 - http://gsgd.co.uk/sandbox/jquery/easing/
|
* jQuery Easing v1.4.1 - http://gsgd.co.uk/sandbox/jquery/easing/
|
||||||
*
|
* Open source under the BSD License.
|
||||||
* 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
|
* Copyright © 2008 George McGinley Smith
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
* https://raw.github.com/gdsmith/jquery-easing/master/LICENSE
|
||||||
* 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.
|
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// t: current time, b: begInnIng value, c: change In value, d: duration
|
(function (factory) {
|
||||||
jQuery.easing['jswing'] = jQuery.easing['swing'];
|
if (typeof define === "function" && define.amd) {
|
||||||
|
define(['jquery'], function ($) {
|
||||||
|
return factory($);
|
||||||
|
});
|
||||||
|
} else if (typeof module === "object" && typeof module.exports === "object") {
|
||||||
|
exports = factory(require('jquery'));
|
||||||
|
} else {
|
||||||
|
factory(jQuery);
|
||||||
|
}
|
||||||
|
})(function($){
|
||||||
|
|
||||||
jQuery.extend( jQuery.easing,
|
// Preserve the original jQuery "swing" easing as "jswing"
|
||||||
|
if (typeof $.easing !== 'undefined') {
|
||||||
|
$.easing['jswing'] = $.easing['swing'];
|
||||||
|
}
|
||||||
|
|
||||||
|
var pow = Math.pow,
|
||||||
|
sqrt = Math.sqrt,
|
||||||
|
sin = Math.sin,
|
||||||
|
cos = Math.cos,
|
||||||
|
PI = Math.PI,
|
||||||
|
c1 = 1.70158,
|
||||||
|
c2 = c1 * 1.525,
|
||||||
|
c3 = c1 + 1,
|
||||||
|
c4 = ( 2 * PI ) / 3,
|
||||||
|
c5 = ( 2 * PI ) / 4.5;
|
||||||
|
|
||||||
|
// x is the fraction of animation progress, in the range 0..1
|
||||||
|
function bounceOut(x) {
|
||||||
|
var n1 = 7.5625,
|
||||||
|
d1 = 2.75;
|
||||||
|
if ( x < 1/d1 ) {
|
||||||
|
return n1*x*x;
|
||||||
|
} else if ( x < 2/d1 ) {
|
||||||
|
return n1*(x-=(1.5/d1))*x + .75;
|
||||||
|
} else if ( x < 2.5/d1 ) {
|
||||||
|
return n1*(x-=(2.25/d1))*x + .9375;
|
||||||
|
} else {
|
||||||
|
return n1*(x-=(2.625/d1))*x + .984375;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$.extend( $.easing,
|
||||||
{
|
{
|
||||||
def: 'easeOutQuad',
|
def: 'easeOutQuad',
|
||||||
swing: function (x, t, b, c, d) {
|
swing: function (x) {
|
||||||
//alert(jQuery.easing.default);
|
return $.easing[$.easing.def](x);
|
||||||
return jQuery.easing[jQuery.easing.def](x, t, b, c, d);
|
|
||||||
},
|
},
|
||||||
easeInQuad: function (x, t, b, c, d) {
|
easeInQuad: function (x) {
|
||||||
return c*(t/=d)*t + b;
|
return x * x;
|
||||||
},
|
},
|
||||||
easeOutQuad: function (x, t, b, c, d) {
|
easeOutQuad: function (x) {
|
||||||
return -c *(t/=d)*(t-2) + b;
|
return 1 - ( 1 - x ) * ( 1 - x );
|
||||||
},
|
},
|
||||||
easeInOutQuad: function (x, t, b, c, d) {
|
easeInOutQuad: function (x) {
|
||||||
if ((t/=d/2) < 1) return c/2*t*t + b;
|
return x < 0.5 ?
|
||||||
return -c/2 * ((--t)*(t-2) - 1) + b;
|
2 * x * x :
|
||||||
|
1 - pow( -2 * x + 2, 2 ) / 2;
|
||||||
},
|
},
|
||||||
easeInCubic: function (x, t, b, c, d) {
|
easeInCubic: function (x) {
|
||||||
return c*(t/=d)*t*t + b;
|
return x * x * x;
|
||||||
},
|
},
|
||||||
easeOutCubic: function (x, t, b, c, d) {
|
easeOutCubic: function (x) {
|
||||||
return c*((t=t/d-1)*t*t + 1) + b;
|
return 1 - pow( 1 - x, 3 );
|
||||||
},
|
},
|
||||||
easeInOutCubic: function (x, t, b, c, d) {
|
easeInOutCubic: function (x) {
|
||||||
if ((t/=d/2) < 1) return c/2*t*t*t + b;
|
return x < 0.5 ?
|
||||||
return c/2*((t-=2)*t*t + 2) + b;
|
4 * x * x * x :
|
||||||
|
1 - pow( -2 * x + 2, 3 ) / 2;
|
||||||
},
|
},
|
||||||
easeInQuart: function (x, t, b, c, d) {
|
easeInQuart: function (x) {
|
||||||
return c*(t/=d)*t*t*t + b;
|
return x * x * x * x;
|
||||||
},
|
},
|
||||||
easeOutQuart: function (x, t, b, c, d) {
|
easeOutQuart: function (x) {
|
||||||
return -c * ((t=t/d-1)*t*t*t - 1) + b;
|
return 1 - pow( 1 - x, 4 );
|
||||||
},
|
},
|
||||||
easeInOutQuart: function (x, t, b, c, d) {
|
easeInOutQuart: function (x) {
|
||||||
if ((t/=d/2) < 1) return c/2*t*t*t*t + b;
|
return x < 0.5 ?
|
||||||
return -c/2 * ((t-=2)*t*t*t - 2) + b;
|
8 * x * x * x * x :
|
||||||
|
1 - pow( -2 * x + 2, 4 ) / 2;
|
||||||
},
|
},
|
||||||
easeInQuint: function (x, t, b, c, d) {
|
easeInQuint: function (x) {
|
||||||
return c*(t/=d)*t*t*t*t + b;
|
return x * x * x * x * x;
|
||||||
},
|
},
|
||||||
easeOutQuint: function (x, t, b, c, d) {
|
easeOutQuint: function (x) {
|
||||||
return c*((t=t/d-1)*t*t*t*t + 1) + b;
|
return 1 - pow( 1 - x, 5 );
|
||||||
},
|
},
|
||||||
easeInOutQuint: function (x, t, b, c, d) {
|
easeInOutQuint: function (x) {
|
||||||
if ((t/=d/2) < 1) return c/2*t*t*t*t*t + b;
|
return x < 0.5 ?
|
||||||
return c/2*((t-=2)*t*t*t*t + 2) + b;
|
16 * x * x * x * x * x :
|
||||||
|
1 - pow( -2 * x + 2, 5 ) / 2;
|
||||||
},
|
},
|
||||||
easeInSine: function (x, t, b, c, d) {
|
easeInSine: function (x) {
|
||||||
return -c * Math.cos(t/d * (Math.PI/2)) + c + b;
|
return 1 - cos( x * PI/2 );
|
||||||
},
|
},
|
||||||
easeOutSine: function (x, t, b, c, d) {
|
easeOutSine: function (x) {
|
||||||
return c * Math.sin(t/d * (Math.PI/2)) + b;
|
return sin( x * PI/2 );
|
||||||
},
|
},
|
||||||
easeInOutSine: function (x, t, b, c, d) {
|
easeInOutSine: function (x) {
|
||||||
return -c/2 * (Math.cos(Math.PI*t/d) - 1) + b;
|
return -( cos( PI * x ) - 1 ) / 2;
|
||||||
},
|
},
|
||||||
easeInExpo: function (x, t, b, c, d) {
|
easeInExpo: function (x) {
|
||||||
return (t==0) ? b : c * Math.pow(2, 10 * (t/d - 1)) + b;
|
return x === 0 ? 0 : pow( 2, 10 * x - 10 );
|
||||||
},
|
},
|
||||||
easeOutExpo: function (x, t, b, c, d) {
|
easeOutExpo: function (x) {
|
||||||
return (t==d) ? b+c : c * (-Math.pow(2, -10 * t/d) + 1) + b;
|
return x === 1 ? 1 : 1 - pow( 2, -10 * x );
|
||||||
},
|
},
|
||||||
easeInOutExpo: function (x, t, b, c, d) {
|
easeInOutExpo: function (x) {
|
||||||
if (t==0) return b;
|
return x === 0 ? 0 : x === 1 ? 1 : x < 0.5 ?
|
||||||
if (t==d) return b+c;
|
pow( 2, 20 * x - 10 ) / 2 :
|
||||||
if ((t/=d/2) < 1) return c/2 * Math.pow(2, 10 * (t - 1)) + b;
|
( 2 - pow( 2, -20 * x + 10 ) ) / 2;
|
||||||
return c/2 * (-Math.pow(2, -10 * --t) + 2) + b;
|
|
||||||
},
|
},
|
||||||
easeInCirc: function (x, t, b, c, d) {
|
easeInCirc: function (x) {
|
||||||
return -c * (Math.sqrt(1 - (t/=d)*t) - 1) + b;
|
return 1 - sqrt( 1 - pow( x, 2 ) );
|
||||||
},
|
},
|
||||||
easeOutCirc: function (x, t, b, c, d) {
|
easeOutCirc: function (x) {
|
||||||
return c * Math.sqrt(1 - (t=t/d-1)*t) + b;
|
return sqrt( 1 - pow( x - 1, 2 ) );
|
||||||
},
|
},
|
||||||
easeInOutCirc: function (x, t, b, c, d) {
|
easeInOutCirc: function (x) {
|
||||||
if ((t/=d/2) < 1) return -c/2 * (Math.sqrt(1 - t*t) - 1) + b;
|
return x < 0.5 ?
|
||||||
return c/2 * (Math.sqrt(1 - (t-=2)*t) + 1) + b;
|
( 1 - sqrt( 1 - pow( 2 * x, 2 ) ) ) / 2 :
|
||||||
|
( sqrt( 1 - pow( -2 * x + 2, 2 ) ) + 1 ) / 2;
|
||||||
},
|
},
|
||||||
easeInElastic: function (x, t, b, c, d) {
|
easeInElastic: function (x) {
|
||||||
var s=1.70158;var p=0;var a=c;
|
return x === 0 ? 0 : x === 1 ? 1 :
|
||||||
if (t==0) return b; if ((t/=d)==1) return b+c; if (!p) p=d*.3;
|
-pow( 2, 10 * x - 10 ) * sin( ( x * 10 - 10.75 ) * c4 );
|
||||||
if (a < Math.abs(c)) { a=c; var s=p/4; }
|
|
||||||
else var 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) {
|
easeOutElastic: function (x) {
|
||||||
var s=1.70158;var p=0;var a=c;
|
return x === 0 ? 0 : x === 1 ? 1 :
|
||||||
if (t==0) return b; if ((t/=d)==1) return b+c; if (!p) p=d*.3;
|
pow( 2, -10 * x ) * sin( ( x * 10 - 0.75 ) * c4 ) + 1;
|
||||||
if (a < Math.abs(c)) { a=c; var s=p/4; }
|
|
||||||
else var 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) {
|
easeInOutElastic: function (x) {
|
||||||
var s=1.70158;var p=0;var a=c;
|
return x === 0 ? 0 : x === 1 ? 1 : x < 0.5 ?
|
||||||
if (t==0) return b; if ((t/=d/2)==2) return b+c; if (!p) p=d*(.3*1.5);
|
-( pow( 2, 20 * x - 10 ) * sin( ( 20 * x - 11.125 ) * c5 )) / 2 :
|
||||||
if (a < Math.abs(c)) { a=c; var s=p/4; }
|
pow( 2, -20 * x + 10 ) * sin( ( 20 * x - 11.125 ) * c5 ) / 2 + 1;
|
||||||
else var 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) {
|
easeInBack: function (x) {
|
||||||
if (s == undefined) s = 1.70158;
|
return c3 * x * x * x - c1 * x * x;
|
||||||
return c*(t/=d)*t*((s+1)*t - s) + b;
|
|
||||||
},
|
},
|
||||||
easeOutBack: function (x, t, b, c, d, s) {
|
easeOutBack: function (x) {
|
||||||
if (s == undefined) s = 1.70158;
|
return 1 + c3 * pow( x - 1, 3 ) + c1 * pow( x - 1, 2 );
|
||||||
return c*((t=t/d-1)*t*((s+1)*t + s) + 1) + b;
|
|
||||||
},
|
},
|
||||||
easeInOutBack: function (x, t, b, c, d, s) {
|
easeInOutBack: function (x) {
|
||||||
if (s == undefined) s = 1.70158;
|
return x < 0.5 ?
|
||||||
if ((t/=d/2) < 1) return c/2*(t*t*(((s*=(1.525))+1)*t - s)) + b;
|
( pow( 2 * x, 2 ) * ( ( c2 + 1 ) * 2 * x - c2 ) ) / 2 :
|
||||||
return c/2*((t-=2)*t*(((s*=(1.525))+1)*t + s) + 2) + b;
|
( pow( 2 * x - 2, 2 ) *( ( c2 + 1 ) * ( x * 2 - 2 ) + c2 ) + 2 ) / 2;
|
||||||
},
|
},
|
||||||
easeInBounce: function (x, t, b, c, d) {
|
easeInBounce: function (x) {
|
||||||
return c - jQuery.easing.easeOutBounce (x, d-t, 0, c, d) + b;
|
return 1 - bounceOut( 1 - x );
|
||||||
},
|
},
|
||||||
easeOutBounce: function (x, t, b, c, d) {
|
easeOutBounce: bounceOut,
|
||||||
if ((t/=d) < (1/2.75)) {
|
easeInOutBounce: function (x) {
|
||||||
return c*(7.5625*t*t) + b;
|
return x < 0.5 ?
|
||||||
} else if (t < (2/2.75)) {
|
( 1 - bounceOut( 1 - 2 * x ) ) / 2 :
|
||||||
return c*(7.5625*(t-=(1.5/2.75))*t + .75) + b;
|
( 1 + bounceOut( 2 * x - 1 ) ) / 2;
|
||||||
} 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;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
easeInOutBounce: function (x, t, b, c, d) {
|
|
||||||
if (t < d/2) return jQuery.easing.easeInBounce (x, t*2, 0, c, d) * .5 + b;
|
|
||||||
return jQuery.easing.easeOutBounce (x, t*2-d, 0, c, d) * .5 + c*.5 + b;
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
/*
|
});
|
||||||
*
|
|
||||||
* 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.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue