<!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>[23713] trunk/wp-content/themes/twentytwelve/functions.php: Twenty Twelve: load our special Google Font in the visual editor to improve user experience.</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, #logmsg > ol { margin-left: 0; 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://core.trac.wordpress.org/changeset/23713">23713</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2013-03-15 17:09:12 +0000 (Fri, 15 Mar 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Twelve: load our special Google Font in the visual editor to improve user experience. Props to the Konstanthemes: kovshenin and obenland.
Closes <a href="http://core.trac.wordpress.org/ticket/22499">#22499</a>. See also r23672.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytwelvefunctionsphp">trunk/wp-content/themes/twentytwelve/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentytwelvefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/functions.php (23712 => 23713)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/functions.php 2013-03-15 17:08:04 UTC (rev 23712)
+++ trunk/wp-content/themes/twentytwelve/functions.php 2013-03-15 17:09:12 UTC (rev 23713)
</span><span class="lines">@@ -83,45 +83,25 @@
</span><span class="cx"> require( get_template_directory() . '/inc/custom-header.php' );
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Enqueues scripts and styles for front-end.
</del><ins>+ * Returns the Google font stylesheet URL if available.
</ins><span class="cx"> *
</span><del>- * @since Twenty Twelve 1.0
</del><ins>+ * The use of Open Sans by default is localized. For languages that use
+ * characters not supported by the font, the font can be disabled.
+ *
+ * @since Twenty Twelve 1.2
+ *
+ * @return string Font stylesheet or empty string if disabled.
</ins><span class="cx"> */
</span><del>-function twentytwelve_scripts_styles() {
- global $wp_styles;
</del><ins>+function twentytwelve_get_font_url() {
+ $font_url = '';
</ins><span class="cx">
</span><del>- /*
- * Adds JavaScript to pages with the comment form to support
- * sites with threaded comments (when in use).
- */
- if ( is_singular() && comments_open() && get_option( 'thread_comments' ) )
- wp_enqueue_script( 'comment-reply' );
-
- /*
- * Adds JavaScript for handling the navigation menu hide-and-show behavior.
- */
- wp_enqueue_script( 'twentytwelve-navigation', get_template_directory_uri() . '/js/navigation.js', array(), '1.0', true );
-
- /*
- * Loads our special font CSS file.
- *
- * The use of Open Sans by default is localized. For languages that use
- * characters not supported by the font, the font can be disabled.
- *
- * To disable in a child theme, use wp_dequeue_style()
- * function mytheme_dequeue_fonts() {
- * wp_dequeue_style( 'twentytwelve-fonts' );
- * }
- * add_action( 'wp_enqueue_scripts', 'mytheme_dequeue_fonts', 11 );
- */
-
</del><span class="cx"> /* translators: If there are characters in your language that are not supported
</span><del>- by Open Sans, translate this to 'off'. Do not translate into your own language. */
</del><ins>+ by Open Sans, translate this to 'off'. Do not translate into your own language. */
</ins><span class="cx"> if ( 'off' !== _x( 'on', 'Open Sans font: on or off', 'twentytwelve' ) ) {
</span><span class="cx"> $subsets = 'latin,latin-ext';
</span><span class="cx">
</span><span class="cx"> /* translators: To add an additional Open Sans character subset specific to your language, translate
</span><del>- this to 'greek', 'cyrillic' or 'vietnamese'. Do not translate into your own language. */
</del><ins>+ this to 'greek', 'cyrillic' or 'vietnamese'. Do not translate into your own language. */
</ins><span class="cx"> $subset = _x( 'no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)', 'twentytwelve' );
</span><span class="cx">
</span><span class="cx"> if ( 'cyrillic' == $subset )
</span><span class="lines">@@ -136,10 +116,37 @@
</span><span class="cx"> 'family' => 'Open+Sans:400italic,700italic,400,700',
</span><span class="cx"> 'subset' => $subsets,
</span><span class="cx"> );
</span><del>- wp_enqueue_style( 'twentytwelve-fonts', add_query_arg( $query_args, "$protocol://fonts.googleapis.com/css" ), array(), null );
</del><ins>+ $font_url = add_query_arg( $query_args, "$protocol://fonts.googleapis.com/css" );
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ return $font_url;
+}
+
+/**
+ * Enqueues scripts and styles for front-end.
+ *
+ * @since Twenty Twelve 1.0
+ */
+function twentytwelve_scripts_styles() {
+ global $wp_styles;
+
</ins><span class="cx"> /*
</span><ins>+ * Adds JavaScript to pages with the comment form to support
+ * sites with threaded comments (when in use).
+ */
+ if ( is_singular() && comments_open() && get_option( 'thread_comments' ) )
+ wp_enqueue_script( 'comment-reply' );
+
+ /*
+ * Adds JavaScript for handling the navigation menu hide-and-show behavior.
+ */
+ wp_enqueue_script( 'twentytwelve-navigation', get_template_directory_uri() . '/js/navigation.js', array(), '1.0', true );
+
+ $font_url = twentytwelve_get_font_url();
+ if ( ! empty( $font_url ) )
+ wp_enqueue_style( 'twentytwelve-fonts', esc_url_raw( $font_url ), array(), null );
+
+ /*
</ins><span class="cx"> * Loads our main stylesheet.
</span><span class="cx"> */
</span><span class="cx"> wp_enqueue_style( 'twentytwelve-style', get_stylesheet_uri() );
</span><span class="lines">@@ -153,6 +160,31 @@
</span><span class="cx"> add_action( 'wp_enqueue_scripts', 'twentytwelve_scripts_styles' );
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Adds additional stylesheets to the TinyMCE editor if needed.
+ *
+ * @uses twentytwelve_get_font_url() To get the Google Font stylesheet URL.
+ *
+ * @since Twenty Twelve 1.2
+ *
+ * @param string $mce_css CSS path to load in TinyMCE.
+ * @return string
+ */
+function twentytwelve_mce_css( $mce_css ) {
+ $font_url = twentytwelve_get_font_url();
+
+ if ( empty( $font_url ) )
+ return $mce_css;
+
+ if ( ! empty( $mce_css ) )
+ $mce_css .= ',';
+
+ $mce_css .= esc_url_raw( str_replace( ',', '%2C', $font_url ) );
+
+ return $mce_css;
+}
+add_filter( 'mce_css', 'twentytwelve_mce_css' );
+
+/**
</ins><span class="cx"> * Creates a nicely formatted and more specific title element text
</span><span class="cx"> * for output in head of document, based on current view.
</span><span class="cx"> *
</span></span></pre>
</div>
</div>
</body>
</html>