Changeset 21070

Timestamp:

06/12/2012 07:27:41 PM (14 years ago)

Author:

ryan

Message:

Pinking shears

Location:

trunk

Files:

• wp-admin/custom-background.php (modified) (1 diff)
• wp-includes/class-wp-customize-manager.php (modified) (2 diffs)
• wp-includes/js/quicktags.dev.js (modified) (5 diffs)

trunk/wp-admin/custom-background.php

@@ -239 +239 @@
 <?php endif; ?>
 
-<?php $default_image = get_theme_support( 'custom-background', 'default-image' ); ?> 
+<?php $default_image = get_theme_support( 'custom-background', 'default-image' ); ?>
 <?php if ( $default_image && get_background_image() != $default_image ) : ?>
 <tr valign="top">

trunk/wp-includes/class-wp-customize-manager.php

@@ -161 +161 @@
             add_filter( 'stylesheet', array( $this, 'get_stylesheet' ) );
             add_filter( 'pre_option_current_theme', array( $this, 'current_theme' ) );
-    
+
             // @link: http://core.trac.wordpress.org/ticket/20027
             add_filter( 'pre_option_stylesheet', array( $this, 'get_stylesheet' ) );
             add_filter( 'pre_option_template', array( $this, 'get_template' ) );
-    
+
             // Handle custom theme roots.
             add_filter( 'pre_option_stylesheet_root', array( $this, 'get_stylesheet_root' ) );
@@ -191 +191 @@
             remove_filter( 'stylesheet', array( $this, 'get_stylesheet' ) );
             remove_filter( 'pre_option_current_theme', array( $this, 'current_theme' ) );
-    
+
             // @link: http://core.trac.wordpress.org/ticket/20027
             remove_filter( 'pre_option_stylesheet', array( $this, 'get_stylesheet' ) );
             remove_filter( 'pre_option_template', array( $this, 'get_template' ) );
-    
+
             // Handle custom theme roots.
             remove_filter( 'pre_option_stylesheet_root', array( $this, 'get_stylesheet_root' ) );

trunk/wp-includes/js/quicktags.dev.js

@@ -1 +1 @@
 /*
  * Quicktags
- * 
+ *
  * This is the HTML editor in WordPress. It can be attached to any textarea and will
  * append a toolbar above it. This script is self-contained (does not require external libraries).
@@ -52 +52 @@
 /**
  * Inserts content at the caret in the active editor (textarea)
- * 
+ *
  * Added for back compatibility
  * @see QTags.insertContent()
@@ -62 +62 @@
 /**
  * Adds a button to all instances of the editor
- * 
+ *
  * Added for back compatibility, use QTags.addButton() as it gives more flexibility like type of button, button placement, etc.
  * @see QTags.addButton()
  */
 function edButton(id, display, tagStart, tagEnd, access, open) {
-    return QTags.addButton( id, display, tagStart, tagEnd, access, '', -1 );    
+    return QTags.addButton( id, display, tagStart, tagEnd, access, '', -1 );
 }
 
@@ -279 +279 @@
     /**
      * Main API function for adding a button to Quicktags
-     * 
+     *
      * Adds qt.Button or qt.TagButton depending on the args. The first three args are always required.
      * To be able to add button(s) to Quicktags, your script should be enqueued as dependent
@@ -298 +298 @@
      * @param arg2 string optional Ending tag like "</span>"
      * @param access_key string optional Access key for the button.
-     * @param title string optional Button's title="..." 
+     * @param title string optional Button's title="..."
      * @param priority int optional Number representing the desired position of the button in the toolbar. 1 - 9 = first, 11 - 19 = second, 21 - 29 = third, etc.
      * @param instance string optional Limit the button to a specifric instance of Quicktags, add to all instances if not present.
      * @return mixed null or the button object that is needed for back-compat.
-     */             
+     */
     qt.addButton = function( id, display, arg1, arg2, access_key, title, priority, instance ) {
         var btn;
-        
+
         if ( !id || !display )
             return;