Changeset 11530

Timestamp:

06/07/2009 01:52:44 AM (15 years ago)

Author:

azaozz

Message:

Allow CodePress to be disabled from Screen Options, see #10027

Location:

trunk

Files:

• wp-admin/includes/misc.php (modified) (1 diff)
• wp-admin/includes/template.php (modified) (4 diffs)
• wp-admin/plugin-editor.php (modified) (1 diff)
• wp-admin/theme-editor.php (modified) (1 diff)
• wp-admin/wp-admin.css (modified) (1 diff)
• wp-includes/js/codepress/codepress.js (modified) (1 diff)

trunk/wp-admin/includes/misc.php

@@ -342 +342 @@
         jQuery('#newcontent_cp').val(newcontent.getCode()).removeAttr('disabled');
 });
+jQuery('#codepress-on').hide();
+jQuery('#codepress-off').show();
 /* ]]> */
 </script>
 <?php
+}
+
+/**
+ * Determine whether to use CodePress or not.
+ *
+ * @since 2.8
+**/
+function use_codepress() {
+
+    if ( isset($_GET['codepress']) ) {
+        $on = 'on' == $_GET['codepress'] ? 'on' : 'off';
+        set_user_setting( 'codepress', $on );
+    } else {
+        $on = get_user_setting('codepress', 'on');
+    }
+
+    if ( 'on' == $on ) {
+        add_action( 'admin_print_footer_scripts', 'codepress_footer_js' );
+        return true;
+    }
+
+    return false;
 }
 

trunk/wp-admin/includes/template.php

@@ -3432 +3432 @@
         $_wp_contextual_help = array();
 
-    $widgets_access = '';
+    $settings = '';
 
     switch ( $screen ) {
@@ -3472 +3472 @@
             }
             break;
+        case 'theme-editor':
+        case 'plugin-editor':
+            $settings = '<p><a id="codepress-on" href="' . $screen . '.php?codepress=on">' . __('Enable syntax highlighting') . '</a><a id="codepress-off" href="' . $screen . '.php?codepress=off">' . __('Disable syntax highlighting') . "</a></p>\n";
+            $show_screen = true;
+            break;
         case 'widgets':
             if ( !isset($_wp_contextual_help['widgets']) ) {
@@ -3477 +3482 @@
                 $_wp_contextual_help['widgets'] = $help;
             }
-            $widgets_access = '<p><a id="access-on" href="widgets.php?widgets-access=on">' . __('Enable accessibility mode') . '</a><a id="access-off" href="widgets.php?widgets-access=off">' . __('Disable accessibility mode') . "</a></p>\n";
+            $settings = '<p><a id="access-on" href="widgets.php?widgets-access=on">' . __('Enable accessibility mode') . '</a><a id="access-off" href="widgets.php?widgets-access=off">' . __('Disable accessibility mode') . "</a></p>\n";
             $show_screen = true;
             break;
@@ -3501 +3506 @@
 <?php echo screen_layout($screen); ?>
 <?php echo $screen_options; ?>
-<?php echo $widgets_access; ?>
+<?php echo $settings; ?>
 <div><?php wp_nonce_field( 'screen-options-nonce', 'screenoptionnonce', false ); ?></div>
 </form>

trunk/wp-admin/plugin-editor.php

@@ -84 +84 @@
     }
 
-    wp_enqueue_script( 'codepress' );
-    add_action( 'admin_print_footer_scripts', 'codepress_footer_js' );
+    if ( use_codepress() )
+        wp_enqueue_script( 'codepress' );
 
     // List of allowable extensions

trunk/wp-admin/theme-editor.php

@@ -78 +78 @@
         wp_die('<p>'.__('You do not have sufficient permissions to edit themes for this blog.').'</p>');
 
-    wp_enqueue_script( 'codepress' );
-    add_action( 'admin_print_footer_scripts', 'codepress_footer_js' );
+    if ( use_codepress() )
+        wp_enqueue_script( 'codepress' );
+
     require_once('admin-header.php');
 

trunk/wp-admin/wp-admin.css

@@ -2117 +2117 @@
 
 .wp-hidden-children .wp-hidden-child,
-.ui-tabs-hide {
+.ui-tabs-hide,
+#codepress-off {
     display: none;
 }

trunk/wp-includes/js/codepress/codepress.js

@@ -123 +123 @@
         return;
     CodePress.path = codepress_path;
-    t = document.getElementsByTagName('textarea');
-    for(var i=0,n=t.length;i<n;i++) {
+    var t = document.getElementsByTagName('textarea'), i, id;
+    for(i=0,n=t.length;i<n;i++) {
         if(t[i].className.match('codepress')) {
             id = t[i].id;