<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[13441] trunk: Introduce add_editor_style()
to easily register a stylesheet for the visual editor.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13441">13441</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-02-26 20:12:06 +0000 (Fri, 26 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce add_editor_style() to easily register a stylesheet for the visual editor. see <a href="http://trac.wordpress.org/ticket/11512">#11512</a> see <a href="http://trac.wordpress.org/ticket/9015">#9015</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytenfunctionsphp">trunk/wp-content/themes/twentyten/functions.php</a></li>
<li><a href="#trunkwpincludesthemephp">trunk/wp-includes/theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentytenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/functions.php (13440 => 13441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/functions.php        2010-02-26 19:59:04 UTC (rev 13440)
+++ trunk/wp-content/themes/twentyten/functions.php        2010-02-26 20:12:06 UTC (rev 13441)
</span><span class="lines">@@ -28,6 +28,9 @@
</span><span class="cx">
</span><span class="cx">         add_custom_background();
</span><span class="cx">
</span><ins>+        // This theme styles the visual editor with editor-style.css to match the theme style.
+        add_editor_style();
+
</ins><span class="cx">         // This theme needs post thumbnails
</span><span class="cx">         add_theme_support( 'post-thumbnails' );
</span><span class="cx">
</span><span class="lines">@@ -134,20 +137,6 @@
</span><span class="cx"> }
</span><span class="cx"> endif;
</span><span class="cx">
</span><del>-// Make the Visual Editor styles match the theme's styles
-if ( ! function_exists( 'twentyten_editor_style' ) ) :
-function twentyten_editor_style( $url ) {
-        if ( ! empty( $url ) )
-                $url .= ',';
-
-        // Change the path here if using sub-directory
-        $url .= trailingslashit( get_stylesheet_directory_uri() ) . 'editor-style.css';
-
-        return $url;
-}
-endif;
-add_filter( 'mce_css', 'twentyten_editor_style' );
-
</del><span class="cx"> // Remove inline styles on gallery shortcode
</span><span class="cx"> if ( ! function_exists( 'twentyten_remove_gallery_css' ) ) :
</span><span class="cx"> function twentyten_remove_gallery_css() {
</span></span></pre></div>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (13440 => 13441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php        2010-02-26 19:59:04 UTC (rev 13440)
+++ trunk/wp-includes/theme.php        2010-02-26 20:12:06 UTC (rev 13441)
</span><span class="lines">@@ -1447,6 +1447,43 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Add callback for a custom TinyMCE editor stylesheet.
+ *
+ * The parameter $stylesheet is the name of the stylesheet, relative to
+ * the theme root. It is optional and defaults to 'editor-style.css'.
+ *
+ * @since 3.0.0
+ *
+ * @param callback $stylesheet Name of stylesheet relative to theme root.
+ */
+function add_editor_style( $stylesheet = 'editor-style.css' ) {
+        if ( isset( $GLOBALS['editor_style'] ) )
+                return;
+
+        add_theme_support( 'editor-style' );
+
+        if ( ! is_admin() )
+                return;
+
+        $GLOBALS['editor_style'] = $stylesheet;
+        add_filter( 'mce_css', '_editor_style_cb' );
+}
+
+/**
+ * Callback for custom editor stylesheet.
+ *
+ * @since 3.0.0
+ * @see add_editor_style()
+ * @access protected
+ */
+function _editor_style_cb( $url ) {
+        global $editor_style;
+        if ( ! empty( $url ) )
+                $url .= ',';
+        return $url . get_stylesheet_directory_uri() . "/$editor_style";
+}
+
+/**
</ins><span class="cx"> * Allows a theme to register its support of a certain feature
</span><span class="cx"> *
</span><span class="cx"> * Must be called in the themes functions.php file to work.
</span></span></pre>
</div>
</div>
</body>
</html>