Changeset 23516

Timestamp:

02/28/2013 06:02:26 PM (12 years ago)

Author:

nacin

Message:

jQuery Migrate 1.1.1. props ocean90. see #22975.

Location:

trunk/wp-includes

Files:

• js/jquery/jquery-migrate.js (modified) (8 diffs)
• script-loader.php (modified) (1 diff)

trunk/wp-includes/js/jquery/jquery-migrate.js

@@ -1 +1 @@
 /*!
- * jQuery Migrate - v1.1.0 - 2013-01-31
+ * jQuery Migrate - v1.1.1 - 2013-02-16
  * https://github.com/jquery/jquery-migrate
  * Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors; Licensed MIT
  */
 (function( jQuery, window, undefined ) {
-"use strict";
+// See http://bugs.jquery.com/ticket/13335
+// "use strict";
 
 
@@ -79 +80 @@
 
 
-var attrFn = {},
+var attrFn = jQuery( "<input/>", { size: 1 } ).attr("size") && jQuery.attrFn,
     oldAttr = jQuery.attr,
     valueAttrGet = jQuery.attrHooks.value && jQuery.attrHooks.value.get ||
@@ -91 +92 @@
 
 // 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 ) {
@@ -97 +98 @@
         nType = elem && elem.nodeType;
 
-    // Since pass is used internally, we only warn and shim for new jQuery
-    // versions where there isn't a pass arg in the formal params
-    if ( pass && oldAttr.length < 4 ) {
-        migrateWarn("jQuery.fn.attr( props, pass ) is deprecated");
-        if ( elem && !rnoAttrNodeType.test( nType ) && jQuery.isFunction( jQuery.fn[ name ] ) ) {
+    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 );
         }
@@ -238 +242 @@
 };
 
-matched = jQuery.uaMatch( navigator.userAgent );
-browser = {};
-
-if ( matched.browser ) {
-    browser[ matched.browser ] = true;
-    browser.version = matched.version;
-}
-
-// Chrome is Webkit, but Webkit is also Safari.
-if ( browser.chrome ) {
-    browser.webkit = true;
-} else if ( browser.webkit ) {
-    browser.safari = true;
-}
-
-jQuery.browser = browser;
+// Don't clobber any existing jQuery.browser in case it's different
+if ( !jQuery.browser ) {
+    matched = jQuery.uaMatch( navigator.userAgent );
+    browser = {};
+
+    if ( matched.browser ) {
+        browser[ matched.browser ] = true;
+        browser.version = matched.version;
+    }
+
+    // Chrome is Webkit, but Webkit is also Safari.
+    if ( browser.chrome ) {
+        browser.webkit = true;
+    } else if ( browser.webkit ) {
+        browser.safari = true;
+    }
+
+    jQuery.browser = 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() {
@@ -279 +286 @@
     return jQuerySub;
 };
+
+
+// Ensure that $.ajax gets the new parseJSON defined in core.js
+jQuery.ajaxSetup({
+    converters: {
+        "text json": jQuery.parseJSON
+    }
+});
 
 
@@ -368 +383 @@
     rhoverHack = /(?:^|\s)hover(\.\S+|)\b/,
     hoverHack = function( events ) {
-        if ( typeof( events ) != "string" || jQuery.event.special.hover ) {
+        if ( typeof( events ) !== "string" || jQuery.event.special.hover ) {
             return events;
         }
@@ -463 +478 @@
 // Turn global events into document-triggered events
 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" );
     }

trunk/wp-includes/script-loader.php

@@ -133 +133 @@
     $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-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