From 4267022178cb743b1cd535e45d30b2989e3a5673 Mon Sep 17 00:00:00 2001 From: Carl Eberhard Date: Wed, 4 Feb 2015 10:04:20 -0500 Subject: [PATCH] UI, client build: change source for jquery-migrate (no version change) --- client/GruntFile.js | 4 +- client/bower.json | 4 +- .../scripts/libs/jquery/jquery.migrate.js | 1042 ++++++++--------- static/scripts/libs/jquery/jquery.migrate.js | 1042 ++++++++--------- 4 files changed, 1046 insertions(+), 1046 deletions(-) diff --git a/client/GruntFile.js b/client/GruntFile.js index e8b8e30d3f9..09c1d3c35b2 100644 --- a/client/GruntFile.js +++ b/client/GruntFile.js @@ -68,13 +68,13 @@ module.exports = function(grunt) { // where to move fetched bower components into the build structure (libName: [ bower-location, libs-location ]) libraryLocations : { "jquery": [ "dist/jquery.js", "jquery/jquery.js" ], - "jquery-migrate-official": [ "index.js", "jquery/jquery.migrate.js" ], + "jquery-migrate": [ "jquery-migrate.js", "jquery/jquery.migrate.js" ], "traceKit": [ "tracekit.js", "tracekit.js" ], "ravenjs": [ "dist/raven.js", "raven.js" ], "underscore": [ "underscore.js", "underscore.js" ], - //"backbone": [ "backbone.js", "backbone/backbone.js" ], "handlebars": [ "handlebars.runtime.js", "handlebars.runtime.js" ] + //"backbone": [ "backbone.js", "backbone/backbone.js" ], // these need to be updated and tested //"require": [ "build/require.js", "require.js" ], diff --git a/client/bower.json b/client/bower.json index 05a34c7c014..9c41081a84d 100644 --- a/client/bower.json +++ b/client/bower.json @@ -9,7 +9,6 @@ "homepage": "usegalaxy.org", "dependencies": { "jquery": "~1.11.1", - "jquery-migrate-official": "http://code.jquery.com/jquery-migrate-1.2.1.js", "traceKit": "*", "ravenjs": "~1.1.16", "require": "*", @@ -32,7 +31,8 @@ "jstree": "~3.0.9", "jquery-ui": "git://github.com/jquery/jquery-ui.git#~1.11.2", "jquery.event.drag-drop": "~2.2.1", - "handlebars": "~2.0.0" + "handlebars": "~2.0.0", + "jquery-migrate": "~1.2.1" }, "resolutions": { "jquery": "~1.11.1" diff --git a/client/galaxy/scripts/libs/jquery/jquery.migrate.js b/client/galaxy/scripts/libs/jquery/jquery.migrate.js index 25b6c813146..dbe8cbd4d8c 100644 --- a/client/galaxy/scripts/libs/jquery/jquery.migrate.js +++ b/client/galaxy/scripts/libs/jquery/jquery.migrate.js @@ -1,521 +1,521 @@ -/*! - * 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 $( "