aboutsummaryrefslogtreecommitdiffstats
path: root/ui/effect.js
diff options
context:
space:
mode:
authorMichał Gołębiowski-Owczarek <m.goleb@gmail.com>2019-12-08 22:23:08 +0100
committerMichał Gołębiowski-Owczarek <m.goleb@gmail.com>2019-12-08 22:23:08 +0100
commit98b539171b6e805fa79346a5e9896865e5213b9c (patch)
treef6c296195f081c538f90c96f43f28012670960a5 /ui/effect.js
parent74f8a0ac952f6f45f773312292baef1c26d81300 (diff)
downloadjquery-ui-98b539171b6e805fa79346a5e9896865e5213b9c.tar.gz
jquery-ui-98b539171b6e805fa79346a5e9896865e5213b9c.zip
All: Migrate away from deprecated/removed Core APIs
Summary of the changes: * Build: Add jQuery 3.2.0-3.4.1 to versions UI can be tested against * Build: Load jQuery & Migrate via HTTPS * Build: Add package-lock.json to .gitignore * Build: Update jQuery Migrate from 3.0.0 to 3.1.0 * Build: Allow to run tests against jQuery 3.x-git * Build: Fix formatting according to JSCS rules * Build: Disable JSCS for the inlined jQuery Color * All: Switch from $.isArray to Array.isArray (jQuery.isArray will be removed in jQuery 4.0) * All: Switch from `$.isFunction( x )` to `typeof x === "function"` (jQuery.isFunction will be removed in jQuery 4.0) * All: Inline jQuery.isWindow as it'll be removed in jQuery 4.0 * Effects: Fix a timing issue in a variable declaration. Previously, a jQuery object was created, chained & assigned to a variable that was then accessed in a callback used inside of this chained definition. Due to a timing difference in when the callback fired for the first time in latest jQuery master, it was being called before the variable was defined. * Tests: Make dialog & draggable unit tests less strict (newest jQuery returns fractional results in some cases, making comparisons fail when there's a tiny difference) * All: Migrate from $.trim to bare String.prototype.trim (jQuery.trim will be deprecated in jQuery 3.5) Closes gh-1901
Diffstat (limited to 'ui/effect.js')
-rw-r--r--ui/effect.js50
1 files changed, 28 insertions, 22 deletions
diff --git a/ui/effect.js b/ui/effect.js
index 2d17affd1..f237556cf 100644
--- a/ui/effect.js
+++ b/ui/effect.js
@@ -39,6 +39,8 @@ $.effects = {
effect: {}
};
+// jscs:disable
+
/*!
* jQuery Color Animations v2.1.2
* https://github.com/jquery/jquery-color
@@ -716,6 +718,8 @@ colors = jQuery.Color.names = {
} )( jQuery );
+// jscs:enable
+
/******************************************************************************/
/****************************** CLASS ANIMATIONS ******************************/
/******************************************************************************/
@@ -1290,7 +1294,7 @@ function _normalizeArguments( effect, options, speed, callback ) {
}
// Catch (effect, callback)
- if ( $.isFunction( options ) ) {
+ if ( typeof options === "function" ) {
callback = options;
speed = null;
options = {};
@@ -1304,7 +1308,7 @@ function _normalizeArguments( effect, options, speed, callback ) {
}
// Catch (effect, options, callback)
- if ( $.isFunction( speed ) ) {
+ if ( typeof speed === "function" ) {
callback = speed;
speed = null;
}
@@ -1338,7 +1342,7 @@ function standardAnimationOption( option ) {
}
// Complete callback
- if ( $.isFunction( option ) ) {
+ if ( typeof option === "function" ) {
return true;
}
@@ -1383,7 +1387,7 @@ $.fn.extend( {
$.effects.saveStyle( el );
}
- if ( $.isFunction( next ) ) {
+ if ( typeof next === "function" ) {
next();
}
};
@@ -1418,11 +1422,11 @@ $.fn.extend( {
}
function done() {
- if ( $.isFunction( complete ) ) {
+ if ( typeof complete === "function" ) {
complete.call( elem[ 0 ] );
}
- if ( $.isFunction( next ) ) {
+ if ( typeof next === "function" ) {
next();
}
}
@@ -1531,22 +1535,24 @@ $.fn.extend( {
width: target.innerWidth()
},
startPosition = element.offset(),
- transfer = $( "<div class='ui-effects-transfer'></div>" )
- .appendTo( "body" )
- .addClass( options.className )
- .css( {
- top: startPosition.top - fixTop,
- left: startPosition.left - fixLeft,
- height: element.innerHeight(),
- width: element.innerWidth(),
- position: targetFixed ? "fixed" : "absolute"
- } )
- .animate( animation, options.duration, options.easing, function() {
- transfer.remove();
- if ( $.isFunction( done ) ) {
- done();
- }
- } );
+ transfer = $( "<div class='ui-effects-transfer'></div>" );
+
+ transfer
+ .appendTo( "body" )
+ .addClass( options.className )
+ .css( {
+ top: startPosition.top - fixTop,
+ left: startPosition.left - fixLeft,
+ height: element.innerHeight(),
+ width: element.innerWidth(),
+ position: targetFixed ? "fixed" : "absolute"
+ } )
+ .animate( animation, options.duration, options.easing, function() {
+ transfer.remove();
+ if ( typeof done === "function" ) {
+ done();
+ }
+ } );
}
} );