Changeset 21639 for trunk/wp-content/themes/twentytwelve/functions.php

Timestamp:

08/28/2012 02:18:43 AM (12 years ago)

Author:

lancewillett

Message:

Twenty Twelve: simplify custom font loading behavior, see #21694.

• Remove theme options code and support from theme.
• Keep Open Sans font first in the stack and make it always loaded.
• Move Customizer pieces from Theme Options out of class structure and into functions.php.

File:

• trunk/wp-content/themes/twentytwelve/functions.php (modified) (5 diffs)

trunk/wp-content/themes/twentytwelve/functions.php

@@ -43 +43 @@
  */
 function twentytwelve_setup() {
-    global $twentytwelve_options;
-
     /*
      * Makes Twenty Twelve available for translation.
@@ -54 +52 @@
     load_theme_textdomain( 'twentytwelve', get_template_directory() . '/languages' );
 
-    // Load up our theme options page and related code.
-    require( get_template_directory() . '/inc/theme-options.php' );
-    $twentytwelve_options = new Twenty_Twelve_Options();
-
     // This theme styles the visual editor with editor-style.css to match the theme style.
     add_editor_style();
@@ -95 +89 @@
  */
 function twentytwelve_scripts_styles() {
-    global $twentytwelve_options;
-
     /*
      * Adds JavaScript to pages with the comment form to support
@@ -111 +103 @@
     /*
      * Loads our special font CSS file.
-     * Depends on Theme Options setting.
      */
-    $options = $twentytwelve_options->get_theme_options();
-    if ( $options['enable_fonts'] )
-        wp_enqueue_style( 'twentytwelve-fonts', $twentytwelve_options->custom_fonts_url(), array(), null );
+    $protocol = is_ssl() ? 'https' : 'http';
+    wp_enqueue_style( 'twentytwelve-fonts', "$protocol://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700", array(), null );
 
     /*
@@ -401 +391 @@
 }
 add_action( 'template_redirect', 'twentytwelve_content_width' );
+
+/**
+ * Add postMessage support for site title and description for the Theme Customizer.
+ *
+ * @since Twenty Twelve 1.0
+ *
+ * @param WP_Customize_Manager $wp_customize Theme Customizer object.
+ * @return void
+ */
+function twentytwelve_customize_register( $wp_customize ) {
+    $wp_customize->get_setting( 'blogname' )->transport = 'postMessage';
+    $wp_customize->get_setting( 'blogdescription' )->transport = 'postMessage';
+}
+add_action( 'customize_register', 'twentytwelve_customize_register' );
+
+/**
+ * Binds JS handlers to make Theme Customizer preview reload changes asynchronously.
+ *
+ * @since Twenty Twelve 1.0
+ */
+function twentytwelve_customize_preview_js() {
+    wp_enqueue_script( 'twentytwelve-customizer', get_template_directory_uri() . '/js/theme-customizer.js', array( 'customize-preview' ), '20120827', true );
+}
+add_action( 'customize_preview_init', 'twentytwelve_customize_preview_js' );