<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[23516] trunk/wp-includes: jQuery Migrate 1.1.1.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/23516">23516</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-02-28 18:02:26 +0000 (Thu, 28 Feb 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>jQuery Migrate 1.1.1. props ocean90. see <a href="http://core.trac.wordpress.org/ticket/22975">#22975</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjsjqueryjquerymigratejs">trunk/wp-includes/js/jquery/jquery-migrate.js</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjsjqueryjquerymigratejs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/jquery/jquery-migrate.js (23515 => 23516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/jquery/jquery-migrate.js 2013-02-28 17:54:00 UTC (rev 23515)
+++ trunk/wp-includes/js/jquery/jquery-migrate.js 2013-02-28 18:02:26 UTC (rev 23516)
</span><span class="lines">@@ -1,10 +1,11 @@
</span><span class="cx"> /*!
</span><del>- * jQuery Migrate - v1.1.0 - 2013-01-31
</del><ins>+ * jQuery Migrate - v1.1.1 - 2013-02-16
</ins><span class="cx"> * https://github.com/jquery/jquery-migrate
</span><span class="cx"> * Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors; Licensed MIT
</span><span class="cx"> */
</span><span class="cx"> (function( jQuery, window, undefined ) {
</span><del>-"use strict";
</del><ins>+// See http://bugs.jquery.com/ticket/13335
+// "use strict";
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> var warnedAbout = {};
</span><span class="lines">@@ -78,7 +79,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-var attrFn = {},
</del><ins>+var attrFn = jQuery( "<input/>", { size: 1 } ).attr("size") && jQuery.attrFn,
</ins><span class="cx"> oldAttr = jQuery.attr,
</span><span class="cx"> valueAttrGet = jQuery.attrHooks.value && jQuery.attrHooks.value.get ||
</span><span class="cx"> function() { return null; },
</span><span class="lines">@@ -90,17 +91,20 @@
</span><span class="cx"> ruseDefault = /^(?:checked|selected)$/i;
</span><span class="cx">
</span><span class="cx"> // jQuery.attrFn
</span><del>-migrateWarnProp( jQuery, "attrFn", attrFn, "jQuery.attrFn is deprecated" );
</del><ins>+migrateWarnProp( jQuery, "attrFn", attrFn || {}, "jQuery.attrFn is deprecated" );
</ins><span class="cx">
</span><span class="cx"> jQuery.attr = function( elem, name, value, pass ) {
</span><span class="cx"> var lowerName = name.toLowerCase(),
</span><span class="cx"> nType = elem && elem.nodeType;
</span><span class="cx">
</span><del>- // 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 ] ) ) {
</del><ins>+ 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])) ) {
</ins><span class="cx"> return jQuery( elem )[ name ]( value );
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -237,25 +241,28 @@
</span><span class="cx"> };
</span><span class="cx"> };
</span><span class="cx">
</span><del>-matched = jQuery.uaMatch( navigator.userAgent );
-browser = {};
</del><ins>+// Don't clobber any existing jQuery.browser in case it's different
+if ( !jQuery.browser ) {
+ matched = jQuery.uaMatch( navigator.userAgent );
+ browser = {};
</ins><span class="cx">
</span><del>-if ( matched.browser ) {
- browser[ matched.browser ] = true;
- browser.version = matched.version;
-}
</del><ins>+ if ( matched.browser ) {
+ browser[ matched.browser ] = true;
+ browser.version = matched.version;
+ }
</ins><span class="cx">
</span><del>-// Chrome is Webkit, but Webkit is also Safari.
-if ( browser.chrome ) {
- browser.webkit = true;
-} else if ( browser.webkit ) {
- browser.safari = true;
</del><ins>+ // Chrome is Webkit, but Webkit is also Safari.
+ if ( browser.chrome ) {
+ browser.webkit = true;
+ } else if ( browser.webkit ) {
+ browser.safari = true;
+ }
+
+ jQuery.browser = browser;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-jQuery.browser = browser;
-
</del><span class="cx"> // Warn if the code tries to get jQuery.browser
</span><del>-migrateWarnProp( jQuery, "browser", browser, "jQuery.browser is deprecated" );
</del><ins>+migrateWarnProp( jQuery, "browser", jQuery.browser, "jQuery.browser is deprecated" );
</ins><span class="cx">
</span><span class="cx"> jQuery.sub = function() {
</span><span class="cx"> function jQuerySub( selector, context ) {
</span><span class="lines">@@ -280,6 +287,14 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span><ins>+// Ensure that $.ajax gets the new parseJSON defined in core.js
+jQuery.ajaxSetup({
+ converters: {
+ "text json": jQuery.parseJSON
+ }
+});
+
+
</ins><span class="cx"> var oldFnData = jQuery.fn.data;
</span><span class="cx">
</span><span class="cx"> jQuery.fn.data = function( name ) {
</span><span class="lines">@@ -367,7 +382,7 @@
</span><span class="cx"> rajaxEvent = new RegExp( "\\b(?:" + ajaxEvents + ")\\b" ),
</span><span class="cx"> rhoverHack = /(?:^|\s)hover(\.\S+|)\b/,
</span><span class="cx"> hoverHack = function( events ) {
</span><del>- if ( typeof( events ) != "string" || jQuery.event.special.hover ) {
</del><ins>+ if ( typeof( events ) !== "string" || jQuery.event.special.hover ) {
</ins><span class="cx"> return events;
</span><span class="cx"> }
</span><span class="cx"> if ( rhoverHack.test( events ) ) {
</span><span class="lines">@@ -462,7 +477,7 @@
</span><span class="cx">
</span><span class="cx"> // Turn global events into document-triggered events
</span><span class="cx"> jQuery.event.trigger = function( event, data, elem, onlyHandlers ){
</span><del>- if ( !elem & !rajaxEvent.test( event ) ) {
</del><ins>+ if ( !elem && !rajaxEvent.test( event ) ) {
</ins><span class="cx"> migrateWarn( "Global events are undocumented and deprecated" );
</span><span class="cx"> }
</span><span class="cx"> return eventTrigger.call( this, event, data, elem || document, onlyHandlers );
</span><span class="lines">@@ -493,4 +508,4 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx">
</span><del>-})( jQuery, window );
</del><span class="cx">\ No newline at end of file
</span><ins>+})( jQuery, window );
</ins></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (23515 => 23516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2013-02-28 17:54:00 UTC (rev 23515)
+++ trunk/wp-includes/script-loader.php 2013-02-28 18:02:26 UTC (rev 23516)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> // jQuery
</span><span class="cx"> $scripts->add( 'jquery', false, array( 'jquery-core', 'jquery-migrate' ) );
</span><span class="cx"> $scripts->add( 'jquery-core', '/wp-includes/js/jquery/jquery.js', array(), '1.9.1' );
</span><del>- $scripts->add( 'jquery-migrate', '/wp-includes/js/jquery/jquery-migrate.js', array(), '1.1.0' );
</del><ins>+ $scripts->add( 'jquery-migrate', '/wp-includes/js/jquery/jquery-migrate.js', array(), '1.1.1' );
</ins><span class="cx">
</span><span class="cx"> // full jQuery UI
</span><span class="cx"> $scripts->add( 'jquery-ui-core', '/wp-includes/js/jquery/ui/jquery.ui.core.min.js', array('jquery'), '1.10.1', 1 );
</span></span></pre>
</div>
</div>
</body>
</html>