<!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>[36858] trunk/src/wp-admin: Themes: Bring the device preview from [31195] to the theme install previewer.</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/36858">36858</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/36858","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>2016-03-05 22:06:57 +0000 (Sat, 05 Mar 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'>Themes: Bring the device preview from <a href="https://core.trac.wordpress.org/changeset/31195">[31195]</a> to the theme install previewer.
Props celloexpressions.
Fixes <a href="https://core.trac.wordpress.org/ticket/36017">#36017</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsscustomizecontrolscss">trunk/src/wp-admin/css/customize-controls.css</a></li>
<li><a href="#trunksrcwpadmincssthemescss">trunk/src/wp-admin/css/themes.css</a></li>
<li><a href="#trunksrcwpadminjsthemejs">trunk/src/wp-admin/js/theme.js</a></li>
<li><a href="#trunksrcwpadminthemeinstallphp">trunk/src/wp-admin/theme-install.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 2016-03-05 22:00:45 UTC (rev 36857)
+++ trunk/src/wp-admin/css/customize-controls.css 2016-03-05 22:06:57 UTC (rev 36858)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1308,129 +1308,6 @@
</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><del style="background-color: #fdd; 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;
- -webkit-box-shadow: none;
- 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 {
- -webkit-box-shadow: none;
- 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%;
-}
-
</del><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="trunksrcwpadmincssthemescss"></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/themes.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/themes.css 2016-03-05 22:00:45 UTC (rev 36857)
+++ trunk/src/wp-admin/css/themes.css 2016-03-05 22:06:57 UTC (rev 36858)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1480,6 +1480,121 @@
</span><span class="cx" style="display: block; padding: 0 10px"> transition-duration: 0.2s;
</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;
+}
+
+.wp-full-overlay-main {
+ background-color: #f1f1f1;
+}
+
+.expanded .wp-full-overlay-footer {
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ width: 300px;
+ height: 45px;
+ border-top: 1px solid #ddd;
+}
+
+.wp-full-overlay-footer .devices {
+ float: right;
+}
+
+.wp-full-overlay-footer .devices button {
+ cursor: pointer;
+ background: transparent;
+ border: none;
+ height: 45px;
+ padding: 0 3px;
+ margin: 0 0 0 -4px;
+ -webkit-box-shadow: none;
+ 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;
+}
+
+.wp-full-overlay-footer .devices button:focus {
+ -webkit-box-shadow: none;
+ box-shadow: none;
+ outline: none;
+}
+
+.wp-full-overlay-footer .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;
+}
+
+.wp-full-overlay-footer .devices button.active {
+ border-bottom-color: #191e23;
+}
+
+.wp-full-overlay-footer .devices button:hover,
+.wp-full-overlay-footer .devices button:focus {
+ background-color: #fff;
+}
+
+.wp-full-overlay-footer .devices button:focus {
+ background-color: #fff;
+ border-bottom-color: #0073aa;
+}
+
+.wp-full-overlay-footer .devices button.active:before,
+.wp-full-overlay-footer .devices button:hover:before,
+.wp-full-overlay-footer .devices button:focus:before {
+ color: #191e23;
+}
+
+.wp-full-overlay-footer .devices .preview-desktop:before {
+ content: "\f472";
+}
+
+.wp-full-overlay-footer .devices .preview-tablet:before {
+ content: "\f471";
+}
+
+.wp-full-overlay-footer .devices .preview-mobile:before {
+ content: "\f470";
+}
+
+@media screen and (max-width:1024px) {
+ .wp-full-overlay-footer .devices {
+ display: none;
+ }
+}
+
+.collapsed .wp-full-overlay-footer .devices button:before {
+ display: none;
+}
+
+.preview-mobile .wp-full-overlay-main {
+ margin: auto 0 auto -160px;
+ width: 320px;
+ height: 480px;
+ max-height: 100%;
+ max-width: 100%;
+ left: 50%;
+}
+
+.preview-tablet .wp-full-overlay-main {
+ margin: auto 0 auto -3in;
+ width: 6in; /* Size is loosely based on a typical "tablet" device size. Intentionally ambiguous - this does not represent any particular device precisely. */
+ height: 9in;
+ max-height: 100%;
+ max-width: 100%;
+ left: 50%;
+}
+
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /*------------------------------------------------------------------------------
</span><span class="cx" style="display: block; padding: 0 10px"> 24.0 - Customize Loader
</span><span class="cx" style="display: block; padding: 0 10px"> ------------------------------------------------------------------------------*/
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1600,7 +1715,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"> .theme-install-overlay .wp-full-overlay-main {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- position: relative;
</del><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"> z-index: 0;
</span><span class="cx" style="display: block; padding: 0 10px"> background-color: #f1f1f1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminjsthemejs"></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/theme.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/theme.js 2016-03-05 22:00:45 UTC (rev 36857)
+++ trunk/src/wp-admin/js/theme.js 2016-03-05 22:06:57 UTC (rev 36858)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -756,6 +756,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> events: {
</span><span class="cx" style="display: block; padding: 0 10px"> 'click .close-full-overlay': 'close',
</span><span class="cx" style="display: block; padding: 0 10px"> 'click .collapse-sidebar': 'collapse',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'click .devices button': 'previewDevice',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'click .previous-theme': 'previousTheme',
</span><span class="cx" style="display: block; padding: 0 10px"> 'click .next-theme': 'nextTheme',
</span><span class="cx" style="display: block; padding: 0 10px"> 'keyup': 'keyEvent'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -765,11 +766,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> html: themes.template( 'theme-preview' ),
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> render: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var self = this,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var self = this, currentPreviewDevice,
</ins><span class="cx" style="display: block; padding: 0 10px"> data = this.model.toJSON();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.$el.removeClass( 'iframe-ready' ).html( this.html( data ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ currentPreviewDevice = this.$el.data( 'current-preview-device' );
+ if ( currentPreviewDevice ) {
+ self.tooglePreviewDeviceButtons( currentPreviewDevice );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> themes.router.navigate( themes.router.baseUrl( themes.router.themePath + this.model.get( 'id' ) ), { replace: true } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.$el.fadeIn( 200, function() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -815,6 +821,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ previewDevice: function( event ) {
+ var device = $( event.currentTarget ).data( 'device' );
+
+ this.$el
+ .removeClass( 'preview-desktop preview-tablet preview-mobile' )
+ .addClass( 'preview-' + device )
+ .data( 'current-preview-device', device );
+
+ this.tooglePreviewDeviceButtons( device );
+ },
+
+ tooglePreviewDeviceButtons: function( newDevice ) {
+ var $devices = $( '.wp-full-overlay-footer .devices' );
+
+ $devices.find( 'button' )
+ .removeClass( 'active' )
+ .attr( 'aria-pressed', false );
+
+ $devices.find( 'button.preview-' + newDevice )
+ .addClass( 'active' )
+ .attr( 'aria-pressed', true );
+ },
+
</ins><span class="cx" style="display: block; padding: 0 10px"> keyEvent: function( event ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // The escape key closes the preview
</span><span class="cx" style="display: block; padding: 0 10px"> if ( event.keyCode === 27 ) {
</span></span></pre></div>
<a id="trunksrcwpadminthemeinstallphp"></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/theme-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/theme-install.php 2016-03-05 22:00:45 UTC (rev 36857)
+++ trunk/src/wp-admin/theme-install.php 2016-03-05 22:06:57 UTC (rev 36858)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -277,6 +277,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wp-full-overlay-footer">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="devices">
+ <button type="button" class="preview-desktop active" aria-pressed="true" data-device="desktop"><span class="screen-reader-text"><?php _e( 'Enter desktop preview mode' ); ?></span></button>
+ <button type="button" class="preview-tablet" aria-pressed="false" data-device="tablet"><span class="screen-reader-text"><?php _e( 'Enter tablet preview mode' ); ?></span></button>
+ <button type="button" class="preview-mobile" aria-pressed="false" data-device="mobile"><span class="screen-reader-text"><?php _e( 'Enter mobile preview mode' ); ?></span></button>
+ </div>
</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>
</div>
</body>
</html>