<!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>[41771] trunk/src: Customize: Add default control template for standard input types.</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/41771">41771</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/41771","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-10-05 02:55:11 +0000 (Thu, 05 Oct 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'>Customize: Add default control template for standard input types.

Re-use default template instead of introducing custom one for the Discard Changes button.

See <a href="https://core.trac.wordpress.org/ticket/30738">#30738</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsscustomizecontrolscss">trunk/src/wp-admin/css/customize-controls.css</a></li>
<li><a href="#trunksrcwpadminjscustomizecontrolsjs">trunk/src/wp-admin/js/customize-controls.js</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizecontrolphp">trunk/src/wp-includes/class-wp-customize-control.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizemanagerphp">trunk/src/wp-includes/class-wp-customize-manager.php</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="trunksrcwpadmincsscustomizecontrolscss"></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/css/customize-controls.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/customize-controls.css     2017-10-05 02:49:15 UTC (rev 41770)
+++ trunk/src/wp-admin/css/customize-controls.css       2017-10-05 02:55:11 UTC (rev 41771)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,12 +152,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> #customize-control-trash_changeset {
</span><span class="cx" style="display: block; padding: 0 10px">        margin-top: 20px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#customize-control-trash_changeset button {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#customize-control-trash_changeset .button-link {
</ins><span class="cx" style="display: block; padding: 0 10px">         position: relative;
</span><span class="cx" style="display: block; padding: 0 10px">        padding-left: 24px;
</span><span class="cx" style="display: block; padding: 0 10px">        display: inline-block;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#customize-control-trash_changeset button:before {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#customize-control-trash_changeset .button-link:before {
</ins><span class="cx" style="display: block; padding: 0 10px">         content: "\f182";
</span><span class="cx" style="display: block; padding: 0 10px">        font: normal 22px dashicons;
</span><span class="cx" style="display: block; padding: 0 10px">        text-decoration: none;
</span></span></pre></div>
<a id="trunksrcwpadminjscustomizecontrolsjs"></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-controls.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/customize-controls.js       2017-10-05 02:49:15 UTC (rev 41770)
+++ trunk/src/wp-admin/js/customize-controls.js 2017-10-05 02:55:11 UTC (rev 41771)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3141,7 +3141,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">                initialize: function( id, options ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        var control = this, deferredSettingIds = [], settings, gatherSettings;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 var control = this, deferredSettingIds = [], settings, gatherSettings, standardTypes;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        control.params = _.extend( {}, control.defaults );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3174,13 +3174,41 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        control.id = id;
</span><span class="cx" style="display: block; padding: 0 10px">                        control.selector = '#customize-control-' + id.replace( /\]/g, '' ).replace( /\[/g, '-' ); // Deprecated, likely dead code from time before #28709.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        control.templateSelector = control.params.templateId || 'customize-control-' + control.params.type + '-content';
</del><span class="cx" style="display: block; padding: 0 10px">                         if ( control.params.content ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                control.container = $( control.params.content );
</span><span class="cx" style="display: block; padding: 0 10px">                        } else {
</span><span class="cx" style="display: block; padding: 0 10px">                                control.container = $( control.selector ); // Likely dead, per above. See #28709.
</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">+                        standardTypes = [
+                               'button',
+                               'checkbox',
+                               'color',
+                               'date',
+                               'datetime-local',
+                               'email',
+                               'month',
+                               'number',
+                               'password',
+                               'radio',
+                               'range',
+                               'search',
+                               'select',
+                               'tel',
+                               'time',
+                               'text',
+                               'textarea',
+                               'week',
+                               'url'
+                       ];
+                       if ( control.params.templateId ) {
+                               control.templateSelector = control.params.templateId;
+                       } else if ( _.contains( standardTypes, control.params.type ) && control.container.is( ':empty' ) ) {
+                               control.templateSelector = 'customize-control-default-content';
+                       } else {
+                               control.templateSelector = 'customize-control-' + control.params.type + '-content';
+                       }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                         control.deferred = {
</span><span class="cx" style="display: block; padding: 0 10px">                                embedded: new $.Deferred()
</span><span class="cx" style="display: block; padding: 0 10px">                        };
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6446,11 +6474,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                type: 'button',
</span><span class="cx" style="display: block; padding: 0 10px">                                section: section.id,
</span><span class="cx" style="display: block; padding: 0 10px">                                priority: 30,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                templateId: 'customize-trash-changeset-control'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         inputAttrs: {
+                                       'class': 'button-link button-link-delete',
+                                       value: api.l10n.discardChanges
+                               }
</ins><span class="cx" style="display: block; padding: 0 10px">                         } );
</span><span class="cx" style="display: block; padding: 0 10px">                        api.control.add( trashControl );
</span><span class="cx" style="display: block; padding: 0 10px">                        trashControl.deferred.embedded.done( function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                trashControl.container.find( 'button' ).on( 'click', function() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         trashControl.container.find( '.button-link' ).on( 'click', function() {
</ins><span class="cx" style="display: block; padding: 0 10px">                                         if ( confirm( api.l10n.trashConfirm ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                                wp.customize.previewer.trash();
</span><span class="cx" style="display: block; padding: 0 10px">                                        }
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizecontrolphp"></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/class-wp-customize-control.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-control.php      2017-10-05 02:49:15 UTC (rev 41770)
+++ trunk/src/wp-includes/class-wp-customize-control.php        2017-10-05 02:55:11 UTC (rev 41771)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -482,7 +482,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        protected function render_content() {
</span><span class="cx" style="display: block; padding: 0 10px">                $input_id = '_customize-input-' . $this->id;
</span><span class="cx" style="display: block; padding: 0 10px">                $description_id = '_customize-description-' . $this->id;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $describedby_attr = ( ! empty( $this->description ) ) ? 'aria-describedby="' . esc_attr( $description_id ) . '"' : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $describedby_attr = ( ! empty( $this->description ) ) ? ' aria-describedby="' . esc_attr( $description_id ) . '" ' : '';
</ins><span class="cx" style="display: block; padding: 0 10px">                 switch ( $this->type ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        case 'checkbox':
</span><span class="cx" style="display: block; padding: 0 10px">                                ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -520,7 +520,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        <span class="customize-inside-control-row">
</span><span class="cx" style="display: block; padding: 0 10px">                                                <input
</span><span class="cx" style="display: block; padding: 0 10px">                                                        id="<?php echo esc_attr( $input_id . '-radio-' . $value ); ?>"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        type="radio" <?php echo $describedby_attr; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 type="radio"
+                                                       <?php echo $describedby_attr; ?>
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         value="<?php echo esc_attr( $value ); ?>"
</span><span class="cx" style="display: block; padding: 0 10px">                                                        name="<?php echo esc_attr( $name ); ?>"
</span><span class="cx" style="display: block; padding: 0 10px">                                                        <?php $this->link(); ?>
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizemanagerphp"></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/class-wp-customize-manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-manager.php      2017-10-05 02:49:15 UTC (rev 41770)
+++ trunk/src/wp-includes/class-wp-customize-manager.php        2017-10-05 02:55:11 UTC (rev 41771)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3600,8 +3600,143 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        ) );
</span><span class="cx" style="display: block; padding: 0 10px">                        $control->print_template();
</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"> 
</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">+         <script type="text/html" id="tmpl-customize-control-default-content">
+                       <#
+                       var inputId = _.uniqueId( 'customize-control-default-input-' );
+                       var descriptionId = _.uniqueId( 'customize-control-default-description-' );
+                       var describedByAttr = data.description ? ' aria-describedby="' + descriptionId + '" ' : '';
+                       #>
+                       <# switch ( data.type ) {
+                               case 'checkbox': #>
+                                       <span class="customize-inside-control-row">
+                                               <input
+                                                       id="{{ inputId }}"
+                                                       {{{ describedByAttr }}}
+                                                       type="checkbox"
+                                                       value="{{ data.value }}"
+                                                       data-customize-setting-key-link="default"
+                                               >
+                                               <label for="{{ inputId }}">
+                                                       {{ data.label }}
+                                               </label>
+                                               <# if ( data.description ) { #>
+                                                       <span id="{{ descriptionId }}" class="description customize-control-description">{{{ data.description }}}</span>
+                                               <# } #>
+                                       </span>
+                                       <#
+                                       break;
+                               case 'radio':
+                                       if ( ! data.choices ) {
+                                               return;
+                                       }
+                                       #>
+                                       <# if ( data.label ) { #>
+                                               <label for="{{ inputId }}" class="customize-control-title">
+                                                       {{ data.label }}
+                                               </label>
+                                       <# } #>
+                                       <# if ( data.description ) { #>
+                                               <span id="{{ descriptionId }}" class="description customize-control-description">{{{ data.description }}}</span>
+                                       <# } #>
+                                       <# _.each( data.choices, function( val, key ) { #>
+                                               <span class="customize-inside-control-row">
+                                                       <#
+                                                       var value, text;
+                                                       if ( _.isObject( val ) ) {
+                                                               value = val.value;
+                                                               text = val.text;
+                                                       } else {
+                                                               value = key;
+                                                               text = val;
+                                                       }
+                                                       #>
+                                                       <input
+                                                               id="{{ inputId + '-' + value }}"
+                                                               type="radio"
+                                                               value="{{ value }}"
+                                                               name="{{ inputId }}"
+                                                               data-customize-setting-key-link="default"
+                                                               {{{ describedByAttr }}}
+                                                       >
+                                                       <label for="{{ inputId + '-' + value }}">{{ text }}</label>
+                                               </span>
+                                       <# } ); #>
+                                       <#
+                                       break;
+                               default:
+                                       #>
+                                       <# if ( data.label ) { #>
+                                               <label for="{{ inputId }}" class="customize-control-title">
+                                                       {{ data.label }}
+                                               </label>
+                                       <# } #>
+                                       <# if ( data.description ) { #>
+                                               <span id="{{ descriptionId }}" class="description customize-control-description">{{{ data.description }}}</span>
+                                       <# } #>
+
+                                       <#
+                                       var inputAttrs = {
+                                               id: inputId,
+                                               'data-customize-setting-key-link': 'default'
+                                       };
+                                       if ( 'textarea' === data.type ) {
+                                               inputAttrs.rows = '5';
+                                       } else if ( 'button' === data.type ) {
+                                               inputAttrs['class'] = 'button button-secondary';
+                                               inputAttrs.type = 'button';
+                                       } else {
+                                               inputAttrs.type = data.type;
+                                       }
+                                       if ( data.description ) {
+                                               inputAttrs['aria-describedby'] = descriptionId;
+                                       }
+                                       _.extend( inputAttrs, data.inputAttrs );
+                                       #>
+
+                                       <# if ( 'button' === data.type ) { #>
+                                               <button
+                                                       <# _.each( _.extend( inputAttrs ), function( value, key ) { #>
+                                                               {{{ key }}}="{{ value }}"
+                                                       <# } ); #>
+                                               >{{ inputAttrs.value }}</button>
+                                       <# } else if ( 'textarea' === data.type ) { #>
+                                               <textarea
+                                                       <# _.each( _.extend( inputAttrs ), function( value, key ) { #>
+                                                               {{{ key }}}="{{ value }}"
+                                                       <# }); #>
+                                               >{{ inputAttrs.value }}</textarea>
+                                       <# } else if ( 'select' === data.type ) { #>
+                                               <select
+                                                       <# _.each( _.extend( inputAttrs ), function( value, key ) { #>
+                                                               {{{ key }}}="{{ value }}"
+                                                       <# }); #>
+                                                       >
+                                                       <# _.each( data.choices, function( val, key ) { #>
+                                                               <#
+                                                               var value, text;
+                                                               if ( _.isObject( val ) ) {
+                                                                       value = val.value;
+                                                                       text = val.text;
+                                                               } else {
+                                                                       value = key;
+                                                                       text = val;
+                                                               }
+                                                               #>
+                                                               <option value="{{ value }}">{{ text }}</option>
+                                                       <# } ); #>
+                                               </select>
+                                       <# } else { #>
+                                               <input
+                                                       <# _.each( _.extend( inputAttrs ), function( value, key ) { #>
+                                                               {{{ key }}}="{{ value }}"
+                                                       <# }); #>
+                                                       >
+                                       <# } #>
+                       <# } #>
+               </script>
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 <script type="text/html" id="tmpl-customize-notification">
</span><span class="cx" style="display: block; padding: 0 10px">                        <li class="notice notice-{{ data.type || 'info' }} {{ data.alt ? 'notice-alt' : '' }} {{ data.dismissible ? 'is-dismissible' : '' }} {{ data.containerClasses || '' }}" data-code="{{ data.code }}" data-type="{{ data.type }}">
</span><span class="cx" style="display: block; padding: 0 10px">                                <div class="notification-message">{{{ data.message || data.code }}}</div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3621,6 +3756,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                <# } ); #>
</span><span class="cx" style="display: block; padding: 0 10px">                        </ul>
</span><span class="cx" style="display: block; padding: 0 10px">                </script>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px">                 <script type="text/html" id="tmpl-customize-preview-link-control" >
</span><span class="cx" style="display: block; padding: 0 10px">                        <# var elementPrefix = _.uniqueId( 'el' ) + '-' #>
</span><span class="cx" style="display: block; padding: 0 10px">                        <p class="customize-control-title">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3638,9 +3774,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                <button class="customize-copy-preview-link preview-control-element button button-secondary" data-component="button" data-copy-text="<?php esc_attr_e( 'Copy' ); ?>" data-copied-text="<?php esc_attr_e( 'Copied' ); ?>" ><?php esc_html_e( 'Copy' ); ?></button>
</span><span class="cx" style="display: block; padding: 0 10px">                        </div>
</span><span class="cx" style="display: block; padding: 0 10px">                </script>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <script type="text/html" id="tmpl-customize-trash-changeset-control">
-                       <button type="button" class="button-link button-link-delete"><?php _e( 'Discard changes' ); ?></button>
-               </script>
</del><span class="cx" style="display: block; padding: 0 10px">                 <script type="text/html" id="tmpl-customize-selected-changeset-status-control">
</span><span class="cx" style="display: block; padding: 0 10px">                        <# var inputId = _.uniqueId( 'customize-selected-changeset-status-control-input-' ); #>
</span><span class="cx" style="display: block; padding: 0 10px">                        <# var descriptionId = _.uniqueId( 'customize-selected-changeset-status-control-description-' ); #>
</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   2017-10-05 02:49:15 UTC (rev 41770)
+++ trunk/src/wp-includes/script-loader.php     2017-10-05 02:55:11 UTC (rev 41771)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -565,6 +565,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                'cancel'             => __( 'Cancel' ),
</span><span class="cx" style="display: block; padding: 0 10px">                'close'              => __( 'Close' ),
</span><span class="cx" style="display: block; padding: 0 10px">                'action'             => __( 'Action' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                'discardChanges'     => __( 'Discard changes' ),
</ins><span class="cx" style="display: block; padding: 0 10px">                 'cheatin'            => __( 'Cheatin&#8217; uh?' ),
</span><span class="cx" style="display: block; padding: 0 10px">                'notAllowed'         => __( 'Sorry, you are not allowed to customize this site.' ),
</span><span class="cx" style="display: block; padding: 0 10px">                'previewIframeTitle' => __( 'Site Preview' ),
</span></span></pre>
</div>
</div>

</body>
</html>