';
if ( !empty($set['editor_css']) )
@@ -89,7 +89,7 @@ class WP_Editor {
if ( $set['media_buttons'] ) {
if ( !function_exists('media_buttons') )
include(ABSPATH . 'wp-admin/includes/media.php');
-
+
echo '\n";
@@ -117,14 +117,14 @@ class WP_Editor {
global $editor_styles;
$first_run = false;
- if ( $this->quicktags ) {
+ if ( $this->this_quicktags ) {
$qtbuttons = apply_filters( 'quicktags_buttons', array(), $editor_id );
$qtbuttons_disabled = apply_filters( 'quicktags_disabled_buttons', array(), $editor_id );
$qtInit = array(
- 'quicktags_id' => $editor_id,
- 'quicktags_buttons' => implode($qtbuttons, ','),
- 'quicktags_disabled_buttons' => implode($qtbuttons_disabled, ',')
+ 'id' => $editor_id,
+ 'buttons' => implode($qtbuttons, ','),
+ 'disabled_buttons' => implode($qtbuttons_disabled, ',')
);
if ( is_array($settings['quicktags']) )
@@ -132,8 +132,8 @@ class WP_Editor {
$this->qt_settings[$editor_id] = $qtInit;
}
-
- if ( $this->tinymce ) {
+
+ if ( $this->this_tinymce ) {
if ( empty($this->first_init) ) {
$this->baseurl = includes_url('js/tinymce');
@@ -154,10 +154,10 @@ class WP_Editor {
If the plugin uses a button, it should be added with one of the "$mce_buttons" filters.
*/
$mce_external_plugins = apply_filters('mce_external_plugins', array());
-
+
$ext_plugins = '';
if ( ! empty($mce_external_plugins) ) {
-
+
/*
The following filter loads external language files for TinyMCE plugins.
It takes an associative array 'plugin_name' => 'path', where path is the
@@ -168,10 +168,10 @@ class WP_Editor {
If that is not found, en.js will be tried next.
*/
$mce_external_languages = apply_filters('mce_external_languages', array());
-
+
$loaded_langs = array();
$strings = '';
-
+
if ( ! empty($mce_external_languages) ) {
foreach ( $mce_external_languages as $name => $path ) {
if ( @is_file($path) && @is_readable($path) ) {
@@ -181,58 +181,58 @@ class WP_Editor {
}
}
}
-
+
foreach ( $mce_external_plugins as $name => $url ) {
-
+
if ( is_ssl() ) $url = str_replace('http://', 'https://', $url);
-
+
$plugins[] = '-' . $name;
-
+
$plugurl = dirname($url);
$strings = $str1 = $str2 = '';
if ( ! in_array($name, $loaded_langs) ) {
$path = str_replace( WP_CONTENT_URL, '', $plugurl );
$path = WP_CONTENT_DIR . $path . '/langs/';
-
+
if ( function_exists('realpath') )
$path = trailingslashit( realpath($path) );
-
+
if ( @is_file($path . $mce_locale . '.js') )
$strings .= @file_get_contents($path . $mce_locale . '.js') . "\n";
-
+
if ( @is_file($path . $mce_locale . '_dlg.js') )
$strings .= @file_get_contents($path . $mce_locale . '_dlg.js') . "\n";
-
+
if ( 'en' != $mce_locale && empty($strings) ) {
if ( @is_file($path . 'en.js') ) {
$str1 = @file_get_contents($path . 'en.js');
$strings .= preg_replace( '/([\'"])en\./', '$1' . $mce_locale . '.', $str1, 1 ) . "\n";
}
-
+
if ( @is_file($path . 'en_dlg.js') ) {
$str2 = @file_get_contents($path . 'en_dlg.js');
$strings .= preg_replace( '/([\'"])en\./', '$1' . $mce_locale . '.', $str2, 1 ) . "\n";
}
}
-
+
if ( ! empty($strings) )
$ext_plugins .= "\n" . $strings . "\n";
}
-
+
$ext_plugins .= 'tinyMCEPreInit.load_ext("' . $plugurl . '", "' . $mce_locale . '");' . "\n";
$ext_plugins .= 'tinymce.PluginManager.load("' . $name . '", "' . $url . '");' . "\n";
-
+
$this->ext_plugins .= $ext_plugins;
}
}
-
+
$plugins = array_unique( apply_filters('tiny_mce_plugins', $plugins) );
if ( 'content' == $editor_id ) // enable DFW only on Add/Edit Post screens for now
$plugins[] = 'wpfullscreen';
$this->plugins = $plugins;
-
+
/*
The following filter allows localization scripts to change the languages displayed in the spellchecker's drop-down menu.
By default it uses Google's spellchecker API, but can be configured to use PSpell/ASpell if installed on the server.
@@ -288,7 +288,7 @@ class WP_Editor {
'wp_fullscreen_content_css' => "$this->baseurl/plugins/wpfullscreen/css/wp-fullscreen.css",
'plugins' => implode( ',', $plugins )
);
-
+
// load editor_style.css if the current theme supports it
if ( ! empty( $editor_styles ) && is_array( $editor_styles ) ) {
$mce_css = array();
@@ -311,9 +311,9 @@ class WP_Editor {
} else {
$mce_css = '';
}
-
+
$mce_css = trim( apply_filters( 'mce_css', $mce_css ), ' ,' );
-
+
if ( ! empty($mce_css) )
$this->first_init['content_css'] = $mce_css;
}
@@ -351,7 +351,7 @@ class WP_Editor {
'theme_advanced_buttons3' => implode($mce_buttons_3, ','),
'theme_advanced_buttons4' => implode($mce_buttons_4, ',')
);
-
+
if ( $first_run )
$mceInit = array_merge($this->first_init, $mceInit);
@@ -367,7 +367,7 @@ class WP_Editor {
} else {
$mceInit = apply_filters('tiny_mce_before_init', $mceInit, $editor_id);
}
-
+
if ( empty($mceInit['theme_advanced_buttons3']) && !empty($mceInit['theme_advanced_buttons4']) ) {
$mceInit['theme_advanced_buttons3'] = $mceInit['theme_advanced_buttons4'];
$mceInit['theme_advanced_buttons4'] = '';
@@ -375,9 +375,9 @@ class WP_Editor {
$this->mce_settings[$editor_id] = $mceInit;
$first_run = false;
- } // end if $this->tinymce
+ } // end if $this->this_tinymce
}
-
+
function _parse_init($init) {
$options = '';
@@ -395,7 +395,7 @@ class WP_Editor {
return '{' . trim( $options, ' ,' ) . '}';
}
-
+
/**
* Find out which editor should be displayed by default.
*
@@ -419,21 +419,16 @@ class WP_Editor {
wp_enqueue_script('quicktags');
wp_enqueue_script('word-count');
wp_enqueue_script('wplink');
+ wp_enqueue_script('editor');
wp_enqueue_style('editor-buttons');
-
+
wp_enqueue_script('wpdialogs-popup');
wp_enqueue_style('wp-jquery-ui-dialog');
- if ( $this->tinymce )
- wp_enqueue_script('editor');
- else
- wp_enqueue_script('utils');
-
if ( in_array('wpfullscreen', $this->plugins, true) )
wp_enqueue_script('wp-fullscreen');
- if ( !is_admin() )
- add_thickbox();
+ add_thickbox();
}
function editor_js() {
@@ -447,6 +442,7 @@ class WP_Editor {
* If the plugin has a popup dialog, a query string can be added to the button action that opens it (in the plugin's code).
*/
$version = 'ver=' . $tinymce_version;
+ $tmce_on = !empty($this->mce_settings);
if ( ! isset($concatenate_scripts) )
script_concat_settings();
@@ -454,11 +450,11 @@ class WP_Editor {
$compressed = $compress_scripts && $concatenate_scripts && isset($_SERVER['HTTP_ACCEPT_ENCODING'])
&& false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip');
- if ( $this->tinymce && 'en' != $this->mce_locale )
+ if ( $tmce_on && 'en' != $this->mce_locale )
include_once(ABSPATH . WPINC . '/js/tinymce/langs/wp-langs.php');
$mceInit = $qtInit = '';
- if ( !empty($this->mce_settings) ) {
+ if ( $tmce_on ) {
foreach ( $this->mce_settings as $editor_id => $init ) {
$options = $this->_parse_init( $init );
$mceInit .= "'$editor_id':{$options},\n";
@@ -503,7 +499,7 @@ class WP_Editor {
tinymce ) {
+ if ( $tmce_on ) {
if ( $compressed )
echo "\n";
else
@@ -570,7 +566,7 @@ class WP_Editor {
ed.execCommand('mceInsertContent', false, h);
} else if ( typeof quicktags != 'undefined' ) {
- quicktags.insertContent(wpActiveEditor, h);
+ QTags.insertContent(wpActiveEditor, h);
} else {
jQuery('#'+wpActiveEditor).val( jQuery('#'+wpActiveEditor).val() + h );
}
@@ -582,7 +578,7 @@ class WP_Editor {
if ( $this->ext_plugins )
echo "$this->ext_plugins\n";
- if ( ! $compressed && $this->tinymce ) {
+ if ( ! $compressed && $tmce_on ) {
?>
(function(){var t=tinyMCEPreInit,sl=tinymce.ScriptLoader,ln=t.ref.language,th=t.ref.theme,pl=t.ref.plugins;sl.markDone(t.base+'/langs/'+ln+'.js');sl.markDone(t.base+'/themes/'+th+'/langs/'+ln+'.js');sl.markDone(t.base+'/themes/'+th+'/langs/'+ln+'_dlg.js');sl.markDone(t.base+'/themes/advanced/skins/wp_theme/ui.css');tinymce.each(pl.split(','),function(n){if(n&&n.charAt(0)!='-'){sl.markDone(t.base+'/plugins/'+n+'/langs/'+ln+'.js');sl.markDone(t.base+'/plugins/'+n+'/langs/'+ln+'_dlg.js');}});})();
$content_width ? $content_width : 800;
$width = $width + 10; // compensate for the padding
$dfw_width = get_user_setting( 'dfw_width', $width );
@@ -616,19 +612,19 @@ class WP_Editor {
-
+
-
+
-
+
-
+
true ), 'objects' );
$pt_names = array_keys( $pts );
-
+
$query = array(
'post_type' => $pt_names,
'suppress_filters' => true,
@@ -716,21 +712,21 @@ class WP_Editor {
'orderby' => 'post_date',
'posts_per_page' => 20,
);
-
+
$args['pagenum'] = isset( $args['pagenum'] ) ? absint( $args['pagenum'] ) : 1;
-
+
if ( isset( $args['s'] ) )
$query['s'] = $args['s'];
-
+
$query['offset'] = $args['pagenum'] > 1 ? $query['posts_per_page'] * ( $args['pagenum'] - 1 ) : 0;
-
+
// Do main query.
$get_posts = new WP_Query;
$posts = $get_posts->query( $query );
// Check if any posts were found.
if ( ! $get_posts->post_count )
return false;
-
+
// Build results.
$results = array();
foreach ( $posts as $post ) {
@@ -738,7 +734,7 @@ class WP_Editor {
$info = mysql2date( __( 'Y/m/d' ), $post->post_date );
else
$info = $pts[ $post->post_type ]->labels->singular_name;
-
+
$results[] = array(
'ID' => $post->ID,
'title' => trim( esc_html( strip_tags( get_the_title( $post ) ) ) ),
@@ -746,10 +742,10 @@ class WP_Editor {
'info' => $info,
);
}
-
+
return $results;
}
-
+
/**
* Dialog for internal linking.
*
diff --git a/wp-includes/js/quicktags.dev.js b/wp-includes/js/quicktags.dev.js
index d4de51912c..6c5fff236d 100644
--- a/wp-includes/js/quicktags.dev.js
+++ b/wp-includes/js/quicktags.dev.js
@@ -6,9 +6,11 @@
*
* Run quicktags(settings) to initialize it, where settings is an object containing up to 3 properties:
* settings = {
- * quicktags_id: 'myid', // required
- * buttons: '', // optional
- * disabled_buttons: '' // optional
+ * id : 'my_id', // the HTML ID of the textarea, required
+ * buttons: '', // Comma separated list of the names of the default buttons to show. Optional.
+ * // This overwrites buttons order and any buttons added by plugins.
+ * // Current list of default button names: 'strong,em,link,block,del,ins,img,ul,ol,li,code,more,spell,close'
+ * disabled_buttons : '' // Comma separated list of the names of the buttons to disable.
* }
*
* The settings can also be a string quicktags_id.
@@ -24,12 +26,35 @@
// by Alex King
// http://www.alexking.org/
-var QTags, edButtons, edButton;
+var QTags, edButtons = [], edCanvas;
+/**
+ * Initialize new instance of the Quicktags editor
+ */
function quicktags(settings) {
return new QTags(settings);
}
+/**
+ * Inderts content at the caret in the active editor (textarea)
+ *
+ * Added for back compatibility
+ * @see QTags.insertContent()
+ */
+function edInsertContent(bah, txt) {
+ return QTags.insertContent(txt);
+}
+
+/**
+ * Adds a button to all instances of the editor
+ *
+ * Added for back compatibility
+ * @see QTags.addButton()
+ */
+function edButton(id, display, tagStart, tagEnd, access, open) {
+ return QTags.addButton( id, display, tagStart, tagEnd, open, access );
+}
+
(function(){
// private stuff is prefixed with an underscore
var _domReady = function(func) {
@@ -109,18 +134,18 @@ function quicktags(settings) {
qt = QTags = function(settings) {
if ( typeof(settings) == 'string' )
- settings = {quicktags_id: settings};
+ settings = {id: settings};
else if ( typeof(settings) != 'object' )
return false;
var t = this,
- id = settings.quicktags_id,
+ id = settings.id,
buttons = {},
theButtons = {},
canvas = document.getElementById(id),
name = 'qt_' + id,
html = '',
- i, tb, qb, btn, onclick;
+ i, tb, qb, btn, onclick, toolbar_id;
if ( !id || !canvas )
return false;
@@ -130,6 +155,9 @@ function quicktags(settings) {
// default buttons
for ( i in edButtons ) {
+ if ( !edButtons[i] )
+ continue;
+
buttons[edButtons[i].id] = edButtons[i];
}
@@ -141,8 +169,8 @@ function quicktags(settings) {
buttons[i] = new t._customButtons[i]();
}
- if ( settings.quicktags_buttons ) {
- qb = settings.quicktags_buttons.split(',');
+ if ( settings.buttons ) {
+ qb = settings.buttons.split(',');
for ( i in qb ) {
btn = qb[i];
@@ -153,8 +181,8 @@ function quicktags(settings) {
theButtons = buttons;
}
- if ( settings.quicktags_disabled_buttons ) {
- qb = settings.quicktags_disabled_buttons.split(',');
+ if ( settings.disabled_buttons ) {
+ qb = settings.disabled_buttons.split(',');
for ( i in qb ) {
btn = qb[i];
@@ -166,8 +194,15 @@ function quicktags(settings) {
for ( i in theButtons )
html += theButtons[i].html(name + '_');
+ if ( id == 'content' && !qt.instances[0] ) { // back compat hack :-(
+ edCanvas = canvas;
+ toolbar_id = 'ed_toolbar';
+ } else {
+ toolbar_id = name + '_toolbar';
+ }
+
tb = document.createElement('div');
- tb.id = name + '_toolbar';
+ tb.id = toolbar_id;
tb.className = 'quicktags-toolbar';
canvas.parentNode.insertBefore(tb, canvas);
@@ -197,6 +232,9 @@ function quicktags(settings) {
tb.attachEvent('onclick', onclick);
}
+ if ( !qt.instances[0] )
+ qt.instances[0] = t;
+
qt.instances[id] = t;
};
@@ -209,9 +247,65 @@ function quicktags(settings) {
qt.getInstance = function(id) {
return qt.instances[id];
};
+
+ /**
+ * 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.
+ * For TagButton arg2 is also required. To be able to add button(s) to Quicktags, your script
+ * should be enqueued as dependant on "quicktags" and outputted in the footer. If you are echoing JS
+ * directly from PHP, use add_action( 'admin_print_footer_scripts', 'output_my_js', 100 ) or add_action( 'wp_footer', 'output_my_js', 100 )
+ *
+ * Minimun required to add a button that calls an external function:
+ * QTags.addButton( 'my_id', 'my button', my_callback );
+ * function my_callback() { alert('yeah!'); }
+ *
+ * Minimun required to add a button that inserts a tag:
+ * QTags.addButton( 'my_id', 'my button', '', '' );
+ *
+ * @param id string required button HTML ID
+ * @param display string required button's value="..."
+ * @param arg1 string || function required either a starting tag to be inserted like "" or a callback that is executed when the button is pressed
+ * @param arg2 string ending tag like ""
+ * @param arg3 int set to -1 if the inserted tag is self-closing
+ * @param access string access key for the button
+ * @param title string button's title="..."
+ * @param priority int number representing the desired position of the button in the toolbar. 1 - 9 = first, 11 - 19 = second, 21 - 29 = third, etc.
+ * @return bool TRUE on success FALSE on failure
+ */
+ qt.addButton = function( id, display, arg1, arg2, arg3, access, title, priority ) {
+ var btn;
+
+ if ( !id || !display )
+ return false;
- qt.insertContent = function(editor_id, content) {
- var sel, startPos, endPos, scrollTop, text, ed = document.getElementById(editor_id);
+ if ( typeof(arg1) == 'function' ) {
+ btn = new qt.Button(id, display, access, title);
+ btn.callback = arg1;
+ } else if ( typeof(arg1) == 'string' && arg1 && arg2 ) {
+ btn = new qt.TagButton(id, display, arg1, arg2, access, arg3, title);
+ } else {
+ return false;
+ }
+
+ if ( priority ) {
+ while ( typeof(edButtons[priority]) != 'undefined' ) {
+ priority++
+ }
+
+ edButtons[priority] = btn;
+ } else {
+ edButtons[edButtons.length] = btn;
+ }
+
+ return true;
+ };
+
+ qt.insertContent = function(content) {
+ var sel, startPos, endPos, scrollTop, text, ed = document.getElementById(wpActiveEditor);
+
+ if ( !ed )
+ return false;
if ( document.selection ) { //IE
ed.focus();
@@ -234,6 +328,7 @@ function quicktags(settings) {
ed.value += content;
ed.focus();
}
+ return true;
};
// a plain, dumb button
@@ -468,22 +563,19 @@ function quicktags(settings) {
};
// ensure backward compatibility
- edButtons = [
- new qt.TagButton('strong','b','','','b'),
- new qt.TagButton('em','i','','','i'),
- new qt.LinkButton(), // special case
- new qt.TagButton('block','b-quote','\n\n0' ); ?>
','\n\n','q'), - new qt.TagButton('del','del','
- \n','
- \n','
','','c'),
- new qt.TagButton('more','more','','','t',-1),
- new qt.SpellButton(),
- new qt.CloseButton()
- ];
+ edButtons[10] = new qt.TagButton('strong','b','','','b');
+ edButtons[20] = new qt.TagButton('em','i','','','i'),
+ edButtons[30] = new qt.LinkButton(), // special case
+ edButtons[40] = new qt.TagButton('block','b-quote','\n\n','\n\n','q'), + edButtons[50] = new qt.TagButton('del','del','
- \n','
- \n','
','','c'),
+ edButtons[120] = new qt.TagButton('more','more','','','t',-1),
+ edButtons[130] = new qt.SpellButton(),
+ edButtons[140] = new qt.CloseButton()
- edButton = qt.TagButton;
})();
diff --git a/wp-includes/js/quicktags.js b/wp-includes/js/quicktags.js
index ca361968cf..c1dc21a9ee 100644
--- a/wp-includes/js/quicktags.js
+++ b/wp-includes/js/quicktags.js
@@ -1 +1 @@
-var QTags,edButtons,edButton;function quicktags(a){return new QTags(a)}(function(){var c=function(h){var g,f,e;if(typeof jQuery!="undefined"){jQuery(document).ready(h)}else{g=c;g.funcs=[];g.ready=function(){if(!g.isReady){g.isReady=true;for(f=0;f","\n\n","q"),new d.TagButton("del","del",'
- \n","
- \n","
","","c"),new d.TagButton("more","more","","","t",-1),new d.SpellButton(),new d.CloseButton()];edButton=d.TagButton})();
\ No newline at end of file
+var QTags,edButtons=[],edCanvas;function quicktags(a){return new QTags(a)}function edInsertContent(b,a){return QTags.insertContent(a)}function edButton(f,e,c,b,a,d){return QTags.addButton(f,e,c,b,d,a)}(function(){var c=function(h){var g,f,e;if(typeof jQuery!="undefined"){jQuery(document).ready(h)}else{g=c;g.funcs=[];g.ready=function(){if(!g.isReady){g.isReady=true;for(f=0;f","\n\n","q"),edButtons[50]=new d.TagButton("del","del",'
- \n","
- \n","
","","c"),edButtons[120]=new d.TagButton("more","more","","","t",-1),edButtons[130]=new d.SpellButton(),edButtons[140]=new d.CloseButton()})();
\ No newline at end of file
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index e96149d912..14cfb6f42b 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -68,7 +68,7 @@ function wp_default_scripts( &$scripts ) {
$scripts->add( 'sack', "/wp-includes/js/tw-sack$suffix.js", false, '1.6.1', 1 );
- $scripts->add( 'quicktags', "/wp-includes/js/quicktags$suffix.js", false, '20110802', 1 );
+ $scripts->add( 'quicktags', "/wp-includes/js/quicktags$suffix.js", false, '20110804', 1 );
$scripts->add_script_data( 'quicktags', 'quicktagsL10n', array(
'wordLookup' => __('Enter a word to look up:'),
'dictionaryLookup' => esc_attr(__('Dictionary lookup')),
@@ -269,7 +269,7 @@ function wp_default_scripts( &$scripts ) {
$scripts->add( 'admin-custom-fields', "/wp-admin/js/custom-fields$suffix.js", array('wp-lists'), '20110429', 1 );
- $scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'jquery-ui-resizable', 'quicktags', 'jquery-query'), '20110802', 1 );
+ $scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'jquery-ui-resizable', 'quicktags', 'jquery-query'), '20110804', 1 );
$scripts->add_script_data( 'admin-comments', 'adminCommentsL10n', array(
'hotkeys_highlight_first' => isset($_GET['hotkeys_highlight_first']),
'hotkeys_highlight_last' => isset($_GET['hotkeys_highlight_last']),