<!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>[29920] trunk/src/wp-includes: Update jQuery UI to 1.11.2.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/29920">29920</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/29920","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-10-16 19:01:44 +0000 (Thu, 16 Oct 2014)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Update jQuery UI to 1.11.2.
Changelog: http://jqueryui.com/changelog/1.11.2/
see <a href="https://core.trac.wordpress.org/ticket/29833">#29833</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsjqueryuiaccordionjs">trunk/src/wp-includes/js/jquery/ui/accordion.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuiautocompletejs">trunk/src/wp-includes/js/jquery/ui/autocomplete.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuibuttonjs">trunk/src/wp-includes/js/jquery/ui/button.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuicorejs">trunk/src/wp-includes/js/jquery/ui/core.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuidatepickerjs">trunk/src/wp-includes/js/jquery/ui/datepicker.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuidialogjs">trunk/src/wp-includes/js/jquery/ui/dialog.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuidraggablejs">trunk/src/wp-includes/js/jquery/ui/draggable.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuidroppablejs">trunk/src/wp-includes/js/jquery/ui/droppable.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuieffectblindjs">trunk/src/wp-includes/js/jquery/ui/effect-blind.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuieffectbouncejs">trunk/src/wp-includes/js/jquery/ui/effect-bounce.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuieffectclipjs">trunk/src/wp-includes/js/jquery/ui/effect-clip.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuieffectdropjs">trunk/src/wp-includes/js/jquery/ui/effect-drop.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuieffectexplodejs">trunk/src/wp-includes/js/jquery/ui/effect-explode.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuieffectfadejs">trunk/src/wp-includes/js/jquery/ui/effect-fade.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuieffectfoldjs">trunk/src/wp-includes/js/jquery/ui/effect-fold.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuieffecthighlightjs">trunk/src/wp-includes/js/jquery/ui/effect-highlight.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuieffectpuffjs">trunk/src/wp-includes/js/jquery/ui/effect-puff.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuieffectpulsatejs">trunk/src/wp-includes/js/jquery/ui/effect-pulsate.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuieffectscalejs">trunk/src/wp-includes/js/jquery/ui/effect-scale.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuieffectshakejs">trunk/src/wp-includes/js/jquery/ui/effect-shake.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuieffectsizejs">trunk/src/wp-includes/js/jquery/ui/effect-size.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuieffectslidejs">trunk/src/wp-includes/js/jquery/ui/effect-slide.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuieffecttransferjs">trunk/src/wp-includes/js/jquery/ui/effect-transfer.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuieffectjs">trunk/src/wp-includes/js/jquery/ui/effect.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuimenujs">trunk/src/wp-includes/js/jquery/ui/menu.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuimousejs">trunk/src/wp-includes/js/jquery/ui/mouse.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuipositionjs">trunk/src/wp-includes/js/jquery/ui/position.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuiprogressbarjs">trunk/src/wp-includes/js/jquery/ui/progressbar.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuiresizablejs">trunk/src/wp-includes/js/jquery/ui/resizable.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuiselectablejs">trunk/src/wp-includes/js/jquery/ui/selectable.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuiselectmenujs">trunk/src/wp-includes/js/jquery/ui/selectmenu.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuisliderjs">trunk/src/wp-includes/js/jquery/ui/slider.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuisortablejs">trunk/src/wp-includes/js/jquery/ui/sortable.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuispinnerjs">trunk/src/wp-includes/js/jquery/ui/spinner.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuitabsjs">trunk/src/wp-includes/js/jquery/ui/tabs.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuitooltipjs">trunk/src/wp-includes/js/jquery/ui/tooltip.js</a></li>
<li><a href="#trunksrcwpincludesjsjqueryuiwidgetjs">trunk/src/wp-includes/js/jquery/ui/widget.js</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjsjqueryuiaccordionjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/accordion.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/accordion.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/accordion.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Accordion 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Accordion 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,7 +25,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }(function( $ ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $.widget( "ui.accordion", {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- version: "1.11.1",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ version: "1.11.2",
</ins><span class="cx" style="display: block; padding: 0 10px"> options: {
</span><span class="cx" style="display: block; padding: 0 10px"> active: 0,
</span><span class="cx" style="display: block; padding: 0 10px"> animate: {},
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -259,13 +259,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _processPanels: function() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var prevHeaders = this.headers,
+ prevPanels = this.panels;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> this.headers = this.element.find( this.options.header )
</span><span class="cx" style="display: block; padding: 0 10px"> .addClass( "ui-accordion-header ui-state-default ui-corner-all" );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.headers.next()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.panels = this.headers.next()
</ins><span class="cx" style="display: block; padding: 0 10px"> .addClass( "ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom" )
</span><span class="cx" style="display: block; padding: 0 10px"> .filter( ":not(.ui-accordion-content-active)" )
</span><span class="cx" style="display: block; padding: 0 10px"> .hide();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Avoid memory leaks (#10056)
+ if ( prevPanels ) {
+ this._off( prevHeaders.not( this.headers ) );
+ this._off( prevPanels.not( this.panels ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _refresh: function() {
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuiautocompletejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/autocomplete.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/autocomplete.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/autocomplete.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Autocomplete 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Autocomplete 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }(function( $ ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $.widget( "ui.autocomplete", {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- version: "1.11.1",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ version: "1.11.2",
</ins><span class="cx" style="display: block; padding: 0 10px"> defaultElement: "<input>",
</span><span class="cx" style="display: block; padding: 0 10px"> options: {
</span><span class="cx" style="display: block; padding: 0 10px"> appendTo: null,
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuibuttonjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/button.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/button.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/button.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Button 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Button 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +52,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $.widget( "ui.button", {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- version: "1.11.1",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ version: "1.11.2",
</ins><span class="cx" style="display: block; padding: 0 10px"> defaultElement: "<button>",
</span><span class="cx" style="display: block; padding: 0 10px"> options: {
</span><span class="cx" style="display: block; padding: 0 10px"> disabled: null,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -348,7 +348,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $.widget( "ui.buttonset", {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- version: "1.11.1",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ version: "1.11.2",
</ins><span class="cx" style="display: block; padding: 0 10px"> options: {
</span><span class="cx" style="display: block; padding: 0 10px"> items: "button, input[type=button], input[type=submit], input[type=reset], input[type=checkbox], input[type=radio], a, :data(ui-button)"
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuicorejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/core.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/core.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/core.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Core 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Core 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,7 +24,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $.ui = $.ui || {};
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $.extend( $.ui, {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- version: "1.11.1",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ version: "1.11.2",
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> keyCode: {
</span><span class="cx" style="display: block; padding: 0 10px"> BACKSPACE: 8,
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuidatepickerjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/datepicker.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/datepicker.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/datepicker.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Datepicker 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Datepicker 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,7 +23,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }(function( $ ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$.extend($.ui, { datepicker: { version: "1.11.1" } });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$.extend($.ui, { datepicker: { version: "1.11.2" } });
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> var datepicker_instActive;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2073,7 +2073,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $.datepicker = new Datepicker(); // singleton instance
</span><span class="cx" style="display: block; padding: 0 10px"> $.datepicker.initialized = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $.datepicker.uuid = new Date().getTime();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$.datepicker.version = "1.11.1";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$.datepicker.version = "1.11.2";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $.datepicker;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuidialogjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/dialog.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/dialog.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/dialog.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Dialog 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Dialog 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,7 +30,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }(function( $ ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $.widget( "ui.dialog", {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- version: "1.11.1",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ version: "1.11.2",
</ins><span class="cx" style="display: block; padding: 0 10px"> options: {
</span><span class="cx" style="display: block; padding: 0 10px"> appendTo: "body",
</span><span class="cx" style="display: block; padding: 0 10px"> autoOpen: true,
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuidraggablejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/draggable.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/draggable.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/draggable.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Draggable 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Draggable 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,7 +26,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }(function( $ ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $.widget("ui.draggable", $.ui.mouse, {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- version: "1.11.1",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ version: "1.11.2",
</ins><span class="cx" style="display: block; padding: 0 10px"> widgetEventPrefix: "drag",
</span><span class="cx" style="display: block; padding: 0 10px"> options: {
</span><span class="cx" style="display: block; padding: 0 10px"> addClasses: true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,8 +61,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> _create: function() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (this.options.helper === "original" && !(/^(?:r|a|f)/).test(this.element.css("position"))) {
- this.element[0].style.position = "relative";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( this.options.helper === "original" ) {
+ this._setPositionRelative();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if (this.options.addClasses){
</span><span class="cx" style="display: block; padding: 0 10px"> this.element.addClass("ui-draggable");
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,21 +94,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _mouseCapture: function(event) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var o = this.options;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var document = this.document[ 0 ],
- o = this.options;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this._blurActiveElement( event );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // support: IE9
- // IE9 throws an "Unspecified error" accessing document.activeElement from an <iframe>
- try {
- // Support: IE9+
- // If the <body> is blurred, IE will switch windows, see #9520
- if ( document.activeElement && document.activeElement.nodeName.toLowerCase() !== "body" ) {
- // Blur any element that currently has focus, see #4261
- $( document.activeElement ).blur();
- }
- } catch ( error ) {}
-
</del><span class="cx" style="display: block; padding: 0 10px"> // among others, prevent a drag on a resizable-handle
</span><span class="cx" style="display: block; padding: 0 10px"> if (this.helper || o.disabled || $(event.target).closest(".ui-resizable-handle").length > 0) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,20 +109,54 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $(o.iframeFix === true ? "iframe" : o.iframeFix).each(function() {
- $("<div class='ui-draggable-iframeFix' style='background: #fff;'></div>")
- .css({
- width: this.offsetWidth + "px", height: this.offsetHeight + "px",
- position: "absolute", opacity: "0.001", zIndex: 1000
- })
- .css($(this).offset())
- .appendTo("body");
- });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this._blockFrames( o.iframeFix === true ? "iframe" : o.iframeFix );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _blockFrames: function( selector ) {
+ this.iframeBlocks = this.document.find( selector ).map(function() {
+ var iframe = $( this );
+
+ return $( "<div>" )
+ .css( "position", "absolute" )
+ .appendTo( iframe.parent() )
+ .outerWidth( iframe.outerWidth() )
+ .outerHeight( iframe.outerHeight() )
+ .offset( iframe.offset() )[ 0 ];
+ });
+ },
+
+ _unblockFrames: function() {
+ if ( this.iframeBlocks ) {
+ this.iframeBlocks.remove();
+ delete this.iframeBlocks;
+ }
+ },
+
+ _blurActiveElement: function( event ) {
+ var document = this.document[ 0 ];
+
+ // Only need to blur if the event occurred on the draggable itself, see #10527
+ if ( !this.handleElement.is( event.target ) ) {
+ return;
+ }
+
+ // support: IE9
+ // IE9 throws an "Unspecified error" accessing document.activeElement from an <iframe>
+ try {
+
+ // Support: IE9, IE10
+ // If the <body> is blurred, IE will switch windows, see #9520
+ if ( document.activeElement && document.activeElement.nodeName.toLowerCase() !== "body" ) {
+
+ // Blur any element that currently has focus, see #4261
+ $( document.activeElement ).blur();
+ }
+ } catch ( error ) {}
+ },
+
</ins><span class="cx" style="display: block; padding: 0 10px"> _mouseStart: function(event) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> var o = this.options;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,27 +186,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.cssPosition = this.helper.css( "position" );
</span><span class="cx" style="display: block; padding: 0 10px"> this.scrollParent = this.helper.scrollParent( true );
</span><span class="cx" style="display: block; padding: 0 10px"> this.offsetParent = this.helper.offsetParent();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.offsetParentCssPosition = this.offsetParent.css( "position" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.hasFixedAncestor = this.helper.parents().filter(function() {
+ return $( this ).css( "position" ) === "fixed";
+ }).length > 0;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> //The element's absolute position on the page minus margins
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.offset = this.positionAbs = this.element.offset();
- this.offset = {
- top: this.offset.top - this.margins.top,
- left: this.offset.left - this.margins.left
- };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.positionAbs = this.element.offset();
+ this._refreshOffsets( event );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- //Reset scroll cache
- this.offset.scroll = false;
-
- $.extend(this.offset, {
- click: { //Where the click happened, relative to the element
- left: event.pageX - this.offset.left,
- top: event.pageY - this.offset.top
- },
- parent: this._getParentOffset(),
- relative: this._getRelativeOffset() //This is a relative to absolute position minus the actual position calculation - only used for relative positioned helper
- });
-
</del><span class="cx" style="display: block; padding: 0 10px"> //Generate the original position
</span><span class="cx" style="display: block; padding: 0 10px"> this.originalPosition = this.position = this._generatePosition( event, false );
</span><span class="cx" style="display: block; padding: 0 10px"> this.originalPageX = event.pageX;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,6 +219,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $.ui.ddmanager.prepareOffsets(this, event);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Reset helper's right/bottom css if they're set and set explicit width/height instead
+ // as this prevents resizing of elements with right/bottom set (see #7772)
+ this._normalizeRightBottom();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> this._mouseDrag(event, true); //Execute the drag once - this causes the helper not to be visible before getting its correct position
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> //If the ddmanager is used for droppables, inform the manager that dragging has started (see #5003)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -219,9 +233,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _refreshOffsets: function( event ) {
+ this.offset = {
+ top: this.positionAbs.top - this.margins.top,
+ left: this.positionAbs.left - this.margins.left,
+ scroll: false,
+ parent: this._getParentOffset(),
+ relative: this._getRelativeOffset()
+ };
+
+ this.offset.click = {
+ left: event.pageX - this.offset.left,
+ top: event.pageY - this.offset.top
+ };
+ },
+
</ins><span class="cx" style="display: block; padding: 0 10px"> _mouseDrag: function(event, noPropagation) {
</span><span class="cx" style="display: block; padding: 0 10px"> // reset any necessary cached properties (see #5009)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( this.offsetParentCssPosition === "fixed" ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( this.hasFixedAncestor ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> this.offset.parent = this._getParentOffset();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -279,19 +308,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _mouseUp: function(event) {
- //Remove frame helpers
- $("div.ui-draggable-iframeFix").each(function() {
- this.parentNode.removeChild(this);
- });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _mouseUp: function( event ) {
+ this._unblockFrames();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> //If the ddmanager is used for droppables, inform the manager that dragging has stopped (see #5003)
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $.ui.ddmanager ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $.ui.ddmanager.dragStop(this, event);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // The interaction is over; whether or not the click resulted in a drag, focus the element
- this.element.focus();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Only need to focus if the event occurred on the draggable itself, see #10527
+ if ( this.handleElement.is( event.target ) ) {
+ // The interaction is over; whether or not the click resulted in a drag, focus the element
+ this.element.focus();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $.ui.mouse.prototype._mouseUp.call(this, event);
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -327,12 +356,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _createHelper: function(event) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> var o = this.options,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[ 0 ], [ event ])) : (o.helper === "clone" ? this.element.clone().removeAttr("id") : this.element);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ helperIsFunction = $.isFunction( o.helper ),
+ helper = helperIsFunction ?
+ $( o.helper.apply( this.element[ 0 ], [ event ] ) ) :
+ ( o.helper === "clone" ?
+ this.element.clone().removeAttr( "id" ) :
+ this.element );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if (!helper.parents("body").length) {
</span><span class="cx" style="display: block; padding: 0 10px"> helper.appendTo((o.appendTo === "parent" ? this.element[0].parentNode : o.appendTo));
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // http://bugs.jqueryui.com/ticket/9446
+ // a helper function can return the original element
+ // which wouldn't have been set to relative in _create
+ if ( helperIsFunction && helper[ 0 ] === this.element[ 0 ] ) {
+ this._setPositionRelative();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if (helper[0] !== this.element[0] && !(/(fixed|absolute)/).test(helper.css("position"))) {
</span><span class="cx" style="display: block; padding: 0 10px"> helper.css("position", "absolute");
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -341,6 +382,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _setPositionRelative: function() {
+ if ( !( /^(?:r|a|f)/ ).test( this.element.css( "position" ) ) ) {
+ this.element[ 0 ].style.position = "relative";
+ }
+ },
+
</ins><span class="cx" style="display: block; padding: 0 10px"> _adjustOffsetFromHelper: function(obj) {
</span><span class="cx" style="display: block; padding: 0 10px"> if (typeof obj === "string") {
</span><span class="cx" style="display: block; padding: 0 10px"> obj = obj.split(" ");
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -425,7 +472,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _setContainment: function() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var over, c, ce,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var isUserScrollable, c, ce,
</ins><span class="cx" style="display: block; padding: 0 10px"> o = this.options,
</span><span class="cx" style="display: block; padding: 0 10px"> document = this.document[ 0 ];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -472,13 +519,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- over = c.css( "overflow" ) !== "hidden";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ isUserScrollable = /(scroll|auto)/.test( c.css( "overflow" ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.containment = [
</span><span class="cx" style="display: block; padding: 0 10px"> ( parseInt( c.css( "borderLeftWidth" ), 10 ) || 0 ) + ( parseInt( c.css( "paddingLeft" ), 10 ) || 0 ),
</span><span class="cx" style="display: block; padding: 0 10px"> ( parseInt( c.css( "borderTopWidth" ), 10 ) || 0 ) + ( parseInt( c.css( "paddingTop" ), 10 ) || 0 ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ( over ? Math.max( ce.scrollWidth, ce.offsetWidth ) : ce.offsetWidth ) - ( parseInt( c.css( "borderRightWidth" ), 10 ) || 0 ) - ( parseInt( c.css( "paddingRight" ), 10 ) || 0 ) - this.helperProportions.width - this.margins.left - this.margins.right,
- ( over ? Math.max( ce.scrollHeight, ce.offsetHeight ) : ce.offsetHeight ) - ( parseInt( c.css( "borderBottomWidth" ), 10 ) || 0 ) - ( parseInt( c.css( "paddingBottom" ), 10 ) || 0 ) - this.helperProportions.height - this.margins.top - this.margins.bottom
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ( isUserScrollable ? Math.max( ce.scrollWidth, ce.offsetWidth ) : ce.offsetWidth ) -
+ ( parseInt( c.css( "borderRightWidth" ), 10 ) || 0 ) -
+ ( parseInt( c.css( "paddingRight" ), 10 ) || 0 ) -
+ this.helperProportions.width -
+ this.margins.left -
+ this.margins.right,
+ ( isUserScrollable ? Math.max( ce.scrollHeight, ce.offsetHeight ) : ce.offsetHeight ) -
+ ( parseInt( c.css( "borderBottomWidth" ), 10 ) || 0 ) -
+ ( parseInt( c.css( "paddingBottom" ), 10 ) || 0 ) -
+ this.helperProportions.height -
+ this.margins.top -
+ this.margins.bottom
</ins><span class="cx" style="display: block; padding: 0 10px"> ];
</span><span class="cx" style="display: block; padding: 0 10px"> this.relativeContainer = c;
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -608,16 +665,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _normalizeRightBottom: function() {
+ if ( this.options.axis !== "y" && this.helper.css( "right" ) !== "auto" ) {
+ this.helper.width( this.helper.width() );
+ this.helper.css( "right", "auto" );
+ }
+ if ( this.options.axis !== "x" && this.helper.css( "bottom" ) !== "auto" ) {
+ this.helper.height( this.helper.height() );
+ this.helper.css( "bottom", "auto" );
+ }
+ },
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // From now on bulk stuff - mainly helpers
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _trigger: function(type, event, ui) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _trigger: function( type, event, ui ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> ui = ui || this._uiHash();
</span><span class="cx" style="display: block; padding: 0 10px"> $.ui.plugin.call( this, type, [ event, ui, this ], true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- //The absolute position has to be recalculated after plugins
- if (type === "drag") {
- this.positionAbs = this._convertPositionTo("absolute");
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Absolute position and offset (see #6884 ) have to be recalculated after plugins
+ if ( /^(drag|start|stop)/.test( type ) ) {
+ this.positionAbs = this._convertPositionTo( "absolute" );
+ ui.offset = this.positionAbs;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $.Widget.prototype._trigger.call(this, type, event, ui);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $.Widget.prototype._trigger.call( this, type, event, ui );
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> plugins: {},
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -633,160 +703,197 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$.ui.plugin.add("draggable", "connectToSortable", {
- start: function( event, ui, inst ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$.ui.plugin.add( "draggable", "connectToSortable", {
+ start: function( event, ui, draggable ) {
+ var uiSortable = $.extend( {}, ui, {
+ item: draggable.element
+ });
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var o = inst.options,
- uiSortable = $.extend({}, ui, { item: inst.element });
- inst.sortables = [];
- $(o.connectToSortable).each(function() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ draggable.sortables = [];
+ $( draggable.options.connectToSortable ).each(function() {
</ins><span class="cx" style="display: block; padding: 0 10px"> var sortable = $( this ).sortable( "instance" );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (sortable && !sortable.options.disabled) {
- inst.sortables.push({
- instance: sortable,
- shouldRevert: sortable.options.revert
- });
- sortable.refreshPositions(); // Call the sortable's refreshPositions at drag start to refresh the containerCache since the sortable container cache is used in drag and needs to be up to date (this will ensure it's initialised as well as being kept in step with any changes that might have happened on the page).
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( sortable && !sortable.options.disabled ) {
+ draggable.sortables.push( sortable );
+
+ // refreshPositions is called at drag start to refresh the containerCache
+ // which is used in drag. This ensures it's initialized and synchronized
+ // with any changes that might have happened on the page since initialization.
+ sortable.refreshPositions();
</ins><span class="cx" style="display: block; padding: 0 10px"> sortable._trigger("activate", event, uiSortable);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> },
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- stop: function( event, ui, inst ) {
-
- //If we are still over the sortable, we fake the stop event of the sortable, but also remove helper
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ stop: function( event, ui, draggable ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> var uiSortable = $.extend( {}, ui, {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- item: inst.element
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ item: draggable.element
</ins><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $.each(inst.sortables, function() {
- if (this.instance.isOver) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ draggable.cancelHelperRemoval = false;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.instance.isOver = 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $.each( draggable.sortables, function() {
+ var sortable = this;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- inst.cancelHelperRemoval = true; //Don't remove the helper in the draggable instance
- this.instance.cancelHelperRemoval = false; //Remove it in the sortable instance (so sortable plugins like revert still work)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( sortable.isOver ) {
+ sortable.isOver = 0;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- //The sortable revert is supported, and we have to set a temporary dropped variable on the draggable to support revert: "valid/invalid"
- if (this.shouldRevert) {
- this.instance.options.revert = this.shouldRevert;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Allow this sortable to handle removing the helper
+ draggable.cancelHelperRemoval = true;
+ sortable.cancelHelperRemoval = false;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- //Trigger the stop of the sortable
- this.instance._mouseStop(event);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Use _storedCSS To restore properties in the sortable,
+ // as this also handles revert (#9675) since the draggable
+ // may have modified them in unexpected ways (#8809)
+ sortable._storedCSS = {
+ position: sortable.placeholder.css( "position" ),
+ top: sortable.placeholder.css( "top" ),
+ left: sortable.placeholder.css( "left" )
+ };
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.instance.options.helper = this.instance.options._helper;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sortable._mouseStop(event);
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- //If the helper has been the original item, restore properties in the sortable
- if (inst.options.helper === "original") {
- this.instance.currentItem.css({ top: "auto", left: "auto" });
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Once drag has ended, the sortable should return to using
+ // its original helper, not the shared helper from draggable
+ sortable.options.helper = sortable.options._helper;
+ } else {
+ // Prevent this Sortable from removing the helper.
+ // However, don't set the draggable to remove the helper
+ // either as another connected Sortable may yet handle the removal.
+ sortable.cancelHelperRemoval = true;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else {
- this.instance.cancelHelperRemoval = false; //Remove the helper in the sortable instance
- this.instance._trigger("deactivate", event, uiSortable);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sortable._trigger( "deactivate", event, uiSortable );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> });
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> },
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- drag: function( event, ui, inst ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ drag: function( event, ui, draggable ) {
+ $.each( draggable.sortables, function() {
+ var innermostIntersecting = false,
+ sortable = this;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var that = this;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Copy over variables that sortable's _intersectsWith uses
+ sortable.positionAbs = draggable.positionAbs;
+ sortable.helperProportions = draggable.helperProportions;
+ sortable.offset.click = draggable.offset.click;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $.each(inst.sortables, function() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( sortable._intersectsWith( sortable.containerCache ) ) {
+ innermostIntersecting = true;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var innermostIntersecting = false,
- thisSortable = this;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $.each( draggable.sortables, function() {
+ // Copy over variables that sortable's _intersectsWith uses
+ this.positionAbs = draggable.positionAbs;
+ this.helperProportions = draggable.helperProportions;
+ this.offset.click = draggable.offset.click;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- //Copy over some variables to allow calling the sortable's native _intersectsWith
- this.instance.positionAbs = inst.positionAbs;
- this.instance.helperProportions = inst.helperProportions;
- this.instance.offset.click = inst.offset.click;
-
- if (this.instance._intersectsWith(this.instance.containerCache)) {
- innermostIntersecting = true;
- $.each(inst.sortables, function() {
- this.instance.positionAbs = inst.positionAbs;
- this.instance.helperProportions = inst.helperProportions;
- this.instance.offset.click = inst.offset.click;
- if (this !== thisSortable &&
- this.instance._intersectsWith(this.instance.containerCache) &&
- $.contains(thisSortable.instance.element[0], this.instance.element[0])
- ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( this !== sortable &&
+ this._intersectsWith( this.containerCache ) &&
+ $.contains( sortable.element[ 0 ], this.element[ 0 ] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> innermostIntersecting = false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return innermostIntersecting;
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (innermostIntersecting) {
- //If it intersects, we use a little isOver variable and set it once, so our move-in stuff gets fired only once
- if (!this.instance.isOver) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( innermostIntersecting ) {
+ // If it intersects, we use a little isOver variable and set it once,
+ // so that the move-in stuff gets fired only once.
+ if ( !sortable.isOver ) {
+ sortable.isOver = 1;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.instance.isOver = 1;
- //Now we fake the start of dragging for the sortable instance,
- //by cloning the list group item, appending it to the sortable and using it as inst.currentItem
- //We can then fire the start event of the sortable with our passed browser event, and our own helper (so it doesn't create a new one)
- this.instance.currentItem = $(that).clone().removeAttr("id").appendTo(this.instance.element).data("ui-sortable-item", true);
- this.instance.options._helper = this.instance.options.helper; //Store helper option to later restore it
- this.instance.options.helper = function() { return ui.helper[0]; };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sortable.currentItem = ui.helper
+ .appendTo( sortable.element )
+ .data( "ui-sortable-item", true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- event.target = this.instance.currentItem[0];
- this.instance._mouseCapture(event, true);
- this.instance._mouseStart(event, true, true);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Store helper option to later restore it
+ sortable.options._helper = sortable.options.helper;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- //Because the browser event is way off the new appended portlet, we modify a couple of variables to reflect the changes
- this.instance.offset.click.top = inst.offset.click.top;
- this.instance.offset.click.left = inst.offset.click.left;
- this.instance.offset.parent.left -= inst.offset.parent.left - this.instance.offset.parent.left;
- this.instance.offset.parent.top -= inst.offset.parent.top - this.instance.offset.parent.top;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sortable.options.helper = function() {
+ return ui.helper[ 0 ];
+ };
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- inst._trigger("toSortable", event);
- inst.dropped = this.instance.element; //draggable revert needs that
- //hack so receive/update callbacks work (mostly)
- inst.currentItem = inst.element;
- this.instance.fromOutside = inst;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Fire the start events of the sortable with our passed browser event,
+ // and our own helper (so it doesn't create a new one)
+ event.target = sortable.currentItem[ 0 ];
+ sortable._mouseCapture( event, true );
+ sortable._mouseStart( event, true, true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Because the browser event is way off the new appended portlet,
+ // modify necessary variables to reflect the changes
+ sortable.offset.click.top = draggable.offset.click.top;
+ sortable.offset.click.left = draggable.offset.click.left;
+ sortable.offset.parent.left -= draggable.offset.parent.left -
+ sortable.offset.parent.left;
+ sortable.offset.parent.top -= draggable.offset.parent.top -
+ sortable.offset.parent.top;
+
+ draggable._trigger( "toSortable", event );
+
+ // Inform draggable that the helper is in a valid drop zone,
+ // used solely in the revert option to handle "valid/invalid".
+ draggable.dropped = sortable.element;
+
+ // Need to refreshPositions of all sortables in the case that
+ // adding to one sortable changes the location of the other sortables (#9675)
+ $.each( draggable.sortables, function() {
+ this.refreshPositions();
+ });
+
+ // hack so receive/update callbacks work (mostly)
+ draggable.currentItem = draggable.element;
+ sortable.fromOutside = draggable;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- //Provided we did all the previous steps, we can fire the drag event of the sortable on every draggable drag, when it intersects with the sortable
- if (this.instance.currentItem) {
- this.instance._mouseDrag(event);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( sortable.currentItem ) {
+ sortable._mouseDrag( event );
+ // Copy the sortable's position because the draggable's can potentially reflect
+ // a relative position, while sortable is always absolute, which the dragged
+ // element has now become. (#8809)
+ ui.position = sortable.position;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If it doesn't intersect with the sortable, and it intersected before,
+ // we fake the drag stop of the sortable, but make sure it doesn't remove
+ // the helper by using cancelHelperRemoval.
+ if ( sortable.isOver ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- //If it doesn't intersect with the sortable, and it intersected before,
- //we fake the drag stop of the sortable, but make sure it doesn't remove the helper by using cancelHelperRemoval
- if (this.instance.isOver) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sortable.isOver = 0;
+ sortable.cancelHelperRemoval = true;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.instance.isOver = 0;
- this.instance.cancelHelperRemoval = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Calling sortable's mouseStop would trigger a revert,
+ // so revert must be temporarily false until after mouseStop is called.
+ sortable.options._revert = sortable.options.revert;
+ sortable.options.revert = false;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- //Prevent reverting on this forced stop
- this.instance.options.revert = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sortable._trigger( "out", event, sortable._uiHash( sortable ) );
+ sortable._mouseStop( event, true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // The out event needs to be triggered independently
- this.instance._trigger("out", event, this.instance._uiHash(this.instance));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // restore sortable behaviors that were modfied
+ // when the draggable entered the sortable area (#9481)
+ sortable.options.revert = sortable.options._revert;
+ sortable.options.helper = sortable.options._helper;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.instance._mouseStop(event, true);
- this.instance.options.helper = this.instance.options._helper;
-
- //Now we remove our currentItem, the list group clone again, and the placeholder, and animate the helper back to it's original size
- this.instance.currentItem.remove();
- if (this.instance.placeholder) {
- this.instance.placeholder.remove();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( sortable.placeholder ) {
+ sortable.placeholder.remove();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- inst._trigger("fromSortable", event);
- inst.dropped = false; //draggable revert needs that
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Recalculate the draggable's offset considering the sortable
+ // may have modified them in unexpected ways (#8809)
+ draggable._refreshOffsets( event );
+ ui.position = draggable._generatePosition( event, true );
+
+ draggable._trigger( "fromSortable", event );
+
+ // Inform draggable that the helper is no longer in a valid drop zone
+ draggable.dropped = false;
+
+ // Need to refreshPositions of all sortables just in case removing
+ // from one sortable changes the location of other sortables (#9675)
+ $.each( draggable.sortables, function() {
+ this.refreshPositions();
+ });
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> });
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -916,9 +1023,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> for (i = inst.snapElements.length - 1; i >= 0; i--){
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- l = inst.snapElements[i].left;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ l = inst.snapElements[i].left - inst.margins.left;
</ins><span class="cx" style="display: block; padding: 0 10px"> r = l + inst.snapElements[i].width;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- t = inst.snapElements[i].top;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ t = inst.snapElements[i].top - inst.margins.top;
</ins><span class="cx" style="display: block; padding: 0 10px"> b = t + inst.snapElements[i].height;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( x2 < l - d || x1 > r + d || y2 < t - d || y1 > b + d || !$.contains( inst.snapElements[ i ].item.ownerDocument, inst.snapElements[ i ].item ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -935,16 +1042,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ls = Math.abs(l - x2) <= d;
</span><span class="cx" style="display: block; padding: 0 10px"> rs = Math.abs(r - x1) <= d;
</span><span class="cx" style="display: block; padding: 0 10px"> if (ts) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ui.position.top = inst._convertPositionTo("relative", { top: t - inst.helperProportions.height, left: 0 }).top - inst.margins.top;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ui.position.top = inst._convertPositionTo("relative", { top: t - inst.helperProportions.height, left: 0 }).top;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if (bs) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ui.position.top = inst._convertPositionTo("relative", { top: b, left: 0 }).top - inst.margins.top;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ui.position.top = inst._convertPositionTo("relative", { top: b, left: 0 }).top;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if (ls) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l - inst.helperProportions.width }).left - inst.margins.left;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l - inst.helperProportions.width }).left;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if (rs) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r }).left - inst.margins.left;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r }).left;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -956,16 +1063,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ls = Math.abs(l - x1) <= d;
</span><span class="cx" style="display: block; padding: 0 10px"> rs = Math.abs(r - x2) <= d;
</span><span class="cx" style="display: block; padding: 0 10px"> if (ts) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ui.position.top = inst._convertPositionTo("relative", { top: t, left: 0 }).top - inst.margins.top;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ui.position.top = inst._convertPositionTo("relative", { top: t, left: 0 }).top;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if (bs) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ui.position.top = inst._convertPositionTo("relative", { top: b - inst.helperProportions.height, left: 0 }).top - inst.margins.top;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ui.position.top = inst._convertPositionTo("relative", { top: b - inst.helperProportions.height, left: 0 }).top;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if (ls) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l }).left - inst.margins.left;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l }).left;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if (rs) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r - inst.helperProportions.width }).left - inst.margins.left;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r - inst.helperProportions.width }).left;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuidroppablejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/droppable.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/droppable.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/droppable.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Droppable 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Droppable 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }(function( $ ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $.widget( "ui.droppable", {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- version: "1.11.1",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ version: "1.11.2",
</ins><span class="cx" style="display: block; padding: 0 10px"> widgetEventPrefix: "drop",
</span><span class="cx" style="display: block; padding: 0 10px"> options: {
</span><span class="cx" style="display: block; padding: 0 10px"> accept: "*",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -235,8 +235,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var x1 = ( draggable.positionAbs || draggable.position.absolute ).left,
- y1 = ( draggable.positionAbs || draggable.position.absolute ).top,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var x1 = ( draggable.positionAbs || draggable.position.absolute ).left + draggable.margins.left,
+ y1 = ( draggable.positionAbs || draggable.position.absolute ).top + draggable.margins.top,
</ins><span class="cx" style="display: block; padding: 0 10px"> x2 = x1 + draggable.helperProportions.width,
</span><span class="cx" style="display: block; padding: 0 10px"> y2 = y1 + draggable.helperProportions.height,
</span><span class="cx" style="display: block; padding: 0 10px"> l = droppable.offset.left,
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuieffectblindjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/effect-blind.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/effect-blind.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/effect-blind.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Effects Blind 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Effects Blind 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuieffectbouncejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/effect-bounce.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/effect-bounce.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/effect-bounce.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Effects Bounce 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Effects Bounce 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuieffectclipjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/effect-clip.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/effect-clip.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/effect-clip.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Effects Clip 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Effects Clip 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuieffectdropjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/effect-drop.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/effect-drop.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/effect-drop.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Effects Drop 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Effects Drop 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,7 +42,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> el.show();
</span><span class="cx" style="display: block; padding: 0 10px"> $.effects.createWrapper( el );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- distance = o.distance || el[ ref === "top" ? "outerHeight": "outerWidth" ]( true ) / 2;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ distance = o.distance || el[ ref === "top" ? "outerHeight" : "outerWidth" ]( true ) / 2;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( show ) {
</span><span class="cx" style="display: block; padding: 0 10px"> el
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuieffectexplodejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/effect-explode.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/effect-explode.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/effect-explode.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Effects Explode 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Effects Explode 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuieffectfadejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/effect-fade.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/effect-fade.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/effect-fade.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Effects Fade 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Effects Fade 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuieffectfoldjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/effect-fold.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/effect-fold.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/effect-fold.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Effects Fold 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Effects Fold 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuieffecthighlightjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/effect-highlight.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/effect-highlight.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/effect-highlight.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Effects Highlight 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Effects Highlight 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuieffectpuffjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/effect-puff.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/effect-puff.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/effect-puff.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Effects Puff 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Effects Puff 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuieffectpulsatejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/effect-pulsate.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/effect-pulsate.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/effect-pulsate.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Effects Pulsate 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Effects Pulsate 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuieffectscalejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/effect-scale.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/effect-scale.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/effect-scale.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Effects Scale 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Effects Scale 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuieffectshakejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/effect-shake.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/effect-shake.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/effect-shake.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Effects Shake 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Effects Shake 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuieffectsizejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/effect-size.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/effect-size.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/effect-size.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Effects Size 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Effects Size 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuieffectslidejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/effect-slide.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/effect-slide.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/effect-slide.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Effects Slide 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Effects Slide 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuieffecttransferjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/effect-transfer.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/effect-transfer.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/effect-transfer.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Effects Transfer 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Effects Transfer 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuieffectjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/effect.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/effect.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/effect.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Effects 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Effects 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -633,7 +633,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> try {
</span><span class="cx" style="display: block; padding: 0 10px"> elem.style[ hook ] = value;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } catch( e ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } catch ( e ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // wrapped to prevent IE from throwing errors on "invalid" values like 'auto' or 'inherit'
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -904,7 +904,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> (function() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $.extend( $.effects, {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- version: "1.11.1",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ version: "1.11.2",
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Saves a set of properties in a data storage
</span><span class="cx" style="display: block; padding: 0 10px"> save: function( element, set ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -998,7 +998,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // https://bugzilla.mozilla.org/show_bug.cgi?id=561664
</span><span class="cx" style="display: block; padding: 0 10px"> try {
</span><span class="cx" style="display: block; padding: 0 10px"> active.id;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } catch( e ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } catch ( e ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> active = document.body;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuimenujs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/menu.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/menu.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/menu.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Menu 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Menu 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,7 +26,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }(function( $ ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $.widget( "ui.menu", {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- version: "1.11.1",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ version: "1.11.2",
</ins><span class="cx" style="display: block; padding: 0 10px"> defaultElement: "<ul>",
</span><span class="cx" style="display: block; padding: 0 10px"> delay: 300,
</span><span class="cx" style="display: block; padding: 0 10px"> options: {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,6 +101,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "mouseenter .ui-menu-item": function( event ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Ignore mouse events while typeahead is active, see #10458.
+ // Prevents focusing the wrong item when typeahead causes a scroll while the mouse
+ // is over an item in the menu
+ if ( this.previousFilter ) {
+ return;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> var target = $( event.currentTarget );
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove ui-state-active class from siblings of the newly focused menu item
</span><span class="cx" style="display: block; padding: 0 10px"> // to avoid a jump caused by adjacent elements both having a class with a border
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,13 +186,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _keydown: function( event ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var match, prev, character, skip, regex,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var match, prev, character, skip,
</ins><span class="cx" style="display: block; padding: 0 10px"> preventDefault = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function escape( value ) {
- return value.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> switch ( event.keyCode ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case $.ui.keyCode.PAGE_UP:
</span><span class="cx" style="display: block; padding: 0 10px"> this.previousPage( event );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -235,10 +237,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> character = prev + character;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- regex = new RegExp( "^" + escape( character ), "i" );
- match = this.activeMenu.find( this.options.items ).filter(function() {
- return regex.test( $( this ).text() );
- });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ match = this._filterMenuItems( character );
</ins><span class="cx" style="display: block; padding: 0 10px"> match = skip && match.index( this.active.next() ) !== -1 ?
</span><span class="cx" style="display: block; padding: 0 10px"> this.active.nextAll( ".ui-menu-item" ) :
</span><span class="cx" style="display: block; padding: 0 10px"> match;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -247,22 +246,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // to move down the menu to the first item that starts with that character
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !match.length ) {
</span><span class="cx" style="display: block; padding: 0 10px"> character = String.fromCharCode( event.keyCode );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- regex = new RegExp( "^" + escape( character ), "i" );
- match = this.activeMenu.find( this.options.items ).filter(function() {
- return regex.test( $( this ).text() );
- });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ match = this._filterMenuItems( character );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( match.length ) {
</span><span class="cx" style="display: block; padding: 0 10px"> this.focus( event, match );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( match.length > 1 ) {
- this.previousFilter = character;
- this.filterTimer = this._delay(function() {
- delete this.previousFilter;
- }, 1000 );
- } else {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.previousFilter = character;
+ this.filterTimer = this._delay(function() {
</ins><span class="cx" style="display: block; padding: 0 10px"> delete this.previousFilter;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }, 1000 );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> delete this.previousFilter;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -634,6 +626,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.collapseAll( event, true );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> this._trigger( "select", event, ui );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ },
+
+ _filterMenuItems: function(character) {
+ var escapedCharacter = character.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" ),
+ regex = new RegExp( "^" + escapedCharacter, "i" );
+
+ return this.activeMenu
+ .find( this.options.items )
+
+ // Only match on items, not dividers or other content (#10571)
+ .filter( ".ui-menu-item" )
+ .filter(function() {
+ return regex.test( $.trim( $( this ).text() ) );
+ });
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuimousejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/mouse.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/mouse.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/mouse.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Mouse 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Mouse 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,7 +29,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $.widget("ui.mouse", {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- version: "1.11.1",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ version: "1.11.2",
</ins><span class="cx" style="display: block; padding: 0 10px"> options: {
</span><span class="cx" style="display: block; padding: 0 10px"> cancel: "input,textarea,button,select,option",
</span><span class="cx" style="display: block; padding: 0 10px"> distance: 1,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,6 +70,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this._mouseMoved = false;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // we may have missed mouseup (out of window)
</span><span class="cx" style="display: block; padding: 0 10px"> (this._mouseStarted && this._mouseUp(event));
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,15 +125,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _mouseMove: function(event) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // IE mouseup check - mouseup happened when mouse was out of window
- if ($.ui.ie && ( !document.documentMode || document.documentMode < 9 ) && !event.button) {
- return this._mouseUp(event);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Only check for mouseups outside the document if you've moved inside the document
+ // at least once. This prevents the firing of mouseup in the case of IE<9, which will
+ // fire a mousemove event if content is placed under the cursor. See #7778
+ // Support: IE <9
+ if ( this._mouseMoved ) {
+ // IE mouseup check - mouseup happened when mouse was out of window
+ if ($.ui.ie && ( !document.documentMode || document.documentMode < 9 ) && !event.button) {
+ return this._mouseUp(event);
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Iframe mouseup check - mouseup occurred in another document
- } else if ( !event.which ) {
- return this._mouseUp( event );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Iframe mouseup check - mouseup occurred in another document
+ } else if ( !event.which ) {
+ return this._mouseUp( event );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( event.which || event.button ) {
+ this._mouseMoved = true;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if (this._mouseStarted) {
</span><span class="cx" style="display: block; padding: 0 10px"> this._mouseDrag(event);
</span><span class="cx" style="display: block; padding: 0 10px"> return event.preventDefault();
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuipositionjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/position.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/position.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/position.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Position 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Position 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuiprogressbarjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/progressbar.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/progressbar.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/progressbar.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Progressbar 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Progressbar 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,7 +25,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }(function( $ ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $.widget( "ui.progressbar", {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- version: "1.11.1",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ version: "1.11.2",
</ins><span class="cx" style="display: block; padding: 0 10px"> options: {
</span><span class="cx" style="display: block; padding: 0 10px"> max: 100,
</span><span class="cx" style="display: block; padding: 0 10px"> value: 0,
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuiresizablejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/resizable.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/resizable.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/resizable.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Resizable 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Resizable 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,7 +26,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }(function( $ ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $.widget("ui.resizable", $.ui.mouse, {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- version: "1.11.1",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ version: "1.11.2",
</ins><span class="cx" style="display: block; padding: 0 10px"> widgetEventPrefix: "resize",
</span><span class="cx" style="display: block; padding: 0 10px"> options: {
</span><span class="cx" style="display: block; padding: 0 10px"> alsoResize: false,
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuiselectablejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/selectable.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/selectable.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/selectable.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Selectable 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Selectable 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,7 +26,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }(function( $ ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $.widget("ui.selectable", $.ui.mouse, {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- version: "1.11.1",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ version: "1.11.2",
</ins><span class="cx" style="display: block; padding: 0 10px"> options: {
</span><span class="cx" style="display: block; padding: 0 10px"> appendTo: "body",
</span><span class="cx" style="display: block; padding: 0 10px"> autoRefresh: true,
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuiselectmenujs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/selectmenu.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/selectmenu.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/selectmenu.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Selectmenu 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Selectmenu 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }(function( $ ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $.widget( "ui.selectmenu", {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- version: "1.11.1",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ version: "1.11.2",
</ins><span class="cx" style="display: block; padding: 0 10px"> defaultElement: "<select>",
</span><span class="cx" style="display: block; padding: 0 10px"> options: {
</span><span class="cx" style="display: block; padding: 0 10px"> appendTo: null,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,6 +144,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> role: "listbox",
</span><span class="cx" style="display: block; padding: 0 10px"> select: function( event, ui ) {
</span><span class="cx" style="display: block; padding: 0 10px"> event.preventDefault();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // support: IE8
+ // If the item was selected via a click, the text selection
+ // will be destroyed in IE
+ that._setSelection();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> that._select( ui.item.data( "ui-selectmenu-item" ), event );
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> focus: function( event, ui ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -254,6 +260,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.isOpen = false;
</span><span class="cx" style="display: block; padding: 0 10px"> this._toggleAttr();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.range = null;
</ins><span class="cx" style="display: block; padding: 0 10px"> this._off( this.document );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this._trigger( "close", event );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -342,6 +349,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this[ this.isOpen ? "close" : "open" ]( event );
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _setSelection: function() {
+ var selection;
+
+ if ( !this.range ) {
+ return;
+ }
+
+ if ( window.getSelection ) {
+ selection = window.getSelection();
+ selection.removeAllRanges();
+ selection.addRange( this.range );
+
+ // support: IE8
+ } else {
+ this.range.select();
+ }
+
+ // support: IE
+ // Setting the text selection kills the button focus in IE, but
+ // restoring the focus doesn't kill the selection.
+ this.button.focus();
+ },
+
</ins><span class="cx" style="display: block; padding: 0 10px"> _documentClick: {
</span><span class="cx" style="display: block; padding: 0 10px"> mousedown: function( event ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !this.isOpen ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -357,11 +387,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _buttonEvents: {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Prevent text selection from being reset when interacting with the selectmenu (#10144)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- mousedown: function( event ) {
- event.preventDefault();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ mousedown: function() {
+ var selection;
+
+ if ( window.getSelection ) {
+ selection = window.getSelection();
+ if ( selection.rangeCount ) {
+ this.range = selection.getRangeAt( 0 );
+ }
+
+ // support: IE8
+ } else {
+ this.range = document.selection.createRange();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- click: "_toggle",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ click: function( event ) {
+ this._setSelection();
+ this._toggle( event );
+ },
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> keydown: function( event ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var preventDefault = true;
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuisliderjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/slider.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/slider.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/slider.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Slider 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Slider 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,7 +26,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }(function( $ ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $.widget( "ui.slider", $.ui.mouse, {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- version: "1.11.1",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ version: "1.11.2",
</ins><span class="cx" style="display: block; padding: 0 10px"> widgetEventPrefix: "slide",
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> options: {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,6 +58,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this._handleIndex = null;
</span><span class="cx" style="display: block; padding: 0 10px"> this._detectOrientation();
</span><span class="cx" style="display: block; padding: 0 10px"> this._mouseInit();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this._calculateNewMax();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.element
</span><span class="cx" style="display: block; padding: 0 10px"> .addClass( "ui-slider" +
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -472,9 +473,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> this._animateOff = false;
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case "step":
</ins><span class="cx" style="display: block; padding: 0 10px"> case "min":
</span><span class="cx" style="display: block; padding: 0 10px"> case "max":
</span><span class="cx" style="display: block; padding: 0 10px"> this._animateOff = true;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this._calculateNewMax();
</ins><span class="cx" style="display: block; padding: 0 10px"> this._refreshValue();
</span><span class="cx" style="display: block; padding: 0 10px"> this._animateOff = false;
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -512,7 +515,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // .slice() creates a copy of the array
</span><span class="cx" style="display: block; padding: 0 10px"> // this copy gets trimmed by min and max and then returned
</span><span class="cx" style="display: block; padding: 0 10px"> vals = this.options.values.slice();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- for ( i = 0; i < vals.length; i+= 1) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ for ( i = 0; i < vals.length; i += 1) {
</ins><span class="cx" style="display: block; padding: 0 10px"> vals[ i ] = this._trimAlignValue( vals[ i ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -543,12 +546,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return parseFloat( alignValue.toFixed(5) );
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _calculateNewMax: function() {
+ var remainder = ( this.options.max - this._valueMin() ) % this.options.step;
+ this.max = this.options.max - remainder;
+ },
+
</ins><span class="cx" style="display: block; padding: 0 10px"> _valueMin: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> return this.options.min;
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _valueMax: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return this.options.max;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return this.max;
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _refreshValue: function() {
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuisortablejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/sortable.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/sortable.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/sortable.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Sortable 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Sortable 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,7 +26,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }(function( $ ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $.widget("ui.sortable", $.ui.mouse, {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- version: "1.11.1",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ version: "1.11.2",
</ins><span class="cx" style="display: block; padding: 0 10px"> widgetEventPrefix: "sort",
</span><span class="cx" style="display: block; padding: 0 10px"> ready: false,
</span><span class="cx" style="display: block; padding: 0 10px"> options: {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -911,6 +911,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if(this.currentContainer === this.containers[innermostIndex]) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( !this.currentContainer.containerCache.over ) {
+ this.containers[ innermostIndex ]._trigger( "over", event, this._uiHash() );
+ this.currentContainer.containerCache.over = 1;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1249,19 +1253,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.dragging = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if(this.cancelHelperRemoval) {
- if(!noPropagation) {
- this._trigger("beforeStop", event, this._uiHash());
- for (i=0; i < delayedTriggers.length; i++) {
- delayedTriggers[i].call(this, event);
- } //Trigger all delayed events
- this._trigger("stop", event, this._uiHash());
- }
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.fromOutside = false;
- return false;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> if(!noPropagation) {
</span><span class="cx" style="display: block; padding: 0 10px"> this._trigger("beforeStop", event, this._uiHash());
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1269,10 +1261,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> //$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
</span><span class="cx" style="display: block; padding: 0 10px"> this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if(this.helper[0] !== this.currentItem[0]) {
- this.helper.remove();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( !this.cancelHelperRemoval ) {
+ if ( this.helper[ 0 ] !== this.currentItem[ 0 ] ) {
+ this.helper.remove();
+ }
+ this.helper = null;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.helper = null;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if(!noPropagation) {
</span><span class="cx" style="display: block; padding: 0 10px"> for (i=0; i < delayedTriggers.length; i++) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1282,7 +1276,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.fromOutside = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return !this.cancelHelperRemoval;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuispinnerjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/spinner.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/spinner.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/spinner.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Spinner 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Spinner 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,7 +37,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $.widget( "ui.spinner", {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- version: "1.11.1",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ version: "1.11.2",
</ins><span class="cx" style="display: block; padding: 0 10px"> defaultElement: "<input>",
</span><span class="cx" style="display: block; padding: 0 10px"> widgetEventPrefix: "spin",
</span><span class="cx" style="display: block; padding: 0 10px"> options: {
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuitabsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/tabs.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/tabs.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/tabs.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Tabs 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Tabs 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,7 +25,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }(function( $ ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $.widget( "ui.tabs", {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- version: "1.11.1",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ version: "1.11.2",
</ins><span class="cx" style="display: block; padding: 0 10px"> delay: 300,
</span><span class="cx" style="display: block; padding: 0 10px"> options: {
</span><span class="cx" style="display: block; padding: 0 10px"> active: null,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -372,7 +372,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _processTabs: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var that = this;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var that = this,
+ prevTabs = this.tabs,
+ prevAnchors = this.anchors,
+ prevPanels = this.panels;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.tablist = this._getList()
</span><span class="cx" style="display: block; padding: 0 10px"> .addClass( "ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all" )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -456,6 +459,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.panels
</span><span class="cx" style="display: block; padding: 0 10px"> .addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom" )
</span><span class="cx" style="display: block; padding: 0 10px"> .attr( "role", "tabpanel" );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Avoid memory leaks (#10056)
+ if ( prevTabs ) {
+ this._off( prevTabs.not( this.tabs ) );
+ this._off( prevAnchors.not( this.anchors ) );
+ this._off( prevPanels.not( this.panels ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // allow overriding how to find the list for rare usage scenarios (#7715)
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuitooltipjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/tooltip.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/tooltip.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/tooltip.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Tooltip 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Tooltip 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,7 +26,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }(function( $ ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $.widget( "ui.tooltip", {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- version: "1.11.1",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ version: "1.11.2",
</ins><span class="cx" style="display: block; padding: 0 10px"> options: {
</span><span class="cx" style="display: block; padding: 0 10px"> content: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> // support: IE<9, Opera in jQuery <1.7
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,6 +86,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // IDs of generated tooltips, needed for destroy
</span><span class="cx" style="display: block; padding: 0 10px"> this.tooltips = {};
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // IDs of parent tooltips where we removed the title attribute
</span><span class="cx" style="display: block; padding: 0 10px"> this.parents = {};
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,8 +118,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this._super( key, value );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( key === "content" ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $.each( this.tooltips, function( id, element ) {
- that._updateContent( element );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $.each( this.tooltips, function( id, tooltipData ) {
+ that._updateContent( tooltipData.element );
</ins><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,9 +128,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var that = this;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // close open tooltips
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $.each( this.tooltips, function( id, element ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $.each( this.tooltips, function( id, tooltipData ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> var event = $.Event( "blur" );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- event.target = event.currentTarget = element[0];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ event.target = event.currentTarget = tooltipData.element[ 0 ];
</ins><span class="cx" style="display: block; padding: 0 10px"> that.close( event, true );
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -231,7 +232,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _open: function( event, target, content ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var tooltip, events, delayedShow, a11yContent,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var tooltipData, tooltip, events, delayedShow, a11yContent,
</ins><span class="cx" style="display: block; padding: 0 10px"> positionOption = $.extend( {}, this.options.position );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !content ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -240,9 +241,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Content can be updated multiple times. If the tooltip already
</span><span class="cx" style="display: block; padding: 0 10px"> // exists, then just update the content and bail.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- tooltip = this._find( target );
- if ( tooltip.length ) {
- tooltip.find( ".ui-tooltip-content" ).html( content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ tooltipData = this._find( target );
+ if ( tooltipData ) {
+ tooltipData.tooltip.find( ".ui-tooltip-content" ).html( content );
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -261,7 +262,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- tooltip = this._tooltip( target );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ tooltipData = this._tooltip( target );
+ tooltip = tooltipData.tooltip;
</ins><span class="cx" style="display: block; padding: 0 10px"> this._addDescribedBy( target, tooltip.attr( "id" ) );
</span><span class="cx" style="display: block; padding: 0 10px"> tooltip.find( ".ui-tooltip-content" ).html( content );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -296,8 +298,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }, this.options.position ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.hiding = false;
- this.closing = false;
</del><span class="cx" style="display: block; padding: 0 10px"> tooltip.hide();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this._show( tooltip, this.options.show );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -343,13 +343,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> close: function( event ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var that = this,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var tooltip,
+ that = this,
</ins><span class="cx" style="display: block; padding: 0 10px"> target = $( event ? event.currentTarget : this.element ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- tooltip = this._find( target );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ tooltipData = this._find( target );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The tooltip may already be closed
+ if ( !tooltipData ) {
+ return;
+ }
+
+ tooltip = tooltipData.tooltip;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // disabling closes the tooltip, so we need to track when we're closing
</span><span class="cx" style="display: block; padding: 0 10px"> // to avoid an infinite loop in case the tooltip becomes disabled on close
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( this.closing ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( tooltipData.closing ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -364,12 +372,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this._removeDescribedBy( target );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.hiding = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ tooltipData.hiding = true;
</ins><span class="cx" style="display: block; padding: 0 10px"> tooltip.stop( true );
</span><span class="cx" style="display: block; padding: 0 10px"> this._hide( tooltip, this.options.hide, function() {
</span><span class="cx" style="display: block; padding: 0 10px"> that._removeTooltip( $( this ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.hiding = false;
- this.closing = false;
</del><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> target.removeData( "ui-tooltip-open" );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -388,10 +394,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.closing = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ tooltipData.closing = true;
</ins><span class="cx" style="display: block; padding: 0 10px"> this._trigger( "close", event, { tooltip: tooltip } );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !this.hiding ) {
- this.closing = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( !tooltipData.hiding ) {
+ tooltipData.closing = false;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -407,13 +413,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .appendTo( tooltip );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> tooltip.appendTo( this.document[0].body );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.tooltips[ id ] = element;
- return tooltip;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ return this.tooltips[ id ] = {
+ element: element,
+ tooltip: tooltip
+ };
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _find: function( target ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var id = target.data( "ui-tooltip-id" );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return id ? $( "#" + id ) : $();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return id ? this.tooltips[ id ] : null;
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _removeTooltip: function( tooltip ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -425,10 +434,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var that = this;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // close open tooltips
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $.each( this.tooltips, function( id, element ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $.each( this.tooltips, function( id, tooltipData ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Delegate to close method to handle common cleanup
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var event = $.Event( "blur" );
- event.target = event.currentTarget = element[0];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var event = $.Event( "blur" ),
+ element = tooltipData.element;
+ event.target = event.currentTarget = element[ 0 ];
</ins><span class="cx" style="display: block; padding: 0 10px"> that.close( event, true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove immediately; destroying an open tooltip doesn't use the
</span></span></pre></div>
<a id="trunksrcwpincludesjsjqueryuiwidgetjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/jquery/ui/widget.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/jquery/ui/widget.js 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/js/jquery/ui/widget.js 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * jQuery UI Widget 1.11.1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * jQuery UI Widget 1.11.2
</ins><span class="cx" style="display: block; padding: 0 10px"> * http://jqueryui.com
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Copyright 2014 jQuery Foundation and other contributors
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,7 +36,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // http://bugs.jquery.com/ticket/8235
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } catch( e ) {}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } catch ( e ) {}
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> orig( elems );
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -254,10 +254,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.element = $( element );
</span><span class="cx" style="display: block; padding: 0 10px"> this.uuid = widget_uuid++;
</span><span class="cx" style="display: block; padding: 0 10px"> this.eventNamespace = "." + this.widgetName + this.uuid;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.options = $.widget.extend( {},
- this.options,
- this._getCreateOptions(),
- options );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.bindings = $();
</span><span class="cx" style="display: block; padding: 0 10px"> this.hoverable = $();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -280,6 +276,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.window = $( this.document[0].defaultView || this.document[0].parentWindow );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.options = $.widget.extend( {},
+ this.options,
+ this._getCreateOptions(),
+ options );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> this._create();
</span><span class="cx" style="display: block; padding: 0 10px"> this._trigger( "create", null, this._getCreateEventData() );
</span><span class="cx" style="display: block; padding: 0 10px"> this._init();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -442,8 +443,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _off: function( element, eventName ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- eventName = (eventName || "").split( " " ).join( this.eventNamespace + " " ) + this.eventNamespace;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ eventName = (eventName || "").split( " " ).join( this.eventNamespace + " " ) +
+ this.eventNamespace;
</ins><span class="cx" style="display: block; padding: 0 10px"> element.unbind( eventName ).undelegate( eventName );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Clear the stack to avoid memory leaks (#10056)
+ this.bindings = $( this.bindings.not( element ).get() );
+ this.focusable = $( this.focusable.not( element ).get() );
+ this.hoverable = $( this.hoverable.not( element ).get() );
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _delay: function( handler, delay ) {
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2014-10-16 19:01:18 UTC (rev 29919)
+++ trunk/src/wp-includes/script-loader.php 2014-10-16 19:01:44 UTC (rev 29920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,45 +165,45 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'jquery-migrate', "/wp-includes/js/jquery/jquery-migrate$suffix.js", array(), '1.2.1' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // full jQuery UI
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $scripts->add( 'jquery-ui-core', "/wp-includes/js/jquery/ui/core$dev_suffix.js", array('jquery'), '1.11.1', 1 );
- $scripts->add( 'jquery-effects-core', "/wp-includes/js/jquery/ui/effect$dev_suffix.js", array('jquery'), '1.11.1', 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $scripts->add( 'jquery-ui-core', "/wp-includes/js/jquery/ui/core$dev_suffix.js", array('jquery'), '1.11.2', 1 );
+ $scripts->add( 'jquery-effects-core', "/wp-includes/js/jquery/ui/effect$dev_suffix.js", array('jquery'), '1.11.2', 1 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $scripts->add( 'jquery-effects-blind', "/wp-includes/js/jquery/ui/effect-blind$dev_suffix.js", array('jquery-effects-core'), '1.11.1', 1 );
- $scripts->add( 'jquery-effects-bounce', "/wp-includes/js/jquery/ui/effect-bounce$dev_suffix.js", array('jquery-effects-core'), '1.11.1', 1 );
- $scripts->add( 'jquery-effects-clip', "/wp-includes/js/jquery/ui/effect-clip$dev_suffix.js", array('jquery-effects-core'), '1.11.1', 1 );
- $scripts->add( 'jquery-effects-drop', "/wp-includes/js/jquery/ui/effect-drop$dev_suffix.js", array('jquery-effects-core'), '1.11.1', 1 );
- $scripts->add( 'jquery-effects-explode', "/wp-includes/js/jquery/ui/effect-explode$dev_suffix.js", array('jquery-effects-core'), '1.11.1', 1 );
- $scripts->add( 'jquery-effects-fade', "/wp-includes/js/jquery/ui/effect-fade$dev_suffix.js", array('jquery-effects-core'), '1.11.1', 1 );
- $scripts->add( 'jquery-effects-fold', "/wp-includes/js/jquery/ui/effect-fold$dev_suffix.js", array('jquery-effects-core'), '1.11.1', 1 );
- $scripts->add( 'jquery-effects-highlight', "/wp-includes/js/jquery/ui/effect-highlight$dev_suffix.js", array('jquery-effects-core'), '1.11.1', 1 );
- $scripts->add( 'jquery-effects-puff', "/wp-includes/js/jquery/ui/effect-puff$dev_suffix.js", array('jquery-effects-core'), '1.11.1', 1 );
- $scripts->add( 'jquery-effects-pulsate', "/wp-includes/js/jquery/ui/effect-pulsate$dev_suffix.js", array('jquery-effects-core'), '1.11.1', 1 );
- $scripts->add( 'jquery-effects-scale', "/wp-includes/js/jquery/ui/effect-scale$dev_suffix.js", array('jquery-effects-core'), '1.11.1', 1 );
- $scripts->add( 'jquery-effects-shake', "/wp-includes/js/jquery/ui/effect-shake$dev_suffix.js", array('jquery-effects-core'), '1.11.1', 1 );
- $scripts->add( 'jquery-effects-size', "/wp-includes/js/jquery/ui/effect-size$dev_suffix.js", array('jquery-effects-core'), '1.11.1', 1 );
- $scripts->add( 'jquery-effects-slide', "/wp-includes/js/jquery/ui/effect-slide$dev_suffix.js", array('jquery-effects-core'), '1.11.1', 1 );
- $scripts->add( 'jquery-effects-transfer', "/wp-includes/js/jquery/ui/effect-transfer$dev_suffix.js", array('jquery-effects-core'), '1.11.1', 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $scripts->add( 'jquery-effects-blind', "/wp-includes/js/jquery/ui/effect-blind$dev_suffix.js", array('jquery-effects-core'), '1.11.2', 1 );
+ $scripts->add( 'jquery-effects-bounce', "/wp-includes/js/jquery/ui/effect-bounce$dev_suffix.js", array('jquery-effects-core'), '1.11.2', 1 );
+ $scripts->add( 'jquery-effects-clip', "/wp-includes/js/jquery/ui/effect-clip$dev_suffix.js", array('jquery-effects-core'), '1.11.2', 1 );
+ $scripts->add( 'jquery-effects-drop', "/wp-includes/js/jquery/ui/effect-drop$dev_suffix.js", array('jquery-effects-core'), '1.11.2', 1 );
+ $scripts->add( 'jquery-effects-explode', "/wp-includes/js/jquery/ui/effect-explode$dev_suffix.js", array('jquery-effects-core'), '1.11.2', 1 );
+ $scripts->add( 'jquery-effects-fade', "/wp-includes/js/jquery/ui/effect-fade$dev_suffix.js", array('jquery-effects-core'), '1.11.2', 1 );
+ $scripts->add( 'jquery-effects-fold', "/wp-includes/js/jquery/ui/effect-fold$dev_suffix.js", array('jquery-effects-core'), '1.11.2', 1 );
+ $scripts->add( 'jquery-effects-highlight', "/wp-includes/js/jquery/ui/effect-highlight$dev_suffix.js", array('jquery-effects-core'), '1.11.2', 1 );
+ $scripts->add( 'jquery-effects-puff', "/wp-includes/js/jquery/ui/effect-puff$dev_suffix.js", array('jquery-effects-core'), '1.11.2', 1 );
+ $scripts->add( 'jquery-effects-pulsate', "/wp-includes/js/jquery/ui/effect-pulsate$dev_suffix.js", array('jquery-effects-core'), '1.11.2', 1 );
+ $scripts->add( 'jquery-effects-scale', "/wp-includes/js/jquery/ui/effect-scale$dev_suffix.js", array('jquery-effects-core'), '1.11.2', 1 );
+ $scripts->add( 'jquery-effects-shake', "/wp-includes/js/jquery/ui/effect-shake$dev_suffix.js", array('jquery-effects-core'), '1.11.2', 1 );
+ $scripts->add( 'jquery-effects-size', "/wp-includes/js/jquery/ui/effect-size$dev_suffix.js", array('jquery-effects-core'), '1.11.2', 1 );
+ $scripts->add( 'jquery-effects-slide', "/wp-includes/js/jquery/ui/effect-slide$dev_suffix.js", array('jquery-effects-core'), '1.11.2', 1 );
+ $scripts->add( 'jquery-effects-transfer', "/wp-includes/js/jquery/ui/effect-transfer$dev_suffix.js", array('jquery-effects-core'), '1.11.2', 1 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $scripts->add( 'jquery-ui-accordion', "/wp-includes/js/jquery/ui/accordion$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.1', 1 );
- $scripts->add( 'jquery-ui-autocomplete', "/wp-includes/js/jquery/ui/autocomplete$dev_suffix.js", array('jquery-ui-menu'), '1.11.1', 1 );
- $scripts->add( 'jquery-ui-button', "/wp-includes/js/jquery/ui/button$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.1', 1 );
- $scripts->add( 'jquery-ui-datepicker', "/wp-includes/js/jquery/ui/datepicker$dev_suffix.js", array('jquery-ui-core'), '1.11.1', 1 );
- $scripts->add( 'jquery-ui-dialog', "/wp-includes/js/jquery/ui/dialog$dev_suffix.js", array('jquery-ui-resizable', 'jquery-ui-draggable', 'jquery-ui-button', 'jquery-ui-position'), '1.11.1', 1 );
- $scripts->add( 'jquery-ui-draggable', "/wp-includes/js/jquery/ui/draggable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.1', 1 );
- $scripts->add( 'jquery-ui-droppable', "/wp-includes/js/jquery/ui/droppable$dev_suffix.js", array('jquery-ui-draggable'), '1.11.1', 1 );
- $scripts->add( 'jquery-ui-menu', "/wp-includes/js/jquery/ui/menu$dev_suffix.js", array( 'jquery-ui-core', 'jquery-ui-widget', 'jquery-ui-position' ), '1.11.1', 1 );
- $scripts->add( 'jquery-ui-mouse', "/wp-includes/js/jquery/ui/mouse$dev_suffix.js", array( 'jquery-ui-core', 'jquery-ui-widget' ), '1.11.1', 1 );
- $scripts->add( 'jquery-ui-position', "/wp-includes/js/jquery/ui/position$dev_suffix.js", array('jquery'), '1.11.1', 1 );
- $scripts->add( 'jquery-ui-progressbar', "/wp-includes/js/jquery/ui/progressbar$dev_suffix.js", array('jquery-ui-widget'), '1.11.1', 1 );
- $scripts->add( 'jquery-ui-resizable', "/wp-includes/js/jquery/ui/resizable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.1', 1 );
- $scripts->add( 'jquery-ui-selectable', "/wp-includes/js/jquery/ui/selectable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.1', 1 );
- $scripts->add( 'jquery-ui-selectmenu', "/wp-includes/js/jquery/ui/selectmenu$dev_suffix.js", array('jquery-ui-menu'), '1.11.1', 1 );
- $scripts->add( 'jquery-ui-slider', "/wp-includes/js/jquery/ui/slider$dev_suffix.js", array('jquery-ui-mouse'), '1.11.1', 1 );
- $scripts->add( 'jquery-ui-sortable', "/wp-includes/js/jquery/ui/sortable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.1', 1 );
- $scripts->add( 'jquery-ui-spinner', "/wp-includes/js/jquery/ui/spinner$dev_suffix.js", array( 'jquery-ui-button' ), '1.11.1', 1 );
- $scripts->add( 'jquery-ui-tabs', "/wp-includes/js/jquery/ui/tabs$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.1', 1 );
- $scripts->add( 'jquery-ui-tooltip', "/wp-includes/js/jquery/ui/tooltip$dev_suffix.js", array( 'jquery-ui-core', 'jquery-ui-widget', 'jquery-ui-position' ), '1.11.1', 1 );
- $scripts->add( 'jquery-ui-widget', "/wp-includes/js/jquery/ui/widget$dev_suffix.js", array('jquery'), '1.11.1', 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $scripts->add( 'jquery-ui-accordion', "/wp-includes/js/jquery/ui/accordion$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.2', 1 );
+ $scripts->add( 'jquery-ui-autocomplete', "/wp-includes/js/jquery/ui/autocomplete$dev_suffix.js", array('jquery-ui-menu'), '1.11.2', 1 );
+ $scripts->add( 'jquery-ui-button', "/wp-includes/js/jquery/ui/button$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.2', 1 );
+ $scripts->add( 'jquery-ui-datepicker', "/wp-includes/js/jquery/ui/datepicker$dev_suffix.js", array('jquery-ui-core'), '1.11.2', 1 );
+ $scripts->add( 'jquery-ui-dialog', "/wp-includes/js/jquery/ui/dialog$dev_suffix.js", array('jquery-ui-resizable', 'jquery-ui-draggable', 'jquery-ui-button', 'jquery-ui-position'), '1.11.2', 1 );
+ $scripts->add( 'jquery-ui-draggable', "/wp-includes/js/jquery/ui/draggable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.2', 1 );
+ $scripts->add( 'jquery-ui-droppable', "/wp-includes/js/jquery/ui/droppable$dev_suffix.js", array('jquery-ui-draggable'), '1.11.2', 1 );
+ $scripts->add( 'jquery-ui-menu', "/wp-includes/js/jquery/ui/menu$dev_suffix.js", array( 'jquery-ui-core', 'jquery-ui-widget', 'jquery-ui-position' ), '1.11.2', 1 );
+ $scripts->add( 'jquery-ui-mouse', "/wp-includes/js/jquery/ui/mouse$dev_suffix.js", array( 'jquery-ui-core', 'jquery-ui-widget' ), '1.11.2', 1 );
+ $scripts->add( 'jquery-ui-position', "/wp-includes/js/jquery/ui/position$dev_suffix.js", array('jquery'), '1.11.2', 1 );
+ $scripts->add( 'jquery-ui-progressbar', "/wp-includes/js/jquery/ui/progressbar$dev_suffix.js", array('jquery-ui-widget'), '1.11.2', 1 );
+ $scripts->add( 'jquery-ui-resizable', "/wp-includes/js/jquery/ui/resizable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.2', 1 );
+ $scripts->add( 'jquery-ui-selectable', "/wp-includes/js/jquery/ui/selectable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.2', 1 );
+ $scripts->add( 'jquery-ui-selectmenu', "/wp-includes/js/jquery/ui/selectmenu$dev_suffix.js", array('jquery-ui-menu'), '1.11.2', 1 );
+ $scripts->add( 'jquery-ui-slider', "/wp-includes/js/jquery/ui/slider$dev_suffix.js", array('jquery-ui-mouse'), '1.11.2', 1 );
+ $scripts->add( 'jquery-ui-sortable', "/wp-includes/js/jquery/ui/sortable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.2', 1 );
+ $scripts->add( 'jquery-ui-spinner', "/wp-includes/js/jquery/ui/spinner$dev_suffix.js", array( 'jquery-ui-button' ), '1.11.2', 1 );
+ $scripts->add( 'jquery-ui-tabs', "/wp-includes/js/jquery/ui/tabs$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.2', 1 );
+ $scripts->add( 'jquery-ui-tooltip', "/wp-includes/js/jquery/ui/tooltip$dev_suffix.js", array( 'jquery-ui-core', 'jquery-ui-widget', 'jquery-ui-position' ), '1.11.2', 1 );
+ $scripts->add( 'jquery-ui-widget', "/wp-includes/js/jquery/ui/widget$dev_suffix.js", array('jquery'), '1.11.2', 1 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // deprecated, not used in core, most functionality is included in jQuery 1.3
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'jquery-form', "/wp-includes/js/jquery/jquery.form$suffix.js", array('jquery'), '3.37.0', 1 );
</span></span></pre>
</div>
</div>
</body>
</html>