WordPress.org
Get WordPress

Make WordPress Core

Ticket #23322: 23322.3

File 23322.3, 5.5 KB (added by jonbishop, 13 years ago)
Line 
1Index: wp-admin/edit-form-comment.php
2===================================================================
3--- wp-admin/edit-form-comment.php (revision 23596)
4+++ wp-admin/edit-form-comment.php (working copy)
5@@ -63,7 +63,7 @@
6
7 <div id="postdiv" class="postarea">
8 <?php
9- $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,spell,close' );
10+ $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );
11 wp_editor( $comment->comment_content, 'content', array( 'media_buttons' => false, 'tinymce' => false, 'quicktags' => $quicktags_settings ) );
12 wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
13 </div>
14Index: wp-admin/includes/media.php
15===================================================================
16--- wp-admin/includes/media.php (revision 23596)
17+++ wp-admin/includes/media.php (working copy)
18@@ -2321,7 +2321,7 @@
19 <?php endif; ?>
20
21 <?php
22- $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,spell,close' );
23+ $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );
24 $editor_args = array(
25 'textarea_name' => 'content',
26 'textarea_rows' => 5,
27Index: wp-admin/includes/template.php
28===================================================================
29--- wp-admin/includes/template.php (revision 23596)
30+++ wp-admin/includes/template.php (working copy)
31@@ -345,7 +345,7 @@
32
33 <div id="replycontainer">
34 <?php
35- $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,spell,close' );
36+ $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );
37 wp_editor( '', 'replycontent', array( 'media_buttons' => false, 'tinymce' => false, 'quicktags' => $quicktags_settings ) );
38 ?>
39 </div>
40Index: wp-includes/class-wp-editor.php
41===================================================================
42--- wp-includes/class-wp-editor.php (revision 23596)
43+++ wp-includes/class-wp-editor.php (working copy)
44@@ -176,7 +176,7 @@
45 $qtInit = array_merge($qtInit, $set['quicktags']);
46
47 if ( empty($qtInit['buttons']) )
48- $qtInit['buttons'] = 'strong,em,link,block,del,ins,img,ul,ol,li,code,more,spell,close';
49+ $qtInit['buttons'] = 'strong,em,link,block,del,ins,img,ul,ol,li,code,more,close';
50
51 if ( $set['dfw'] )
52 $qtInit['buttons'] .= ',fullscreen';
53Index: wp-includes/js/quicktags.js
54===================================================================
55--- wp-includes/js/quicktags.js (revision 23596)
56+++ wp-includes/js/quicktags.js (working copy)
57@@ -8,7 +8,7 @@
58 * settings = {
59 * id : 'my_id', the HTML ID of the textarea, required
60 * buttons: '' Comma separated list of the names of the default buttons to show. Optional.
61- * Current list of default button names: 'strong,em,link,block,del,ins,img,ul,ol,li,code,more,spell,close';
62+ * Current list of default button names: 'strong,em,link,block,del,ins,img,ul,ol,li,code,more,close';
63 * }
64 *
65 * The settings can also be a string quicktags_id.
66@@ -229,7 +229,7 @@
67
68 qt._buttonsInit = function() {
69 var t = this, canvas, name, settings, theButtons, html, inst, ed, id, i, use,
70- defaults = ',strong,em,link,block,del,ins,img,ul,ol,li,code,more,spell,close,';
71+ defaults = ',strong,em,link,block,del,ins,img,ul,ol,li,code,more,close,';
72
73 for ( inst in t.instances ) {
74 if ( inst == 0 )
75@@ -499,37 +499,6 @@
76 }
77 };
78
79- // the spell button
80- qt.SpellButton = function() {
81- qt.Button.call(this, 'spell', quicktagsL10n.lookup, '', quicktagsL10n.dictionaryLookup);
82- };
83- qt.SpellButton.prototype = new qt.Button();
84- qt.SpellButton.prototype.callback = function(element, canvas, ed) {
85- var word = '', sel, startPos, endPos;
86-
87- if ( document.selection ) {
88- canvas.focus();
89- sel = document.selection.createRange();
90- if ( sel.text.length > 0 ) {
91- word = sel.text;
92- }
93- } else if ( canvas.selectionStart || canvas.selectionStart == '0' ) {
94- startPos = canvas.selectionStart;
95- endPos = canvas.selectionEnd;
96- if ( startPos != endPos ) {
97- word = canvas.value.substring(startPos, endPos);
98- }
99- }
100-
101- if ( word === '' ) {
102- word = prompt(quicktagsL10n.wordLookup, '');
103- }
104-
105- if ( word !== null && /^\w[\w ]*$/.test(word)) {
106- window.open('http://www.answers.com/' + encodeURIComponent(word));
107- }
108- };
109-
110 // the close tags button
111 qt.CloseButton = function() {
112 qt.Button.call(this, 'close', quicktagsL10n.closeTags, '', quicktagsL10n.closeAllOpenTags);
113@@ -643,7 +612,6 @@
114 edButtons[100] = new qt.TagButton('li','li','\t<li>','</li>\n','l'),
115 edButtons[110] = new qt.TagButton('code','code','<code>','</code>','c'),
116 edButtons[120] = new qt.TagButton('more','more','<!--more-->','','t'),
117- edButtons[130] = new qt.SpellButton(),
118 edButtons[140] = new qt.CloseButton()
119
120 })();
121Index: wp-includes/script-loader.php
122===================================================================
123--- wp-includes/script-loader.php (revision 23596)
124+++ wp-includes/script-loader.php (working copy)
125@@ -75,7 +75,6 @@
126
127 $scripts->add( 'quicktags', "/wp-includes/js/quicktags$suffix.js", array(), false, 1 );
128 did_action( 'init' ) && $scripts->localize( 'quicktags', 'quicktagsL10n', array(
129- 'wordLookup' => __('Enter a word to look up:'),
130 'dictionaryLookup' => esc_attr(__('Dictionary lookup')),
131 'lookup' => esc_attr(__('lookup')),
132 'closeAllOpenTags' => esc_attr(__('Close all open tags')),