<!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>[31698] trunk/src: Customizer: Introduce `WP_Customize_Media_Control`.</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/31698">31698</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/31698","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>2015-03-10 18:01:42 +0000 (Tue, 10 Mar 2015)</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'>Customizer: Introduce `WP_Customize_Media_Control`.
`WP_Customize_Media_Control` is a new base class for all Customizer media controls. If used directly it supports the ID of an attachment instead of an URL like `WP_Customize_Upload_Control`.
props celloexpressions.
fixes <a href="https://core.trac.wordpress.org/ticket/29215">#29215</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>
</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 2015-03-10 15:55:28 UTC (rev 31697)
+++ trunk/src/wp-admin/css/customize-controls.css 2015-03-10 18:01:42 UTC (rev 31698)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -582,8 +582,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> -webkit-overflow-scrolling: touch;
</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">-/** Header control **/
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/** Media controls **/
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-media .current,
</ins><span class="cx" style="display: block; padding: 0 10px"> .customize-control-upload .current,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-image .current,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-background .current,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -610,6 +611,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> display: block;
</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">+.customize-control-media .remove-button,
+.customize-control-media .default-button,
+.customize-control-media .upload-button,
</ins><span class="cx" style="display: block; padding: 0 10px"> .customize-control-upload .remove-button,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-upload .default-button,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-upload .upload-button,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -626,6 +630,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> height: auto;
</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">+.customize-control-media .current .container,
</ins><span class="cx" style="display: block; padding: 0 10px"> .customize-control-upload .current .container,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-image .current .container,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-background .current .container,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -637,12 +642,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> border-radius: 2px;
</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">+.customize-control-media .current .container,
</ins><span class="cx" style="display: block; padding: 0 10px"> .customize-control-upload .current .container,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-background .current .container,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-image .current .container {
</span><span class="cx" style="display: block; padding: 0 10px"> min-height: 40px;
</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">+.customize-control-media .placeholder,
</ins><span class="cx" style="display: block; padding: 0 10px"> .customize-control-upload .placeholder,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-image .placeholder,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-background .placeholder,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -653,6 +660,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> cursor: default;
</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">+.customize-control-media .inner,
</ins><span class="cx" style="display: block; padding: 0 10px"> .customize-control-upload .inner,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-image .inner,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-background .inner,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -666,6 +674,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> overflow: hidden;
</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">+.customize-control-media .inner,
</ins><span class="cx" style="display: block; padding: 0 10px"> .customize-control-upload .inner,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-background .inner,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-image .inner {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -673,6 +682,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> min-height: 40px;
</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">+.customize-control-media .inner,
</ins><span class="cx" style="display: block; padding: 0 10px"> .customize-control-upload .inner,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-image .inner,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-background .inner,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -782,6 +792,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 100% { color: #d4b146; }
</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">+.customize-control-media .actions,
</ins><span class="cx" style="display: block; padding: 0 10px"> .customize-control-upload .actions,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-image .actions,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-background .actions,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -799,6 +810,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> margin-bottom: 0;
</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">+.customize-control-media img,
</ins><span class="cx" style="display: block; padding: 0 10px"> .customize-control-upload img,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-image img,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-background img,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -808,6 +820,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> border-radius: 2px;
</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">+.customize-control-media .remove-button,
+.customize-control-media .default-button,
</ins><span class="cx" style="display: block; padding: 0 10px"> .customize-control-upload .remove-button,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-upload .default-button,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-image .remove-button,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -819,6 +833,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> margin-right: 3px;
</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">+.customize-control-media .upload-button,
</ins><span class="cx" style="display: block; padding: 0 10px"> .customize-control-upload .upload-button,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-image .upload-button,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-background .upload-button,
</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 2015-03-10 15:55:28 UTC (rev 31697)
+++ trunk/src/wp-admin/js/customize-controls.js 2015-03-10 18:01:42 UTC (rev 31698)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1370,13 +1370,13 @@
</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">- * An upload control, which utilizes the media modal.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * A control that implements the media modal.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @class
</span><span class="cx" style="display: block; padding: 0 10px"> * @augments wp.customize.Control
</span><span class="cx" style="display: block; padding: 0 10px"> * @augments wp.customize.Class
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- api.UploadControl = api.Control.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ api.MediaControl = api.Control.extend({
</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"> * When the control's DOM structure is ready,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1471,7 +1471,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.params.attachment = attachment;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set the Customizer setting; the callback takes care of rendering.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.setting( attachment.url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.setting( attachment.id );
</ins><span class="cx" style="display: block; padding: 0 10px"> node = this.container.find( 'audio, video' ).get(0);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Initialize audio/video previews.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1509,6 +1509,41 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.params.attachment = {};
</span><span class="cx" style="display: block; padding: 0 10px"> this.setting( '' );
</span><span class="cx" style="display: block; padding: 0 10px"> this.renderContent(); // Not bound to setting change when emptying.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+ });
+
+ /**
+ * An upload control, which utilizes the media modal.
+ *
+ * @class
+ * @augments wp.customize.MediaControl
+ * @augments wp.customize.Control
+ * @augments wp.customize.Class
+ */
+ api.UploadControl = api.MediaControl.extend({
+
+ /**
+ * Callback handler for when an attachment is selected in the media modal.
+ * Gets the selected image information, and sets it within the control.
+ */
+ select: function() {
+ // Get the attachment from the modal frame.
+ var node,
+ attachment = this.frame.state().get( 'selection' ).first().toJSON(),
+ mejsSettings = window._wpmejsSettings || {};
+
+ this.params.attachment = attachment;
+
+ // Set the Customizer setting; the callback takes care of rendering.
+ this.setting( attachment.url );
+ node = this.container.find( 'audio, video' ).get(0);
+
+ // Initialize audio/video previews.
+ if ( node ) {
+ this.player = new MediaElementPlayer( node, mejsSettings );
+ } else {
+ this.cleanupPlayer();
+ }
</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"> // @deprecated
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1526,6 +1561,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @class
</span><span class="cx" style="display: block; padding: 0 10px"> * @augments wp.customize.UploadControl
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @augments wp.customize.MediaControl
</ins><span class="cx" style="display: block; padding: 0 10px"> * @augments wp.customize.Control
</span><span class="cx" style="display: block; padding: 0 10px"> * @augments wp.customize.Class
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1539,6 +1575,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @class
</span><span class="cx" style="display: block; padding: 0 10px"> * @augments wp.customize.UploadControl
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @augments wp.customize.MediaControl
</ins><span class="cx" style="display: block; padding: 0 10px"> * @augments wp.customize.Control
</span><span class="cx" style="display: block; padding: 0 10px"> * @augments wp.customize.Class
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1575,8 +1612,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> api.HeaderControl = api.Control.extend({
</span><span class="cx" style="display: block; padding: 0 10px"> ready: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.btnRemove = $('#customize-control-header_image .actions .remove');
- this.btnNew = $('#customize-control-header_image .actions .new');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.btnRemove = $('#customize-control-header_image .actions .remove');
+ this.btnNew = $('#customize-control-header_image .actions .new');
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _.bindAll(this, 'openMedia', 'removeImage');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2311,6 +2348,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> api.controlConstructor = {
</span><span class="cx" style="display: block; padding: 0 10px"> color: api.ColorControl,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ media: api.MediaControl,
</ins><span class="cx" style="display: block; padding: 0 10px"> upload: api.UploadControl,
</span><span class="cx" style="display: block; padding: 0 10px"> image: api.ImageControl,
</span><span class="cx" style="display: block; padding: 0 10px"> header: api.HeaderControl,
</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 2015-03-10 15:55:28 UTC (rev 31697)
+++ trunk/src/wp-includes/class-wp-customize-control.php 2015-03-10 18:01:42 UTC (rev 31698)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -521,11 +521,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> final public function print_template() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?>
- <script type="text/html" id="tmpl-customize-control-<?php echo $this->type; ?>-content">
- <?php $this->content_template(); ?>
- </script>
- <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+ <script type="text/html" id="tmpl-customize-control-<?php echo $this->type; ?>-content">
+ <?php $this->content_template(); ?>
+ </script>
+ <?php
</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">@@ -638,24 +638,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Customize Upload Control class.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Customize Media Control class.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 3.4.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.2.0
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Control
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-class WP_Customize_Upload_Control extends WP_Customize_Control {
- public $type = 'upload';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+class WP_Customize_Media_Control extends WP_Customize_Control {
+ public $type = 'media';
</ins><span class="cx" style="display: block; padding: 0 10px"> public $mime_type = '';
</span><span class="cx" style="display: block; padding: 0 10px"> public $button_labels = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public $removed = ''; // unused
- public $context; // unused
- public $extensions = array(); // unused
</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"> * Constructor.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.1.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.2.0 Moved from WP_Customize_Upload_Control.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Customize_Manager $manager {@see WP_Customize_Manager} instance.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -677,6 +675,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Enqueue control related scripts/styles.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.4.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.2.0 Moved from WP_Customize_Upload_Control.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function enqueue() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_media();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -686,6 +685,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Refresh the parameters passed to the JavaScript via JSON.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.4.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.2.0 Moved from WP_Customize_Upload_Control.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @uses WP_Customize_Control::to_json()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function to_json() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -698,6 +699,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_object( $this->setting ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->setting->default ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Fake an attachment model - needs all fields used by template.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Note that the default value must be a URL, NOT an attachment ID.
</ins><span class="cx" style="display: block; padding: 0 10px"> $type = in_array( substr( $this->setting->default, -3 ), array( 'jpg', 'png', 'gif', 'bmp' ) ) ? 'image' : 'document';
</span><span class="cx" style="display: block; padding: 0 10px"> $default_attachment = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 1,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -720,11 +722,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Set the default as the attachment.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->json['attachment'] = $this->json['defaultAttachment'];
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Get the attachment model for the existing file.
- $attachment_id = attachment_url_to_postid( $value );
- if ( $attachment_id ) {
- $this->json['attachment'] = wp_prepare_attachment_for_js( $attachment_id );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->json['attachment'] = wp_prepare_attachment_for_js( $value );
</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">@@ -732,15 +730,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Don't render any content for this control from PHP.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @see WP_Customize_Upload_Control::content_template()
</del><span class="cx" style="display: block; padding: 0 10px"> * @since 3.4.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.2.0 Moved from WP_Customize_Upload_Control.
+ *
+ * @see WP_Customize_Media_Control::content_template()
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function render_content() {}
</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">- * Render a JS template for the content of the upload control.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Render a JS template for the content of the media control.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.1.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.2.0 Moved from WP_Customize_Upload_Control.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function content_template() {
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -823,6 +824,42 @@
</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">+ * Customize Upload Control Class.
+ *
+ * @since 3.4.0
+ *
+ * @see WP_Customize_Media_Control
+ */
+class WP_Customize_Upload_Control extends WP_Customize_Media_Control {
+ public $type = 'upload';
+ public $mime_type = '';
+ public $button_labels = array();
+ public $removed = ''; // unused
+ public $context; // unused
+ public $extensions = array(); // unused
+
+ /**
+ * Refresh the parameters passed to the JavaScript via JSON.
+ *
+ * @since 3.4.0
+ *
+ * @uses WP_Customize_Media_Control::to_json()
+ */
+ public function to_json() {
+ parent::to_json();
+
+ $value = $this->value();
+ if ( $value ) {
+ // Get the attachment model for the existing file.
+ $attachment_id = attachment_url_to_postid( $value );
+ if ( $attachment_id ) {
+ $this->json['attachment'] = wp_prepare_attachment_for_js( $attachment_id );
+ }
+ }
+ }
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Customize Image Control class.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.4.0
</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 2015-03-10 15:55:28 UTC (rev 31697)
+++ trunk/src/wp-includes/class-wp-customize-manager.php 2015-03-10 18:01:42 UTC (rev 31698)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1139,6 +1139,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Control Types (custom control classes) */
</span><span class="cx" style="display: block; padding: 0 10px"> $this->register_control_type( 'WP_Customize_Color_Control' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->register_control_type( 'WP_Customize_Media_Control' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->register_control_type( 'WP_Customize_Upload_Control' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->register_control_type( 'WP_Customize_Image_Control' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->register_control_type( 'WP_Customize_Background_Image_Control' );
</span></span></pre>
</div>
</div>
</body>
</html>