WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

jQuery Migrate 1.1.1. props ocean90. see #22975. 

git-svn-id: http://core.svn.wordpress.org/trunk@23516 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2013-02-28 18:02:26 +00:00
parent a41d51a765
commit 31aaad4e84
2 changed files with 43 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
wp-includes/js/jquery/jquery-migrate.js vendored
View File

@ -1,10 +1,11 @@
/*! /*!
* jQuery Migrate - v1.1.0 - 2013-01-31 * jQuery Migrate - v1.1.1 - 2013-02-16
* https://github.com/jquery/jquery-migrate * https://github.com/jquery/jquery-migrate
* Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors; Licensed MIT * Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors; Licensed MIT
*/ */
(function( jQuery, window, undefined ) { (function( jQuery, window, undefined ) {
"use strict"; // See http://bugs.jquery.com/ticket/13335
// "use strict";
var warnedAbout = {}; var warnedAbout = {};
@ -78,7 +79,7 @@ if ( document.compatMode === "BackCompat" ) {
} }
var attrFn = {}, var attrFn = jQuery( "<input/>", { size: 1 } ).attr("size") && jQuery.attrFn,
oldAttr = jQuery.attr, oldAttr = jQuery.attr,
valueAttrGet = jQuery.attrHooks.value && jQuery.attrHooks.value.get || valueAttrGet = jQuery.attrHooks.value && jQuery.attrHooks.value.get ||
function() { return null; }, function() { return null; },
@ -90,17 +91,20 @@ var attrFn = {},
ruseDefault = /^(?:checked|selected)$/i; ruseDefault = /^(?:checked|selected)$/i;
// jQuery.attrFn // jQuery.attrFn
migrateWarnProp( jQuery, "attrFn", attrFn, "jQuery.attrFn is deprecated" ); migrateWarnProp( jQuery, "attrFn", attrFn || {}, "jQuery.attrFn is deprecated" );
jQuery.attr = function( elem, name, value, pass ) { jQuery.attr = function( elem, name, value, pass ) {
var lowerName = name.toLowerCase(), var lowerName = name.toLowerCase(),
nType = elem && elem.nodeType; nType = elem && elem.nodeType;
// Since pass is used internally, we only warn and shim for new jQuery 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 // versions where there isn't a pass arg in the formal params
if ( pass && oldAttr.length < 4 ) { if ( oldAttr.length < 4 ) {
migrateWarn("jQuery.fn.attr( props, pass ) is deprecated"); migrateWarn("jQuery.fn.attr( props, pass ) is deprecated");
if ( elem && !rnoAttrNodeType.test( nType ) && jQuery.isFunction( jQuery.fn[ name ] ) ) { }
if ( elem && !rnoAttrNodeType.test( nType ) &&
(attrFn ? name in attrFn : jQuery.isFunction(jQuery.fn[name])) ) {
return jQuery( elem )[ name ]( value ); return jQuery( elem )[ name ]( value );
} }
} }
@ -237,6 +241,8 @@ jQuery.uaMatch = function( ua ) {
}; };
}; };
// Don't clobber any existing jQuery.browser in case it's different
if ( !jQuery.browser ) {
matched = jQuery.uaMatch( navigator.userAgent ); matched = jQuery.uaMatch( navigator.userAgent );
browser = {}; browser = {};
@ -253,9 +259,10 @@ if ( browser.chrome ) {
} }
jQuery.browser = browser; jQuery.browser = browser;
}
// Warn if the code tries to get jQuery.browser // Warn if the code tries to get jQuery.browser
migrateWarnProp( jQuery, "browser", browser, "jQuery.browser is deprecated" ); migrateWarnProp( jQuery, "browser", jQuery.browser, "jQuery.browser is deprecated" );
jQuery.sub = function() { jQuery.sub = function() {
function jQuerySub( selector, context ) { function jQuerySub( selector, context ) {
@ -280,6 +287,14 @@ jQuery.sub = function() {
}; };
// Ensure that $.ajax gets the new parseJSON defined in core.js
jQuery.ajaxSetup({
converters: {
"text json": jQuery.parseJSON
}
});
var oldFnData = jQuery.fn.data; var oldFnData = jQuery.fn.data;
jQuery.fn.data = function( name ) { jQuery.fn.data = function( name ) {
@ -367,7 +382,7 @@ var eventAdd = jQuery.event.add,
rajaxEvent = new RegExp( "\\b(?:" + ajaxEvents + ")\\b" ), rajaxEvent = new RegExp( "\\b(?:" + ajaxEvents + ")\\b" ),
rhoverHack = /(?:^|\s)hover(\.\S+|)\b/, rhoverHack = /(?:^|\s)hover(\.\S+|)\b/,
hoverHack = function( events ) { hoverHack = function( events ) {
if ( typeof( events ) != "string" || jQuery.event.special.hover ) { if ( typeof( events ) !== "string" || jQuery.event.special.hover ) {
return events; return events;
} }
if ( rhoverHack.test( events ) ) { if ( rhoverHack.test( events ) ) {
@ -462,7 +477,7 @@ jQuery.fn.die = function( types, fn ) {
// Turn global events into document-triggered events // Turn global events into document-triggered events
jQuery.event.trigger = function( event, data, elem, onlyHandlers ){ jQuery.event.trigger = function( event, data, elem, onlyHandlers ){
if ( !elem & !rajaxEvent.test( event ) ) { if ( !elem && !rajaxEvent.test( event ) ) {
migrateWarn( "Global events are undocumented and deprecated" ); migrateWarn( "Global events are undocumented and deprecated" );
} }
return eventTrigger.call( this, event, data, elem || document, onlyHandlers ); return eventTrigger.call( this, event, data, elem || document, onlyHandlers );

2
wp-includes/script-loader.php
View File

@ -132,7 +132,7 @@ function wp_default_scripts( &$scripts ) {
// jQuery // jQuery
$scripts->add( 'jquery', false, array( 'jquery-core', 'jquery-migrate' ) ); $scripts->add( 'jquery', false, array( 'jquery-core', 'jquery-migrate' ) );
$scripts->add( 'jquery-core', '/wp-includes/js/jquery/jquery.js', array(), '1.9.1' ); $scripts->add( 'jquery-core', '/wp-includes/js/jquery/jquery.js', array(), '1.9.1' );
$scripts->add( 'jquery-migrate', '/wp-includes/js/jquery/jquery-migrate.js', array(), '1.1.0' ); $scripts->add( 'jquery-migrate', '/wp-includes/js/jquery/jquery-migrate.js', array(), '1.1.1' );
// full jQuery UI // full jQuery UI
$scripts->add( 'jquery-ui-core', '/wp-includes/js/jquery/ui/jquery.ui.core.min.js', array('jquery'), '1.10.1', 1 ); $scripts->add( 'jquery-ui-core', '/wp-includes/js/jquery/ui/jquery.ui.core.min.js', array('jquery'), '1.10.1', 1 );