<!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>[36532] trunk: Customize: Add a user-friendly way to preview site responsiveness for desktop, tablet, and mobile.</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/36532">36532</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/36532","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>2016-02-16 01:56:13 +0000 (Tue, 16 Feb 2016)</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 a user-friendly way to preview site responsiveness for desktop, tablet, and mobile.

Introduces `WP_Customize_Manager::get_previewable_devices()` with a `customize_previewable_devices` filter to change the default device and which devices are available for previewing. This is a feature that was first pioneered on WordPress.com.

Props celloexpressions, folletto, valendesigns, westonruter, welcher, adamsilverstein, michaelarestad, Fab1en.
Fixes <a href="https://core.trac.wordpress.org/ticket/31195">#31195</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsscolors_adminscss">trunk/src/wp-admin/css/colors/_admin.scss</a></li>
<li><a href="#trunksrcwpadmincsscustomizecontrolscss">trunk/src/wp-admin/css/customize-controls.css</a></li>
<li><a href="#trunksrcwpadmincustomizephp">trunk/src/wp-admin/customize.php</a></li>
<li><a href="#trunksrcwpadminjscustomizecontrolsjs">trunk/src/wp-admin/js/customize-controls.js</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizemanagerphp">trunk/src/wp-includes/class-wp-customize-manager.php</a></li>
<li><a href="#trunktestsphpunittestscustomizemanagerphp">trunk/tests/phpunit/tests/customize/manager.php</a></li>
<li><a href="#trunktestsqunitfixturescustomizesettingsjs">trunk/tests/qunit/fixtures/customize-settings.js</a></li>
<li><a href="#trunktestsqunitwpadminjscustomizecontrolsjs">trunk/tests/qunit/wp-admin/js/customize-controls.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsscolors_adminscss"></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/colors/_admin.scss</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/colors/_admin.scss 2016-02-16 01:50:06 UTC (rev 36531)
+++ trunk/src/wp-admin/css/colors/_admin.scss   2016-02-16 01:56:13 UTC (rev 36532)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -487,6 +487,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">        color: $menu-highlight-text;
</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-footer-actions .devices button:focus {
+       border-bottom-color: $highlight-color;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /* Responsive Component */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> div#wp-responsive-toggle a:before {
</span></span></pre></div>
<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     2016-02-16 01:50:06 UTC (rev 36531)
+++ trunk/src/wp-admin/css/customize-controls.css       2016-02-16 01:56:13 UTC (rev 36532)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -610,6 +610,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> #customize-preview iframe {
</span><span class="cx" style="display: block; padding: 0 10px">        width: 100%;
</span><span class="cx" style="display: block; padding: 0 10px">        height: 100%;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        position: absolute;
</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"> .wp-full-overlay-sidebar {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1311,6 +1312,127 @@
</span><span class="cx" style="display: block; padding: 0 10px">        color: #00a0d2;
</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">+/* Device/preview size toggles */
+
+.wp-full-overlay {
+       background: #191e23;
+}
+
+#customize-preview.wp-full-overlay-main {
+       background-color: #f1f1f1;
+}
+
+.expanded #customize-footer-actions {
+       position: fixed;
+       bottom: 0;
+       left: 0;
+       width: 300px;
+       height: 45px;
+       border-top: 1px solid #ddd;
+}
+
+#customize-footer-actions .devices {
+       float: right;
+}
+
+#customize-footer-actions .devices button {
+       cursor: pointer;
+       background: transparent;
+       border: none;
+       height: 45px;
+       padding: 0 3px;
+       margin: 0 0 0 -4px;
+       box-shadow: none;
+       border-top: 1px solid transparent;
+       border-bottom: 4px solid transparent;
+       -webkit-transition: background .1s ease-in-out;
+       transition: background .1s ease-in-out;
+}
+
+#customize-footer-actions .devices button:focus {
+       box-shadow: none;
+       outline: none;
+}
+
+#customize-footer-actions .devices button:before {
+       display: inline-block;
+       -webkit-font-smoothing: antialiased;
+       font: normal 20px/30px "dashicons";
+       vertical-align: top;
+       margin: 3px 0;
+       padding: 4px 8px;
+       color: #656a6f;
+}
+
+#customize-footer-actions .devices button.active {
+       border-bottom-color: #191e23;
+}
+
+#customize-footer-actions .devices button:hover,
+#customize-footer-actions .devices button:focus {
+       background-color: #fff;
+}
+
+#customize-footer-actions .devices button:focus {
+       background-color: #fff;
+       border-bottom-color: #0073aa;
+}
+
+#customize-footer-actions .devices button.active:before,
+#customize-footer-actions .devices button:hover:before,
+#customize-footer-actions .devices button:focus:before {
+       color: #191e23;
+}
+
+.wp-core-ui .wp-full-overlay .collapse-sidebar:hover,
+.wp-core-ui .wp-full-overlay .collapse-sidebar:focus {
+       color: #191e23;
+}
+
+#customize-footer-actions .devices .preview-desktop:before {
+       content: "\f472";
+}
+
+#customize-footer-actions .devices .preview-tablet:before {
+       content: "\f471";
+}
+
+#customize-footer-actions .devices .preview-mobile:before {
+       content: "\f470";
+}
+
+@media screen and (max-width:1024px) {
+       #customize-footer-actions .devices {
+               display: none;
+       }
+}
+
+.collapsed #customize-footer-actions .devices button:before {
+       display: none;
+}
+
+.collapsed #customize-footer-actions .devices .preview-full {
+       left: 0;
+}
+
+.preview-mobile #customize-preview {
+       margin: auto 0 auto -160px;
+       width: 320px;
+       height: 480px;
+       max-height: 100%;
+       max-width: 100%;
+       left: 50%;
+}
+
+.preview-tablet #customize-preview {
+       margin: auto 0 auto -3in;
+       width: 6in;
+       height: 9in;
+       max-height: 100%;
+       max-width: 100%;
+       left: 50%;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .widget-reorder-nav span,
</span><span class="cx" style="display: block; padding: 0 10px"> .menu-item-reorder-nav button {
</span><span class="cx" style="display: block; padding: 0 10px">        position: relative;
</span></span></pre></div>
<a id="trunksrcwpadmincustomizephp"></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/customize.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/customize.php  2016-02-16 01:50:06 UTC (rev 36531)
+++ trunk/src/wp-admin/customize.php    2016-02-16 01:56:13 UTC (rev 36532)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,6 +148,26 @@
</span><span class="cx" style="display: block; padding: 0 10px">                </div>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                <div id="customize-footer-actions" class="wp-full-overlay-footer">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        <?php $previewable_devices = $wp_customize->get_previewable_devices(); ?>
+                       <?php if ( ! empty( $previewable_devices ) ) : ?>
+                       <div class="devices">
+                               <?php foreach ( (array) $previewable_devices as $device => $settings ) : ?>
+                                       <?php
+                                       if ( empty( $settings['label'] ) ) {
+                                               continue;
+                                       }
+                                       $active = ! empty( $settings['default'] );
+                                       $class = 'preview-' . $device;
+                                       if ( $active ) {
+                                               $class .= ' active';
+                                       }
+                                       ?>
+                                       <button type="button" class="<?php echo esc_attr( $class ); ?>" aria-pressed="<?php echo esc_attr( $active ) ?>" data-device="<?php echo esc_attr( $device ); ?>">
+                                               <span class="screen-reader-text"><?php echo esc_html( $settings['label'] ); ?></span>
+                                       </button>
+                               <?php endforeach; ?>
+                       </div>
+                       <?php endif; ?>
</ins><span class="cx" style="display: block; padding: 0 10px">                         <button type="button" class="collapse-sidebar button-secondary" aria-expanded="true" aria-label="<?php esc_attr_e( 'Collapse Sidebar' ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px">                                <span class="collapse-sidebar-arrow"></span>
</span><span class="cx" style="display: block; padding: 0 10px">                                <span class="collapse-sidebar-label"><?php _e( 'Collapse' ); ?></span>
</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       2016-02-16 01:50:06 UTC (rev 36531)
+++ trunk/src/wp-admin/js/customize-controls.js 2016-02-16 01:56:13 UTC (rev 36532)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3229,7 +3229,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        overlay = body.children( '.wp-full-overlay' ),
</span><span class="cx" style="display: block; padding: 0 10px">                        title = $( '#customize-info .panel-title.site-title' ),
</span><span class="cx" style="display: block; padding: 0 10px">                        closeBtn = $( '.customize-controls-close' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        saveBtn = $( '#save' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 saveBtn = $( '#save' ),
+                       footerActions = $( '#customize-footer-actions' );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Prevent the form from saving when enter is pressed on an input or select element.
</span><span class="cx" style="display: block; padding: 0 10px">                $('#customize-controls').on( 'keydown', function( e ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3605,6 +3606,46 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        event.preventDefault();
</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">+                // Previewed device bindings.
+               api.previewedDevice = new api.Value();
+
+               // Set the default device.
+               api.bind( 'ready', function() {
+                       _.find( api.settings.previewableDevices, function( value, key ) {
+                               if ( true === value['default'] ) {
+                                       api.previewedDevice.set( key );
+                                       return true;
+                               }
+                       } );
+               } );
+
+               // Set the toggled device.
+               footerActions.find( '.devices button' ).on( 'click', function( event ) {
+                       api.previewedDevice.set( $( event.currentTarget ).data( 'device' ) );
+               });
+
+               // Bind device changes.
+               api.previewedDevice.bind( function( newDevice ) {
+                       var overlay = $( '.wp-full-overlay' ),
+                               devices = '';
+
+                       footerActions.find( '.devices button' )
+                               .removeClass( 'active' )
+                               .attr( 'aria-pressed', false );
+
+                       footerActions.find( '.devices .preview-' + newDevice )
+                               .addClass( 'active' )
+                               .attr( 'aria-pressed', true );
+
+                       $.each( api.settings.previewableDevices, function( device ) {
+                               devices += ' preview-' + device;
+                       } );
+
+                       overlay
+                               .removeClass( devices )
+                               .addClass( 'preview-' + newDevice );
+               } );
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 // Bind site title display to the corresponding field.
</span><span class="cx" style="display: block; padding: 0 10px">                if ( title.length ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        api( 'blogname', function( setting ) {
</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      2016-02-16 01:50:06 UTC (rev 36531)
+++ trunk/src/wp-includes/class-wp-customize-manager.php        2016-02-16 01:56:13 UTC (rev 36532)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1710,6 +1710,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        'nonce'    => $this->get_nonces(),
</span><span class="cx" style="display: block; padding: 0 10px">                        'autofocus' => array(),
</span><span class="cx" style="display: block; padding: 0 10px">                        'documentTitleTmpl' => $this->get_document_title_template(),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        'previewableDevices' => $this->get_previewable_devices(),
</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">                // Prepare Customize Section objects to pass to JavaScript.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1787,6 +1788,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">+         * Returns a list of devices to allow previewing.
+        *
+        * @access public
+        * @since 4.5.0
+        *
+        * @return array List of devices with labels and default setting.
+        */
+       public function get_previewable_devices() {
+               $devices = array(
+                       'desktop' => array(
+                               'label' => __( 'Enter desktop preview mode' ),
+                               'default' => true,
+                       ),
+                       'tablet' => array(
+                               'label' => __( 'Enter tablet preview mode' ),
+                       ),
+                       'mobile' => array(
+                               'label' => __( 'Enter mobile preview mode' ),
+                       ),
+               );
+
+               /**
+                * Filter the available devices to allow previewing in the Customizer.
+                *
+                * @since 4.5.0
+                *
+                * @see WP_Customize_Manager::get_previewable_devices()
+                *
+                * @param array $devices List of devices with labels and default setting.
+                */
+               $devices = apply_filters( 'customize_previewable_devices', $devices );
+
+               return $devices;
+       }
+
+       /**
</ins><span class="cx" style="display: block; padding: 0 10px">          * Register some default controls.
</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="trunktestsphpunittestscustomizemanagerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/customize/manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/manager.php   2016-02-16 01:50:06 UTC (rev 36531)
+++ trunk/tests/phpunit/tests/customize/manager.php     2016-02-16 01:56:13 UTC (rev 36532)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -425,7 +425,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $data = json_decode( $json, true );
</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( $data );
</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->assertEqualSets( array( 'theme', 'url', 'browser', 'panels', 'sections', 'nonce', 'autofocus', 'documentTitleTmpl' ), array_keys( $data ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertEqualSets( array( 'theme', 'url', 'browser', 'panels', 'sections', 'nonce', 'autofocus', 'documentTitleTmpl', 'previewableDevices' ), array_keys( $data ) );
</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( $autofocus, $data['autofocus'] );
</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'save', $data['nonce'] );
</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertArrayHasKey( 'preview', $data['nonce'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -716,6 +716,69 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $control, $result_control );
</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $control_id, $result_control->id );
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+
+       /**
+        * Testing the return values both with and without filter.
+        *
+        * @ticket 31195
+        */
+       function test_get_previewable_devices() {
+
+               // Setup the instance.
+               $manager = new WP_Customize_Manager();
+
+               // The default devices list.
+               $default_devices = array(
+                       'desktop' => array(
+                               'label'   => __( 'Enter desktop preview mode' ),
+                               'default' => true,
+                       ),
+                       'tablet'  => array(
+                               'label' => __( 'Enter tablet preview mode' ),
+                       ),
+                       'mobile'  => array(
+                               'label' => __( 'Enter mobile preview mode' ),
+                       ),
+               );
+
+               // Control test.
+               $devices = $manager->get_previewable_devices();
+               $this->assertSame( $default_devices, $devices );
+
+               // Adding the filter.
+               add_filter( 'customize_previewable_devices', array( $this, 'filter_customize_previewable_devices' ) );
+               $devices = $manager->get_previewable_devices();
+               $this->assertSame( $this->filtered_device_list(), $devices );
+
+               // Clean up.
+               remove_filter( 'customize_previewable_devices', array( $this, 'filter_customize_previewable_devices' ) );
+       }
+
+       /**
+        * Helper method for test_get_previewable_devices.
+        *
+        * @return array
+        */
+       function filtered_device_list() {
+               return array(
+                       'custom-device' => array(
+                               'label' => __( 'Enter custom-device preview mode' ),
+                               'default' => true,
+                       ),
+               );
+       }
+
+       /**
+        * Callback for the customize_previewable_devices filter.
+        *
+        * @param array $devices The list of devices.
+        *
+        * @return array
+        */
+       function filter_customize_previewable_devices( $devices ) {
+               return $this->filtered_device_list();
+       }
</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"> require_once ABSPATH . WPINC . '/class-wp-customize-setting.php';
</span></span></pre></div>
<a id="trunktestsqunitfixturescustomizesettingsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/qunit/fixtures/customize-settings.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/qunit/fixtures/customize-settings.js  2016-02-16 01:50:06 UTC (rev 36531)
+++ trunk/tests/qunit/fixtures/customize-settings.js    2016-02-16 01:56:13 UTC (rev 36532)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,6 +130,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">                'login': 'http://example.org/wp-login.php?interim-login=1&customize-login=1',
</span><span class="cx" style="display: block; padding: 0 10px">                'parent': 'http://example.org/wp-admin/',
</span><span class="cx" style="display: block; padding: 0 10px">                'preview': 'http://example.org/'
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        },
+       'previewableDevices': {
+               'desktop': {
+                       'label': 'Enter desktop preview mode',
+                       'default': true
+               },
+               'tablet': {
+                       'label': 'Enter tablet preview mode'
+               },
+               'mobile': {
+                       'label': 'Enter mobile preview mode'
+               }
</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"> window._wpCustomizeControlsL10n = {};
</span></span></pre></div>
<a id="trunktestsqunitwpadminjscustomizecontrolsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/qunit/wp-admin/js/customize-controls.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/qunit/wp-admin/js/customize-controls.js       2016-02-16 01:50:06 UTC (rev 36531)
+++ trunk/tests/qunit/wp-admin/js/customize-controls.js 2016-02-16 01:56:13 UTC (rev 36532)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,6 +76,11 @@
</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">+        module( 'Customizer Previewed Device' );
+       test( 'Previewed device defaults to desktop.', function () {
+               equal( wp.customize.previewedDevice.get(), 'desktop' );
+       } );
+
</ins><span class="cx" style="display: block; padding: 0 10px">         module( 'Customizer Setting in Fixture' );
</span><span class="cx" style="display: block; padding: 0 10px">        test( 'Setting has fixture value', function () {
</span><span class="cx" style="display: block; padding: 0 10px">                equal( wp.customize( 'fixture-setting' )(), 'Lorem Ipsum' );
</span></span></pre>
</div>
</div>

</body>
</html>