<!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>[41249] trunk/src/wp-admin/js: Widgets: Add missing `open` class for expanded widgets in Customizer; utilize `open` class for expansion detection in Text and Media widgets.</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/41249">41249</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/41249","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>westonruter</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-08-13 06:24:28 +0000 (Sun, 13 Aug 2017)</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'>Widgets: Add missing `open` class for expanded widgets in Customizer; utilize `open` class for expansion detection in Text and Media widgets.
Fixes <a href="https://core.trac.wordpress.org/ticket/41625">#41625</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjscustomizewidgetsjs">trunk/src/wp-admin/js/customize-widgets.js</a></li>
<li><a href="#trunksrcwpadminjswidgetsmediawidgetsjs">trunk/src/wp-admin/js/widgets/media-widgets.js</a></li>
<li><a href="#trunksrcwpadminjswidgetstextwidgetsjs">trunk/src/wp-admin/js/widgets/text-widgets.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjscustomizewidgetsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/customize-widgets.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/customize-widgets.js 2017-08-13 06:10:11 UTC (rev 41248)
+++ trunk/src/wp-admin/js/customize-widgets.js 2017-08-13 06:24:28 UTC (rev 41249)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1400,6 +1400,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> complete = function() {
</span><span class="cx" style="display: block; padding: 0 10px"> self.container.removeClass( 'expanding' );
</span><span class="cx" style="display: block; padding: 0 10px"> self.container.addClass( 'expanded' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $widget.addClass( 'open' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $toggleBtn.attr( 'aria-expanded', 'true' );
</span><span class="cx" style="display: block; padding: 0 10px"> self.container.trigger( 'expanded' );
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1433,6 +1434,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> complete = function() {
</span><span class="cx" style="display: block; padding: 0 10px"> self.container.removeClass( 'collapsing' );
</span><span class="cx" style="display: block; padding: 0 10px"> self.container.removeClass( 'expanded' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $widget.removeClass( 'open' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $toggleBtn.attr( 'aria-expanded', 'false' );
</span><span class="cx" style="display: block; padding: 0 10px"> self.container.trigger( 'collapsed' );
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span></span></pre></div>
<a id="trunksrcwpadminjswidgetsmediawidgetsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/widgets/media-widgets.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/widgets/media-widgets.js 2017-08-13 06:10:11 UTC (rev 41248)
+++ trunk/src/wp-admin/js/widgets/media-widgets.js 2017-08-13 06:24:28 UTC (rev 41249)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1030,7 +1030,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @returns {void}
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> component.handleWidgetAdded = function handleWidgetAdded( event, widgetContainer ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var fieldContainer, syncContainer, widgetForm, idBase, ControlConstructor, ModelConstructor, modelAttributes, widgetControl, widgetModel, widgetId, widgetInside, animatedCheckDelay = 50, renderWhenAnimationDone;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var fieldContainer, syncContainer, widgetForm, idBase, ControlConstructor, ModelConstructor, modelAttributes, widgetControl, widgetModel, widgetId, animatedCheckDelay = 50, renderWhenAnimationDone;
</ins><span class="cx" style="display: block; padding: 0 10px"> widgetForm = widgetContainer.find( '> .widget-inside > .form, > .widget-inside > form' ); // Note: '.form' appears in the customizer, whereas 'form' on the widgets admin screen.
</span><span class="cx" style="display: block; padding: 0 10px"> idBase = widgetForm.find( '> .id_base' ).val();
</span><span class="cx" style="display: block; padding: 0 10px"> widgetId = widgetForm.find( '> .widget-id' ).val();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1088,9 +1088,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * This ensures that the container's dimensions are fixed so that ME.js
</span><span class="cx" style="display: block; padding: 0 10px"> * can initialize with the proper dimensions.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- widgetInside = widgetContainer.parent();
</del><span class="cx" style="display: block; padding: 0 10px"> renderWhenAnimationDone = function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( widgetInside.is( ':animated' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! widgetContainer.hasClass( 'open' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> setTimeout( renderWhenAnimationDone, animatedCheckDelay );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> widgetControl.render();
</span></span></pre></div>
<a id="trunksrcwpadminjswidgetstextwidgetsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/widgets/text-widgets.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/widgets/text-widgets.js 2017-08-13 06:10:11 UTC (rev 41248)
+++ trunk/src/wp-admin/js/widgets/text-widgets.js 2017-08-13 06:24:28 UTC (rev 41249)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -354,7 +354,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @returns {void}
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> component.handleWidgetAdded = function handleWidgetAdded( event, widgetContainer ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var widgetForm, idBase, widgetControl, widgetId, animatedCheckDelay = 50, widgetInside, renderWhenAnimationDone, fieldContainer, syncContainer;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var widgetForm, idBase, widgetControl, widgetId, animatedCheckDelay = 50, renderWhenAnimationDone, fieldContainer, syncContainer;
</ins><span class="cx" style="display: block; padding: 0 10px"> widgetForm = widgetContainer.find( '> .widget-inside > .form, > .widget-inside > form' ); // Note: '.form' appears in the customizer, whereas 'form' on the widgets admin screen.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> idBase = widgetForm.find( '> .id_base' ).val();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -401,9 +401,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * This ensures that the textarea is visible and an iframe can be embedded
</span><span class="cx" style="display: block; padding: 0 10px"> * with TinyMCE being able to set contenteditable on it.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- widgetInside = widgetContainer.parent();
</del><span class="cx" style="display: block; padding: 0 10px"> renderWhenAnimationDone = function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( widgetInside.is( ':animated' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! widgetContainer.hasClass( 'open' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> setTimeout( renderWhenAnimationDone, animatedCheckDelay );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> widgetControl.initializeEditor();
</span></span></pre>
</div>
</div>
</body>
</html>