Changeset 24052

Timestamp:

04/22/2013 08:17:25 PM (12 years ago)

Author:

nacin

Message:

Remove ancient 'lookup' quicktag from the text editor. This had called up answers.com.

props mboynes, jonbishop, SergeyBiryukov.
fixes #23322.

Location:

trunk

Files:

• wp-admin/edit-form-comment.php (modified) (1 diff)
• wp-admin/includes/media.php (modified) (1 diff)
• wp-admin/includes/template.php (modified) (1 diff)
• wp-includes/class-wp-editor.php (modified) (1 diff)
• wp-includes/js/quicktags.js (modified) (4 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/edit-form-comment.php

@@ -64 +64 @@
 <div id="postdiv" class="postarea">
 <?php
-    $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,spell,close' );
+    $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );
     wp_editor( $comment->comment_content, 'content', array( 'media_buttons' => false, 'tinymce' => false, 'quicktags' => $quicktags_settings ) );
     wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>

trunk/wp-admin/includes/media.php

@@ -2396 +2396 @@
 
     <?php
-        $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,spell,close' );
+        $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );
         $editor_args = array(
             'textarea_name' => 'content',

trunk/wp-admin/includes/template.php

@@ -346 +346 @@
     <div id="replycontainer">
     <?php
-    $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,spell,close' );
+    $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );
     wp_editor( '', 'replycontent', array( 'media_buttons' => false, 'tinymce' => false, 'quicktags' => $quicktags_settings ) );
     ?>

trunk/wp-includes/class-wp-editor.php

@@ -177 +177 @@
 
             if ( empty($qtInit['buttons']) )
-                $qtInit['buttons'] = 'strong,em,link,block,del,ins,img,ul,ol,li,code,more,spell,close';
+                $qtInit['buttons'] = 'strong,em,link,block,del,ins,img,ul,ol,li,code,more,close';
 
             if ( $set['dfw'] )

trunk/wp-includes/js/quicktags.js

@@ -9 +9 @@
  *   id : 'my_id',          the HTML ID of the textarea, required
  *   buttons: ''            Comma separated list of the names of the default buttons to show. Optional.
- *                          Current list of default button names: 'strong,em,link,block,del,ins,img,ul,ol,li,code,more,spell,close';
+ *                          Current list of default button names: 'strong,em,link,block,del,ins,img,ul,ol,li,code,more,close';
  * }
  *
@@ -230 +230 @@
     qt._buttonsInit = function() {
         var t = this, canvas, name, settings, theButtons, html, inst, ed, id, i, use,
-            defaults = ',strong,em,link,block,del,ins,img,ul,ol,li,code,more,spell,close,';
+            defaults = ',strong,em,link,block,del,ins,img,ul,ol,li,code,more,close,';
 
         for ( inst in t.instances ) {
@@ -500 +500 @@
     };
 
-    // the spell button
-    qt.SpellButton = function() {
-        qt.Button.call(this, 'spell', quicktagsL10n.lookup, '', quicktagsL10n.dictionaryLookup);
-    };
-    qt.SpellButton.prototype = new qt.Button();
-    qt.SpellButton.prototype.callback = function(element, canvas, ed) {
-        var word = '', sel, startPos, endPos;
-
-        if ( document.selection ) {
-            canvas.focus();
-            sel = document.selection.createRange();
-            if ( sel.text.length > 0 ) {
-                word = sel.text;
-            }
-        } else if ( canvas.selectionStart || canvas.selectionStart == '0' ) {
-            startPos = canvas.selectionStart;
-            endPos = canvas.selectionEnd;
-            if ( startPos != endPos ) {
-                word = canvas.value.substring(startPos, endPos);
-            }
-        }
-
-        if ( word === '' ) {
-            word = prompt(quicktagsL10n.wordLookup, '');
-        }
-
-        if ( word !== null && /^\w[\w ]*$/.test(word)) {
-            window.open('http://www.answers.com/' + encodeURIComponent(word));
-        }
-    };
+    // removed
+    qt.SpellButton = function() {};
 
     // the close tags button
@@ -644 +616 @@
     edButtons[110] = new qt.TagButton('code','code','<code>','</code>','c'),
     edButtons[120] = new qt.TagButton('more','more','<!--more-->','','t'),
-    edButtons[130] = new qt.SpellButton(),
     edButtons[140] = new qt.CloseButton()
 

trunk/wp-includes/script-loader.php

@@ -76 +76 @@
     $scripts->add( 'quicktags', "/wp-includes/js/quicktags$suffix.js", array(), false, 1 );
     did_action( 'init' ) && $scripts->localize( 'quicktags', 'quicktagsL10n', array(
-        'wordLookup' => __('Enter a word to look up:'),
-        'dictionaryLookup' => esc_attr(__('Dictionary lookup')),
-        'lookup' => esc_attr(__('lookup')),
         'closeAllOpenTags' => esc_attr(__('Close all open tags')),
         'closeTags' => esc_attr(__('close tags')),