Changeset 14718

Timestamp:

05/18/2010 03:48:22 AM (14 years ago)

Author:

nacin

Message:

Remove autocomplete and codepress. for autocomplete, see #13283. for codepress, see #13307.

Location:

trunk

Files:

• wp-admin/css/wp-admin.dev.css (modified) (1 diff)
• wp-admin/includes/deprecated.php (modified) (1 diff)
• wp-admin/includes/misc.php (modified) (1 diff)
• wp-admin/plugin-editor.php (modified) (2 diffs)
• wp-admin/theme-editor.php (modified) (2 diffs)
• wp-includes/js/jquery/autocomplete.dev.js (deleted)
• wp-includes/js/jquery/autocomplete.js (deleted)
• wp-includes/script-loader.php (modified) (2 diffs)

trunk/wp-admin/css/wp-admin.dev.css

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

trunk/wp-admin/includes/deprecated.php

@@ -163 +163 @@
 }
 
+/**
+ * Determines the language to use for CodePress syntax highlighting.
+ *
+ * @since 2.8.0
+ * @deprecated 3.0.0
+ *
+ * @param string $filename
+**/
+function codepress_get_lang( $filename ) {
+    _deprecated_function( __FUNCTION__, '3.0' );
+    return;
+}
+
+/**
+ * Adds Javascript required to make CodePress work on the theme/plugin editors.
+ *
+ * @since 2.8.0
+ * @deprecated 3.0.0
+**/
+function codepress_footer_js() {
+    _deprecated_function( __FUNCTION__, '3.0' );
+    return;
+}
+
+/**
+ * Determine whether to use CodePress.
+ *
+ * @since 2.8
+ * @deprecated 3.0.0
+**/
+function use_codepress() {
+    _deprecated_function( __FUNCTION__, '3.0' );
+    return;
+}
+
 ?>

trunk/wp-admin/includes/misc.php

@@ -314 +314 @@
 
 /**
- * Determines the language to use for CodePress syntax highlighting,
- * based only on a filename.
- *
- * @since 2.8
- *
- * @param string $filename The name of the file to be highlighting
-**/
-function codepress_get_lang( $filename ) {
-    $codepress_supported_langs = apply_filters( 'codepress_supported_langs',
-                                    array( '.css' => 'css',
-                                            '.js' => 'javascript',
-                                            '.php' => 'php',
-                                            '.html' => 'html',
-                                            '.htm' => 'html',
-                                            '.txt' => 'text'
-                                            ) );
-    $extension = substr( $filename, strrpos( $filename, '.' ) );
-    if ( $extension && array_key_exists( $extension, $codepress_supported_langs ) )
-        return $codepress_supported_langs[$extension];
-
-    return 'generic';
-}
-
-/**
- * Adds Javascript required to make CodePress work on the theme/plugin editors.
- *
- * This code is attached to the action admin_print_footer_scripts.
- *
- * @since 2.8
-**/
-function codepress_footer_js() {
-    // Script-loader breaks CP's automatic path-detection, thus CodePress.path
-    // CP edits in an iframe, so we need to grab content back into normal form
-    ?><script type="text/javascript">
-/* <![CDATA[ */
-var codepress_path = '<?php echo includes_url('js/codepress/'); ?>';
-jQuery('#template').submit(function(){
-    if (jQuery('#newcontent_cp').length)
-        jQuery('#newcontent_cp').val(newcontent.getCode()).removeAttr('disabled');
-});
-jQuery('#codepress-on').hide();
-jQuery('#codepress-off').show();
-/* ]]> */
-</script>
-<?php
-}
-
-/**
- * Determine whether to use CodePress.
- *
- * @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;
-}
-
-/**
  * Saves option for number of rows when listing posts, pages, comments, etc.
  *

trunk/wp-admin/plugin-editor.php

@@ -128 +128 @@
 
     $content = htmlspecialchars( $content );
-    $codepress_lang = codepress_get_lang($real_file);
-
     ?>
 <?php if (isset($_GET['a'])) : ?>
@@ -207 +205 @@
 <form name="template" id="template" action="plugin-editor.php" method="post">
     <?php wp_nonce_field('edit-plugin_' . $file) ?>
-        <div><textarea cols="70" rows="25" name="newcontent" id="newcontent" tabindex="1" class="codepress <?php echo $codepress_lang ?>"><?php echo $content ?></textarea>
+        <div><textarea cols="70" rows="25" name="newcontent" id="newcontent" tabindex="1"><?php echo $content ?></textarea>
         <input type="hidden" name="action" value="update" />
         <input type="hidden" name="file" value="<?php echo esc_attr($file) ?>" />

trunk/wp-admin/theme-editor.php

@@ -103 +103 @@
 
         $content = htmlspecialchars( $content );
-        $codepress_lang = codepress_get_lang($file);
     }
 
@@ -196 +195 @@
     <form name="template" id="template" action="theme-editor.php" method="post">
     <?php wp_nonce_field('edit-theme_' . $file . $theme) ?>
-         <div><textarea cols="70" rows="25" name="newcontent" id="newcontent" tabindex="1" class="codepress <?php echo $codepress_lang ?>"><?php echo $content ?></textarea>
+         <div><textarea cols="70" rows="25" name="newcontent" id="newcontent" tabindex="1"><?php echo $content ?></textarea>
          <input type="hidden" name="action" value="update" />
          <input type="hidden" name="file" value="<?php echo esc_attr($file) ?>" />

trunk/wp-includes/script-loader.php

@@ -164 +164 @@
     $scripts->add( 'jquery-table-hotkeys', "/wp-includes/js/jquery/jquery.table-hotkeys$suffix.js", array('jquery', 'jquery-hotkeys'), '20090102' );
     $scripts->add_data( 'jquery-table-hotkeys', 'group', 1 );
-
-    $scripts->add( 'jquery-autocomplete', "/wp-includes/js/jquery/autocomplete$suffix.js", array('jquery'), '1.1' );
-    $scripts->add_data( 'jquery-autocomplete', 'group', 1 );
 
     $scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20100407');
@@ -378 +375 @@
         $scripts->add_data( 'media', 'group', 1 );
 
-        $scripts->add( 'codepress', '/wp-includes/js/codepress/codepress.js', false, '0.9.6' );
-        $scripts->add_data( 'codepress', 'group', 1 );
-
         $scripts->add( 'image-edit', "/wp-admin/js/image-edit$suffix.js", array('jquery', 'json2', 'imgareaselect'), '20091111' );
         $scripts->add_data( 'image-edit', 'group', 1 );