diff --git a/bower.json b/bower.json index 86af7940dc..74c4be96a2 100644 --- a/bower.json +++ b/bower.json @@ -16,8 +16,8 @@ "blueimp-md5": "~1.1.0", "handlebars": "~1.3.0", "jcrop": "~0.9.12", - "jquery": "~2.2.3", - "jquery-migrate": "~1.2.1", + "jquery": "~2.2.0", + "jquery-migrate": "~1.4.0", "jquery-ui": "1.10.0", "jsTimezoneDetect": "~1.0.5", "moment": "~2.10.0", diff --git a/core/js/tests/specs/coreSpec.js b/core/js/tests/specs/coreSpec.js index f18ecbc1a4..ac12dd7d91 100644 --- a/core/js/tests/specs/coreSpec.js +++ b/core/js/tests/specs/coreSpec.js @@ -491,7 +491,6 @@ describe('Core base tests', function() { }); it('Clicking menu toggle toggles navigation in', function() { window.initCore(); - $navigation.hide(); // normally done through media query triggered CSS expect($navigation.is(':visible')).toEqual(false); $toggle.click(); clock.tick(1 * 1000); diff --git a/core/vendor/jquery-migrate/.bower.json b/core/vendor/jquery-migrate/.bower.json index 35e7bf5f43..19fcdbf9b3 100644 --- a/core/vendor/jquery-migrate/.bower.json +++ b/core/vendor/jquery-migrate/.bower.json @@ -1,15 +1,15 @@ { "name": "jquery-migrate", - "version": "1.2.1", + "version": "1.4.0", + "main": "jquery-migrate.js", "homepage": "https://github.com/appleboy/jquery-migrate", - "_release": "1.2.1", + "_release": "1.4.0", "_resolution": { "type": "version", - "tag": "1.2.1", - "commit": "65f37b60ae3d305efbe1e85909e14c60d524d12a" + "tag": "1.4.0", + "commit": "d70e5a532864fdc2263f0d15030ef84671fc5807" }, - "_source": "git://github.com/appleboy/jquery-migrate.git", - "_target": "~1.2.1", - "_originalSource": "jquery-migrate", - "_direct": true + "_source": "https://github.com/appleboy/jquery-migrate.git", + "_target": "~1.4.0", + "_originalSource": "jquery-migrate" } \ No newline at end of file diff --git a/core/vendor/jquery-migrate/component.json b/core/vendor/jquery-migrate/component.json deleted file mode 100644 index 11efdc0165..0000000000 --- a/core/vendor/jquery-migrate/component.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name" : "jquery-migrate", - "version" : "1.2.1" -} diff --git a/core/vendor/jquery-migrate/jquery-migrate.js b/core/vendor/jquery-migrate/jquery-migrate.js index dbe8cbd4d8..e3538e9c8a 100644 --- a/core/vendor/jquery-migrate/jquery-migrate.js +++ b/core/vendor/jquery-migrate/jquery-migrate.js @@ -1,521 +1,717 @@ -/*! - * jQuery Migrate - v1.2.1 - 2013-05-08 - * https://github.com/jquery/jquery-migrate - * Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors; Licensed MIT - */ -(function( jQuery, window, undefined ) { -// See http://bugs.jquery.com/ticket/13335 -// "use strict"; - - -var warnedAbout = {}; - -// List of warnings already given; public read only -jQuery.migrateWarnings = []; - -// Set to true to prevent console output; migrateWarnings still maintained -// jQuery.migrateMute = false; - -// Show a message on the console so devs know we're active -if ( !jQuery.migrateMute && window.console && window.console.log ) { - window.console.log("JQMIGRATE: Logging is active"); -} - -// Set to false to disable traces that appear with warnings -if ( jQuery.migrateTrace === undefined ) { - jQuery.migrateTrace = true; -} - -// Forget any warnings we've already given; public -jQuery.migrateReset = function() { - warnedAbout = {}; - jQuery.migrateWarnings.length = 0; -}; - -function migrateWarn( msg) { - var console = window.console; - if ( !warnedAbout[ msg ] ) { - warnedAbout[ msg ] = true; - jQuery.migrateWarnings.push( msg ); - if ( console && console.warn && !jQuery.migrateMute ) { - console.warn( "JQMIGRATE: " + msg ); - if ( jQuery.migrateTrace && console.trace ) { - console.trace(); - } - } - } -} - -function migrateWarnProp( obj, prop, value, msg ) { - if ( Object.defineProperty ) { - // On ES5 browsers (non-oldIE), warn if the code tries to get prop; - // allow property to be overwritten in case some other plugin wants it - try { - Object.defineProperty( obj, prop, { - configurable: true, - enumerable: true, - get: function() { - migrateWarn( msg ); - return value; - }, - set: function( newValue ) { - migrateWarn( msg ); - value = newValue; - } - }); - return; - } catch( err ) { - // IE8 is a dope about Object.defineProperty, can't warn there - } - } - - // Non-ES5 (or broken) browser; just set the property - jQuery._definePropertyBroken = true; - obj[ prop ] = value; -} - -if ( document.compatMode === "BackCompat" ) { - // jQuery has never supported or tested Quirks Mode - migrateWarn( "jQuery is not compatible with Quirks Mode" ); -} - - -var attrFn = jQuery( "", { size: 1 } ).attr("size") && jQuery.attrFn, - oldAttr = jQuery.attr, - valueAttrGet = jQuery.attrHooks.value && jQuery.attrHooks.value.get || - function() { return null; }, - valueAttrSet = jQuery.attrHooks.value && jQuery.attrHooks.value.set || - function() { return undefined; }, - rnoType = /^(?:input|button)$/i, - rnoAttrNodeType = /^[238]$/, - rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i, - ruseDefault = /^(?:checked|selected)$/i; - -// jQuery.attrFn -migrateWarnProp( jQuery, "attrFn", attrFn || {}, "jQuery.attrFn is deprecated" ); - -jQuery.attr = function( elem, name, value, pass ) { - var lowerName = name.toLowerCase(), - nType = elem && elem.nodeType; - - if ( pass ) { - // Since pass is used internally, we only warn for new jQuery - // versions where there isn't a pass arg in the formal params - if ( oldAttr.length < 4 ) { - migrateWarn("jQuery.fn.attr( props, pass ) is deprecated"); - } - if ( elem && !rnoAttrNodeType.test( nType ) && - (attrFn ? name in attrFn : jQuery.isFunction(jQuery.fn[name])) ) { - return jQuery( elem )[ name ]( value ); - } - } - - // Warn if user tries to set `type`, since it breaks on IE 6/7/8; by checking - // for disconnected elements we don't warn on $( "