WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow absolute URLs in editor styles. 

Props nacin, obenland
fixes #24787


git-svn-id: http://core.svn.wordpress.org/trunk@24735 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Ryan Boren 2013-07-18 18:11:43 +00:00
parent e9afe4c5d1
commit 44fca1dc57
3 changed files with 43 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
wp-content/themes/twentythirteen/functions.php
View File

@ -72,12 +72,13 @@ function twentythirteen_setup() {
* This theme styles the visual editor to resemble the theme style, * This theme styles the visual editor to resemble the theme style,
* specifically font, colors, icons, and column width. * specifically font, colors, icons, and column width.
*/ */
add_editor_style( array( 'css/editor-style.css', 'fonts/genericons.css' ) ); add_editor_style( array( 'css/editor-style.css', 'fonts/genericons.css', twentythirteen_fonts_url() ) );
// Adds RSS feed links to <head> for posts and comments. // Adds RSS feed links to <head> for posts and comments.
add_theme_support( 'automatic-feed-links' ); add_theme_support( 'automatic-feed-links' );
// Switches default core markup for search form to output valid HTML5. // Switches default core markup for search form, comment form, and comments
// to output valid HTML5.
add_theme_support( 'html5', array( 'search-form', 'comment-form', 'comment-list' ) ); add_theme_support( 'html5', array( 'search-form', 'comment-form', 'comment-list' ) );
/* /*
@ -132,72 +133,21 @@ function twentythirteen_fonts_url() {
$font_families = array(); $font_families = array();
if ( 'off' !== $source_sans_pro ) if ( 'off' !== $source_sans_pro )
$font_families[] = 'Source+Sans+Pro:300,400,700,300italic,400italic,700italic'; $font_families[] = 'Source Sans Pro:300,400,700,300italic,400italic,700italic';
if ( 'off' !== $bitter ) if ( 'off' !== $bitter )
$font_families[] = 'Bitter:400,700'; $font_families[] = 'Bitter:400,700';
$protocol = is_ssl() ? 'https' : 'http';
$query_args = array( $query_args = array(
'family' => implode( '|', $font_families ), 'family' => urlencode( implode( '|', $font_families ) ),
'subset' => 'latin,latin-ext', 'subset' => urlencode( 'latin,latin-ext' ),
); );
$fonts_url = add_query_arg( $query_args, "$protocol://fonts.googleapis.com/css" ); $fonts_url = add_query_arg( $query_args, "//fonts.googleapis.com/css" );
} }
return $fonts_url; return $fonts_url;
} }
/**
* Loads our special font CSS file.
*
* To disable in a child theme, use wp_dequeue_style()
* function mytheme_dequeue_fonts() {
* wp_dequeue_style( 'twentythirteen-fonts' );
* }
* add_action( 'wp_enqueue_scripts', 'mytheme_dequeue_fonts', 11 );
*
* Also used in the Appearance > Header admin panel:
* @see twentythirteen_custom_header_setup()
*
* @since Twenty Thirteen 1.0
*
* @return void
*/
function twentythirteen_fonts() {
$fonts_url = twentythirteen_fonts_url();
if ( ! empty( $fonts_url ) )
wp_enqueue_style( 'twentythirteen-fonts', esc_url_raw( $fonts_url ), array(), null );
wp_enqueue_style( 'genericons', get_template_directory_uri() . '/fonts/genericons.css', array(), '2.09' );
}
add_action( 'wp_enqueue_scripts', 'twentythirteen_fonts' );
/**
* Adds additional stylesheets to the TinyMCE editor if needed.
*
* @uses twentythirteen_fonts_url() to get the Google Font stylesheet URL.
*
* @since Twenty Thirteen 1.0
*
* @param string $mce_css CSS path to load in TinyMCE.
* @return string The filtered CSS paths list.
*/
function twentythirteen_mce_css( $mce_css ) {
$fonts_url = twentythirteen_fonts_url();
if ( empty( $fonts_url ) )
return $mce_css;
if ( ! empty( $mce_css ) )
$mce_css .= ',';
$mce_css .= esc_url_raw( str_replace( ',', '%2C', $fonts_url ) );
return $mce_css;
}
add_filter( 'mce_css', 'twentythirteen_mce_css' );
/** /**
* Enqueues scripts and styles for front end. * Enqueues scripts and styles for front end.
* *
@ -208,10 +158,8 @@ add_filter( 'mce_css', 'twentythirteen_mce_css' );
function twentythirteen_scripts_styles() { function twentythirteen_scripts_styles() {
global $wp_styles; global $wp_styles;
/* // Adds JavaScript to pages with the comment form to support sites with
* Adds JavaScript to pages with the comment form to support sites with // threaded comments (when in use).
* threaded comments (when in use).
*/
if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) if ( is_singular() && comments_open() && get_option( 'thread_comments' ) )
wp_enqueue_script( 'comment-reply' ); wp_enqueue_script( 'comment-reply' );
@ -222,8 +170,14 @@ function twentythirteen_scripts_styles() {
// Loads JavaScript file with functionality specific to Twenty Thirteen. // Loads JavaScript file with functionality specific to Twenty Thirteen.
wp_enqueue_script( 'twentythirteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20130625a', true ); wp_enqueue_script( 'twentythirteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20130625a', true );
// Add Open Sans and Bitter fonts, used in the main stylesheet.
wp_enqueue_style( 'twentythirteen-fonts', twentythirteen_fonts_url(), array(), null );
// Add Genericons font, used in the main stylesheet.
wp_enqueue_style( 'genericons', get_template_directory_uri() . '/fonts/genericons.css', array(), '2.09' );
// Loads our main stylesheet. // Loads our main stylesheet.
wp_enqueue_style( 'twentythirteen-style', get_stylesheet_uri() ); wp_enqueue_style( 'twentythirteen-style', get_stylesheet_uri(), array( 'genericons' ), '1.0' );
// Loads the Internet Explorer specific stylesheet. // Loads the Internet Explorer specific stylesheet.
wp_enqueue_style( 'twentythirteen-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentythirteen-style' ), '20130213' ); wp_enqueue_style( 'twentythirteen-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentythirteen-style' ), '20130213' );

