merge from dev

This commit is contained in:
Luke Pulverenti
2016-01-14 12:04:42 -05:00
parent d96250df7f
commit bcfee41a57
318 changed files with 54424 additions and 6419 deletions
@@ -1,13 +1,13 @@
define([
define( [
"../core",
"../selector",
"../effects"
], function( jQuery ) {
jQuery.expr.filters.animated = function( elem ) {
return jQuery.grep(jQuery.timers, function( fn ) {
return jQuery.grep( jQuery.timers, function( fn ) {
return elem === fn.elem;
}).length;
} ).length;
};
});
} );