<!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>[39226] trunk/src/wp-content/themes/twentyfourteen: Twenty Fourteen: Removes video header support</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/39226">39226</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/39226","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>karmatosed</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-11-14 17:16:04 +0000 (Mon, 14 Nov 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'>Twenty Fourteen: Removes video header support
Support was added to test implementation but never completed. This removes the test implementation.
Props davidakennedy
Fixes <a href="https://core.trac.wordpress.org/ticket/38783">#38783</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyfourteenfunctionsphp">trunk/src/wp-content/themes/twentyfourteen/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenheaderphp">trunk/src/wp-content/themes/twentyfourteen/header.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteeninccustomheaderphp">trunk/src/wp-content/themes/twentyfourteen/inc/custom-header.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteeninccustomizerphp">trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenjsfunctionsjs">trunk/src/wp-content/themes/twentyfourteen/js/functions.js</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenstylecss">trunk/src/wp-content/themes/twentyfourteen/style.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentyfourteenfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfourteen/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/functions.php 2016-11-14 17:00:57 UTC (rev 39225)
+++ trunk/src/wp-content/themes/twentyfourteen/functions.php 2016-11-14 17:16:04 UTC (rev 39226)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -434,7 +434,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'group-blog';
</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">- if ( get_header_image() || function_exists( 'has_header_video' ) && has_header_video() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_header_image() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'header-image';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! in_array( $GLOBALS['pagenow'], array( 'wp-activate.php', 'wp-signup.php' ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'masthead-fixed';
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfourteen/header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/header.php 2016-11-14 17:00:57 UTC (rev 39225)
+++ trunk/src/wp-content/themes/twentyfourteen/header.php 2016-11-14 17:16:04 UTC (rev 39226)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,11 +32,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <body <?php body_class(); ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="page" class="hfeed site">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( function_exists( 'has_header_video' ) && has_header_video() ) : ?>
- <div id="site-header">
- <?php the_custom_header_markup(); ?>
- </div>
- <?php elseif ( get_header_image() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( get_header_image() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div id="site-header">
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home">
</span><span class="cx" style="display: block; padding: 0 10px"> <img src="<?php header_image(); ?>" width="<?php echo get_custom_header()->width; ?>" height="<?php echo get_custom_header()->height; ?>" alt="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteeninccustomheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfourteen/inc/custom-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/inc/custom-header.php 2016-11-14 17:00:57 UTC (rev 39225)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/custom-header.php 2016-11-14 17:16:04 UTC (rev 39226)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,7 +40,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'width' => 1260,
</span><span class="cx" style="display: block; padding: 0 10px"> 'height' => 240,
</span><span class="cx" style="display: block; padding: 0 10px"> 'flex-height' => true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'video' => true,
</del><span class="cx" style="display: block; padding: 0 10px"> 'wp-head-callback' => 'twentyfourteen_header_style',
</span><span class="cx" style="display: block; padding: 0 10px"> 'admin-head-callback' => 'twentyfourteen_admin_header_style',
</span><span class="cx" style="display: block; padding: 0 10px"> 'admin-preview-callback' => 'twentyfourteen_admin_header_image',
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteeninccustomizerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php 2016-11-14 17:00:57 UTC (rev 39225)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php 2016-11-14 17:16:04 UTC (rev 39226)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,8 +19,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->get_setting( 'blogname' )->transport = 'postMessage';
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->get_setting( 'blogdescription' )->transport = 'postMessage';
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->get_setting( 'header_textcolor' )->transport = 'postMessage';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_customize->get_setting( 'header_image' )->transport = 'postMessage';
- $wp_customize->get_setting( 'header_image_data' )->transport = 'postMessage';
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $wp_customize->selective_refresh ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->selective_refresh->add_partial( 'blogname', array(
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenjsfunctionsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfourteen/js/functions.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/js/functions.js 2016-11-14 17:00:57 UTC (rev 39225)
+++ trunk/src/wp-content/themes/twentyfourteen/js/functions.js 2016-11-14 17:16:04 UTC (rev 39226)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,15 +95,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( _window.width() > 781 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var mastheadHeight = $( '#masthead' ).height(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- mastheadOffset;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ toolbarOffset, mastheadOffset;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( mastheadHeight > 48 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> body.removeClass( 'masthead-fixed' );
</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">- mastheadOffset = $( '#site-header' ).height();
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( body.is( '.header-image' ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ toolbarOffset = body.is( '.admin-bar' ) ? $( '#wpadminbar' ).height() : 0;
+ mastheadOffset = $( '#masthead' ).offset().top - toolbarOffset;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _window.on( 'scroll.twentyfourteen', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( _window.scrollTop() > mastheadOffset && mastheadHeight < 49 ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,19 +112,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> body.removeClass( 'masthead-fixed' );
</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">-
- // Update masthead offset once a custom header video loads.
- $( document ).on( 'wp-custom-header-video-loaded', function() {
- mastheadOffset = $( '#site-header' ).height();
- } );
-
-
- // Update masthead offset after a selective refresh.
- if ( 'undefined' !== typeof wp && wp.customize && wp.customize.selectiveRefresh ) {
- wp.customize.selectiveRefresh.bind( 'partial-content-rendered', function() {
- mastheadOffset = $( '#site-header' ).height();
- } );
- }
</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">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenstylecss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfourteen/style.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/style.css 2016-11-14 17:00:57 UTC (rev 39225)
+++ trunk/src/wp-content/themes/twentyfourteen/style.css 2016-11-14 17:16:04 UTC (rev 39226)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,7 +88,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> video {
</span><span class="cx" style="display: block; padding: 0 10px"> display: inline-block;
</span><span class="cx" style="display: block; padding: 0 10px"> max-width: 100%;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- height: auto;
</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"> html {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -609,11 +608,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> max-width: 100%;
</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">-#wp-custom-header iframe,
-#wp-custom-header video {
- margin-bottom: -8px;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> p > embed,
</span><span class="cx" style="display: block; padding: 0 10px"> p > iframe,
</span><span class="cx" style="display: block; padding: 0 10px"> p > object,
</span></span></pre>
</div>
</div>
</body>
</html>