16
wp-content/themes/twentythirteen/inc/custom-header.php
View File

@ -58,11 +58,23 @@ function twentythirteen_custom_header_setup() {
'description' => _x( 'Star', 'header image description', 'twentythirteen' ) 'description' => _x( 'Star', 'header image description', 'twentythirteen' )
), ),
) ); ) );
add_action( 'admin_print_styles-appearance_page_custom-header', 'twentythirteen_fonts' );
} }
add_action( 'after_setup_theme', 'twentythirteen_custom_header_setup' ); add_action( 'after_setup_theme', 'twentythirteen_custom_header_setup' );
/**
* Loads our special font CSS files.
*
* @since Twenty Thirteen 1.0
*/
function twentythirteen_custom_header_fonts() {
// Add Open Sans and Bitter fonts.
wp_enqueue_style( 'twentythirteen-fonts', twentythirteen_fonts_url(), array(), null );
// Add Genericons font.
wp_enqueue_style( 'genericons', get_template_directory_uri() . '/fonts/genericons.css', array(), '2.09' );
}
add_action( 'admin_print_styles-appearance_page_custom-header', 'twentythirteen_custom_header_fonts' );
/** /**
* Styles the header text displayed on the blog. * Styles the header text displayed on the blog.
* *

16
wp-includes/class-wp-editor.php
View File

@ -152,7 +152,6 @@ final class _WP_Editors {
} }
public static function editor_settings($editor_id, $set) { public static function editor_settings($editor_id, $set) {
global $editor_styles;
$first_run = false; $first_run = false;
if ( empty(self::$first_init) ) { if ( empty(self::$first_init) ) {
@ -353,12 +352,23 @@ final class _WP_Editors {
); );
// load editor_style.css if the current theme supports it // load editor_style.css if the current theme supports it
if ( ! empty( $editor_styles ) && is_array( $editor_styles ) ) { if ( ! empty( $GLOBALS['editor_styles'] ) && is_array( $GLOBALS['editor_styles'] ) ) {
$editor_styles = $GLOBALS['editor_styles'];
$mce_css = array(); $mce_css = array();
$editor_styles = array_unique($editor_styles); $editor_styles = array_unique( array_filter( $editor_styles ) );
$style_uri = get_stylesheet_directory_uri(); $style_uri = get_stylesheet_directory_uri();
$style_dir = get_stylesheet_directory(); $style_dir = get_stylesheet_directory();
// Support externally referenced styles (like, say, fonts).
foreach ( $editor_styles as $key => $file ) {
if ( preg_match( '~^(https?:)?//~', $file ) ) {
$mce_css[] = esc_url_raw( $file );
unset( $editor_styles[ $key ] );
}
}
// Look in a parent theme first, that way child theme CSS overrides.
if ( is_child_theme() ) { if ( is_child_theme() ) {
$template_uri = get_template_directory_uri(); $template_uri = get_template_directory_uri();
$template_dir = get_template_directory(); $template_dir = get_template_directory();