<!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>[687] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer: Code Reference: Improve linking related to source code display.</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">
<dt>Revision</dt> <dd><a href="http://meta.trac.wordpress.org/changeset/687">687</a></dd>
<dt>Author</dt> <dd>coffee2code</dd>
<dt>Date</dt> <dd>2014-06-06 21:51:08 +0000 (Fri, 06 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Code Reference: Improve linking related to source code display. See <a href="http://meta.trac.wordpress.org/ticket/176">#176</a>
* Remove 'View source code:' label and links
* Add 'View source' link that links downpage to Source section
* Remove ellipsis from link text
* Add ability to collapse expanded source code
* Move link to core.trac for function to be under source code display as 'View on Trac'
* Fix to display link to trac for hooks and classes</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdevelopercontentreferencephp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/content-reference.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdevelopercontentwpparserhookphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/content-wp-parser-hook.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperjsfunctionreferencejs">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/js/function-reference.js</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperscssmainscss">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/scss/main.scss</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperstylesheetsmaincss">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/stylesheets/main.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdevelopercontentreferencephp"></a>
<div class="modfile"><h4>Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/content-reference.php (686 => 687)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/content-reference.php 2014-06-06 21:48:33 UTC (rev 686)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/content-reference.php 2014-06-06 21:51:08 UTC (rev 687)
</span><span class="lines">@@ -30,13 +30,17 @@
</span><span class="cx"> <section class="source">
</span><span class="cx"> <p>
</span><span class="cx"> <strong><?php _e( 'Source file:', 'wporg' ); ?></strong>
</span><del>- <a href="<?php echo get_source_file_archive_link( $source_file ); ?>"><?php echo esc_html( $source_file ); ?></a><br />
- <strong><?php _e( 'View source code:', 'wporg' ); ?></strong>
- <?php if ( post_type_has_source_code() ) { ?>
- <a href="#source-code"><?php _e( 'below', 'wporg' ); ?></a> or
- <?php } ?>
- <a href="<?php echo get_source_file_link(); ?>"><?php _e( 'on the WP Trac code browser…', 'wporg' ); ?></a>
</del><ins>+ <a href="<?php echo get_source_file_archive_link( $source_file ); ?>"><?php echo esc_html( $source_file ); ?></a>
</ins><span class="cx"> </p>
</span><ins>+ <?php if ( post_type_has_source_code() ) { ?>
+ <p>
+ <a href="#source-code"><?php _e( 'View source', 'wporg' ); ?></a>
+ </p>
+ <?php } else { ?>
+ <p>
+ <a href="<?php echo get_source_file_link(); ?>"><?php _e( 'View on Trac', 'wporg' ); ?></a>
+ </p>
+ <?php } ?>
</ins><span class="cx"> </section>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="lines">@@ -130,7 +134,13 @@
</span><span class="cx"> <div class="source-code-container">
</span><span class="cx"> <pre class="brush: php; toolbar: false;"><?php echo esc_html( get_source_code() ); ?></pre>
</span><span class="cx"> </div>
</span><del>- <p><a href="#" class="show-complete-source"><?php _e( 'View full source code…', 'wporg' ); ?></a></p>
</del><ins>+ <p class="source-code-links">
+ <span>
+ <a href="#" class="show-complete-source"><?php _e( 'Expand full source code', 'wporg' ); ?></a>
+ <a href="#" class="less-complete-source"><?php _e( 'Collapse full source code', 'wporg' ); ?></a>
+ </span>
+ <span><a href="<?php echo get_source_file_link(); ?>"><?php _e( 'View on Trac', 'wporg' ); ?></a></span>
+ </p>
</ins><span class="cx"> </section>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdevelopercontentwpparserhookphp"></a>
<div class="modfile"><h4>Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/content-wp-parser-hook.php (686 => 687)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/content-wp-parser-hook.php 2014-06-06 21:48:33 UTC (rev 686)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/content-wp-parser-hook.php 2014-06-06 21:51:08 UTC (rev 687)
</span><span class="lines">@@ -28,10 +28,11 @@
</span><span class="cx"> <section class="source">
</span><span class="cx"> <p>
</span><span class="cx"> <strong><?php _e( 'Source file:', 'wporg' ); ?></strong>
</span><del>- <a href="<?php echo get_source_file_archive_link( $source_file ); ?>"><?php echo esc_html( $source_file ); ?></a><br />
- <strong><?php _e( 'View source code:', 'wporg' ); ?></strong>
- <a href="<?php echo get_source_file_link(); ?>"><?php _e( 'on the WP Trac code browser…', 'wporg' ); ?></a>
</del><ins>+ <a href="<?php echo get_source_file_archive_link( $source_file ); ?>"><?php echo esc_html( $source_file ); ?></a>
</ins><span class="cx"> </p>
</span><ins>+ <p>
+ <a href="<?php echo get_source_file_link(); ?>"><?php _e( 'View on Trac', 'wporg' ); ?></a>
+ </p>
</ins><span class="cx"> </section>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperjsfunctionreferencejs"></a>
<div class="modfile"><h4>Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/js/function-reference.js (686 => 687)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/js/function-reference.js 2014-06-06 21:48:33 UTC (rev 686)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/js/function-reference.js 2014-06-06 21:51:08 UTC (rev 687)
</span><span class="lines">@@ -4,16 +4,21 @@
</span><span class="cx"> * Handles all interactivity on the single function page
</span><span class="cx"> */
</span><span class="cx"> ( function( $ ) {
</span><del>- var $sourceContent, $sourceCodeContainer, $sourceCodeTable, $showCompleteSource;
</del><ins>+ var $sourceContent, $sourceCodeContainer, $sourceCodeTable, $showCompleteSource, $lessCompleteSource, $sourceCollapsedHeight;
</ins><span class="cx">
</span><del>- function showCompleteSource( e ) {
</del><ins>+ function toggleCompleteSource( e ) {
</ins><span class="cx"> e.preventDefault();
</span><span class="cx">
</span><del>- var heightGoal = $sourceCodeTable.height() + 47; // takes into consideration potential x-scrollbar
</del><ins>+ if ( $showCompleteSource.is(':visible') ) {
+ var heightGoal = $sourceCodeTable.height() + 37; // takes into consideration potential x-scrollbar
+ } else {
+ var heightGoal = $sourceCollapsedHeight;
+ }
</ins><span class="cx">
</span><span class="cx"> $sourceCodeContainer.animate( { height: heightGoal + 'px' } );
</span><span class="cx">
</span><del>- $showCompleteSource.hide();
</del><ins>+ $showCompleteSource.toggle();
+ $lessCompleteSource.toggle();
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -27,17 +32,22 @@
</span><span class="cx">
</span><span class="cx"> $sourceCodeTable = $sourceContent.find( 'table' );
</span><span class="cx">
</span><del>- if ( 188 < $sourceCodeTable.height() ) {
</del><ins>+ // 1em (margin) + 20 * 17px. Lines are 1.1em which rounds to 17px: calc( 1em + 17px * 20 ).
+ // Extra 10px added to partially show next line so it's clear there is more.
+ $sourceCollapsedHeight = 196;
</ins><span class="cx">
</span><ins>+ if ( ( $sourceCollapsedHeight - 12 ) < $sourceCodeTable.height() ) {
+
</ins><span class="cx"> // Do this with javascript so javascript-less can enjoy the total sourcecode
</span><del>- // 1em (margin) + 20 * 17px. Lines are 1.1em which rounds to 17px: calc( 1em + 17px * 20 ).
- // Extra 10px added to partially show next line so it's clear there is more.
- $( '.source-code-container' ).css( { height: '196px' } );
</del><ins>+ $( '.source-code-container' ).css( { height: $sourceCollapsedHeight + 'px' } );
</ins><span class="cx">
</span><span class="cx"> $showCompleteSource = $( '.show-complete-source' );
</span><ins>+ $lessCompleteSource = $( '.less-complete-source' );
</ins><span class="cx">
</span><ins>+ $( '.source-code-links span:first' ).show();
</ins><span class="cx"> $showCompleteSource.show();
</span><del>- $showCompleteSource.on( 'click', showCompleteSource );
</del><ins>+ $showCompleteSource.on( 'click', toggleCompleteSource );
+ $lessCompleteSource.on( 'click', toggleCompleteSource );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperscssmainscss"></a>
<div class="modfile"><h4>Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/scss/main.scss (686 => 687)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/scss/main.scss 2014-06-06 21:48:33 UTC (rev 686)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/scss/main.scss 2014-06-06 21:51:08 UTC (rev 687)
</span><span class="lines">@@ -855,13 +855,35 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ .single {
+ .wp-parser-class, .wp-parser-function, .wp-parser-hook, .wp-parser-method {
+ border-bottom-style: none;
+ }
+ }
+
+ .source-content {
+ overflow: auto;
+ }
+
+ .source-code-links {
+ margin-left: 2em;
+ margin-top: 1em;
+ }
+
+ .source-code-links span:first-child {
+ display: none;
+ border-right: 1px solid #999;
+ margin-right: 1em;
+ padding-right: 1em;
+ }
+
</ins><span class="cx"> .source-code-container {
</span><span class="cx"> border-right: 1px solid #dfdfdf;
</span><span class="cx"> overflow-x: auto;
</span><span class="cx"> overflow-y: hidden;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- .show-complete-source {
</del><ins>+ .show-complete-source, .less-complete-source {
</ins><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperstylesheetsmaincss"></a>
<div class="modfile"><h4>Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/stylesheets/main.css (686 => 687)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/stylesheets/main.css 2014-06-06 21:48:33 UTC (rev 686)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/stylesheets/main.css 2014-06-06 21:51:08 UTC (rev 687)
</span><span class="lines">@@ -1067,12 +1067,28 @@
</span><span class="cx"> border-radius: 5px;
</span><span class="cx"> padding: 20px;
</span><span class="cx"> }
</span><ins>+.devhub-wrap .single .wp-parser-class, .devhub-wrap .single .wp-parser-function, .devhub-wrap .single .wp-parser-hook, .devhub-wrap .single .wp-parser-method {
+ border-bottom-style: none;
+}
+.devhub-wrap .source-content {
+ overflow: auto;
+}
+.devhub-wrap .source-code-links {
+ margin-left: 2em;
+ margin-top: 1em;
+}
+.devhub-wrap .source-code-links span:first-child {
+ display: none;
+ border-right: 1px solid #999;
+ margin-right: 1em;
+ padding-right: 1em;
+}
</ins><span class="cx"> .devhub-wrap .source-code-container {
</span><span class="cx"> border-right: 1px solid #dfdfdf;
</span><span class="cx"> overflow-x: auto;
</span><span class="cx"> overflow-y: hidden;
</span><span class="cx"> }
</span><del>-.devhub-wrap .show-complete-source {
</del><ins>+.devhub-wrap .show-complete-source, .devhub-wrap .less-complete-source {
</ins><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx"> .devhub-wrap .loop-pagination {
</span></span></pre>
</div>
</div>
</body>
</html>