Changeset 6694 for trunk/wp-includes/js/tinymce/tiny_mce_config.php

Timestamp:

01/31/2008 06:10:46 PM (19 years ago)

Author:

ryan

Message:

TinyMCE 3.0 Final from azaozz. see #5674

File:

• trunk/wp-includes/js/tinymce/tiny_mce_config.php (modified) (3 diffs)

trunk/wp-includes/js/tinymce/tiny_mce_config.php

@@ -26 +26 @@
         $valid_elements = apply_filters('mce_valid_elements', $valid_elements);
         
-        $invalid_elements = apply_filters('mce_invalid_elements', '');
+    $invalid_elements = apply_filters('mce_invalid_elements', '');
 
-        $plugins = array( 'safari', 'inlinepopups', 'autosave', 'spellchecker', 'paste', 'wordpress', 'wphelp', 'media', 'fullscreen' );
+        $plugins = array( 'safari', 'inlinepopups', 'autosave', 'spellchecker', 'paste', 'wordpress', 'media', 'fullscreen' );
         $plugins = apply_filters('mce_plugins', $plugins);
         $plugins = implode($plugins, ',');
 
-        $mce_buttons = apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', 'separator', 'bullist', 'numlist', 'outdent', 'indent', 'separator', 'justifyleft', 'justifycenter', 'justifyright', 'separator', 'link', 'unlink', 'image', 'wp_more', 'separator', 'spellchecker', 'separator', 'wp_help', 'wp_adv', 'wp_adv_start', 'wp_adv_end'));
+        $mce_buttons = apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', '|', 'bullist', 'numlist', 'outdent', 'indent', '|', 'justifyleft', 'justifycenter', 'justifyright', '|', 'link', 'unlink', 'image', 'wp_more', '|', 'spellchecker', '|', 'wp_help', 'wp_adv' ));
         $mce_buttons = implode($mce_buttons, ',');
 
-        $mce_buttons_2 = apply_filters('mce_buttons_2', array('formatselect', 'underline', 'justifyfull', 'forecolor', 'media', 'separator', 'pastetext', 'pasteword', 'separator', 'removeformat', 'cleanup', 'separator', 'charmap', 'separator', 'undo', 'redo', 'fullscreen'));
+
+        $mce_buttons_2 = apply_filters('mce_buttons_2', array('formatselect', 'underline', 'justifyfull', 'forecolor', '|', 'pastetext', 'pasteword', '|', 'removeformat', 'cleanup', '|', 'media', 'charmap', 'blockquote', '|', 'undo', 'redo', 'fullscreen' ));
         $mce_buttons_2 = implode($mce_buttons_2, ',');
 
         $mce_buttons_3 = apply_filters('mce_buttons_3', array());
         $mce_buttons_3 = implode($mce_buttons_3, ',');
+        
+        $mce_buttons_4 = apply_filters('mce_buttons_4', array());
+        $mce_buttons_4 = implode($mce_buttons_4, ',');
 
         $mce_browsers = apply_filters('mce_browsers', array('msie', 'gecko', 'opera', 'safari'));
         $mce_browsers = implode($mce_browsers, ',');
 
-        $mce_popups_css = get_option('siteurl') . '/wp-includes/js/tinymce/plugins/wordpress/popups.css';
-        $mce_css = get_option('siteurl') . '/wp-includes/js/tinymce/plugins/wordpress/wordpress.css';
+        $mce_css = get_option('siteurl') . '/wp-includes/js/tinymce/wordpress.css';
         $mce_css = apply_filters('mce_css', $mce_css);
-        if ( $_SERVER['HTTPS'] == 'on' ) {
+        if ( $_SERVER['HTTPS'] == 'on' )
                 $mce_css = str_replace('http://', 'https://', $mce_css);
-                $mce_popups_css = str_replace('http://', 'https://', $mce_popups_css);
-        }
 
         $mce_locale = ( '' == get_locale() ) ? 'en' : strtolower(get_locale());
 ?>
 
-/*
-wpEditorInit = function() {
-        // Activate tinyMCE if it's the user's default editor
-        if ( ( 'undefined' == typeof wpTinyMCEConfig ) || 'tinymce' == wpTinyMCEConfig.defaultEditor )
-                tinyMCE.execCommand('mceAddControl', false, 'content');
-};
-*/
-
-wpEditorInit = function() {
-    if ( ( 'undefined' != typeof wpTinyMCEConfig ) && 'tinymce' != wpTinyMCEConfig.defaultEditor )
-        tinyMCE.get('content').hide();
-}
-
 initArray = {
-        mode : "exact",
-        elements : "content",
-//      editor_selector : "mceEditor",
-        oninit : "wpEditorInit",
-        width : "100%",
+        mode : "none",
+        onpageload : "wpEditorInit",
+    width : "100%",
         theme : "advanced",
-        skin : "o2k7",
+        skin : "wp_theme",
         theme_advanced_buttons1 : "<?php echo $mce_buttons; ?>",
         theme_advanced_buttons2 : "<?php echo $mce_buttons_2; ?>",
         theme_advanced_buttons3 : "<?php echo $mce_buttons_3; ?>",
+        theme_advanced_buttons4 : "<?php echo $mce_buttons_4; ?>",
         language : "<?php echo $mce_locale; ?>",
         theme_advanced_toolbar_location : "top",
@@ -95 +82 @@
         remove_linebreaks : false,
         fix_list_elements : true,
+        fix_table_elements : true,
         gecko_spellcheck : true,
         entities : "38,amp,60,lt,62,gt",
-        button_tile_map : false,
+        accessibility_focus : false,
+        tab_focus : ":next",
         content_css : "<?php echo $mce_css; ?>",
-        valid_elements : "<?php echo $valid_elements; ?>",
-        invalid_elements : "<?php echo $invalid_elements; ?>",
-        save_callback : 'TinyMCE_wordpressPlugin.saveCallback',
-        imp_version : "<?php echo intval($_GET['ver']); ?>",
+        <?php if ( $valid_elements ) echo 'valid_elements : "' . $valid_elements . '",' . "\n"; ?>
+        <?php if ( $invalid_elements ) echo 'invalid_elements : "' . $invalid_elements . '",' . "\n"; ?>
+    save_callback : "switchEditors.saveCallback",
 <?php do_action('mce_options'); ?>
         plugins : "<?php echo $plugins; ?>"
@@ -113 +101 @@
 ?>
 
-tinyMCE.init(initArray);
+tinyMCE_GZ.init(initArray);