Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-29 07:37:44 +02:00
Code Issues Projects Releases Wiki Activity

Ensure default editor is selected

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@9019 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2008-09-28 14:21:00 +00:00
parent d419fdb777
commit 72df1fc525
3 changed files with 39 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
wp-admin/js/editor.js
View File

@ -1,6 +1,8 @@
switchEditors = { switchEditors = {
mode : '',
I : function(e) { I : function(e) {
return document.getElementById(e); return document.getElementById(e);
}, },
@ -9,15 +11,15 @@ switchEditors = {
var h = tinymce.util.Cookie.getHash("TinyMCE_content_size"), H = this.I('edButtonHTML'), P = this.I('edButtonPreview'); var h = tinymce.util.Cookie.getHash("TinyMCE_content_size"), H = this.I('edButtonHTML'), P = this.I('edButtonPreview');
// Activate TinyMCE if it's the user's default editor // Activate TinyMCE if it's the user's default editor
if ( getUserSetting( 'editor', 'tinymce' ) == 'tinymce' ) { if ( getUserSetting( 'editor' ) == 'html' ) {
try { P.onclick = ''; P.className = 'active'; } catch(e){};
try { this.I('editorcontainer').style.padding = '0px'; } catch(e){};
try { this.I("quicktags").style.display = "none"; } catch(e){};
tinyMCE.execCommand("mceAddControl", false, "content");
} else {
try { H.onclick = ''; H.className = 'active'; } catch(e){};
if ( h ) if ( h )
try { this.I('content').style.height = h.ch - 30 + 'px'; } catch(e){}; try { this.I('content').style.height = h.ch - 30 + 'px'; } catch(e){};
} else {
try {
this.I('editorcontainer').style.padding = '0px';
this.I("quicktags").style.display = "none";
} catch(e){};
tinyMCE.execCommand("mceAddControl", false, "content");
} }
}, },
@ -89,18 +91,27 @@ switchEditors = {
return content; return content;
}, },
go : function(id) { go : function(id, mode) {
var ed = tinyMCE.get(id); id = id || 'content';
mode = mode || this.mode || '';
var ed = tinyMCE.get(id) || false;
var qt = this.I('quicktags'); var qt = this.I('quicktags');
var H = this.I('edButtonHTML'); var H = this.I('edButtonHTML');
var P = this.I('edButtonPreview'); var P = this.I('edButtonPreview');
var ta = this.I(id); var ta = this.I(id);
var ec = (ta.parentNode && ta.parentNode.nodeName == 'DIV') ? ta.parentNode : ''; var ec = (ta.parentNode && ta.parentNode.nodeName == 'DIV') ? ta.parentNode : '';
if ( ! ed || ed.isHidden() ) { if ( 'tinymce' == mode ) {
if ( ed && ! ed.isHidden() )
return false;
this.mode = 'html';
ta.style.color = '#fff'; ta.style.color = '#fff';
this.edToggle(P, H); P.className = 'active';
H.className = '';
edCloseAllTags(); // :-( edCloseAllTags(); // :-(
qt.style.display = 'none'; qt.style.display = 'none';
@ -115,7 +126,13 @@ switchEditors = {
setUserSetting( 'editor', 'tinymce' ); setUserSetting( 'editor', 'tinymce' );
} else { } else {
this.edToggle(H, P); if ( ! ed || ed.isHidden() )
return false;
this.mode = 'tinymce';
H.className = 'active';
P.className = '';
ta.style.height = ed.getContentAreaContainer().offsetHeight + 6 + 'px'; ta.style.height = ed.getContentAreaContainer().offsetHeight + 6 + 'px';
ed.hide(); ed.hide();
@ -135,14 +152,7 @@ switchEditors = {
ta.style.color = ''; ta.style.color = '';
setUserSetting( 'editor', 'html' ); setUserSetting( 'editor', 'html' );
} }
}, return false;
edToggle : function(A, B) {
A.className = 'active';
B.className = '';
B.onclick = A.onclick;
A.onclick = null;
}, },
wpautop : function(pee) { wpautop : function(pee) {

14
wp-includes/general-template.php
View File

@ -1430,14 +1430,14 @@ function the_editor($content, $id = 'content', $prev_id = 'title', $media_button
<?php if ( user_can_richedit() ) { <?php if ( user_can_richedit() ) {
$wp_default_editor = wp_default_editor(); ?> $wp_default_editor = wp_default_editor(); ?>
<div class="zerosize"><input accesskey="e" type="button" onclick="switchEditors.go('<?php echo $id; ?>')" /></div> <div class="zerosize"><input accesskey="e" type="button" onclick="switchEditors.go('<?php echo $id; ?>')" /></div>
<?php if ( 'tinymce' == $wp_default_editor ) { <?php if ( 'html' == $wp_default_editor ) {
add_filter('the_editor_content', 'wp_richedit_pre'); ?>
<a id="edButtonHTML" onclick="switchEditors.go('<?php echo $id; ?>');"><?php _e('HTML'); ?></a>
<a id="edButtonPreview" class="active"><?php _e('Visual'); ?></a>
<?php } elseif ( 'html' == $wp_default_editor ) {
add_filter('the_editor_content', 'wp_htmledit_pre'); ?> add_filter('the_editor_content', 'wp_htmledit_pre'); ?>
<a id="edButtonHTML" class="active"><?php _e('HTML'); ?></a> <a id="edButtonHTML" class="active" onclick="switchEditors.go('<?php echo $id; ?>', 'html');"><?php _e('HTML'); ?></a>
<a id="edButtonPreview" onclick="switchEditors.go('<?php echo $id; ?>');"><?php _e('Visual'); ?></a> <a id="edButtonPreview" onclick="switchEditors.go('<?php echo $id; ?>', 'tinymce');"><?php _e('Visual'); ?></a>
<?php } else {
add_filter('the_editor_content', 'wp_richedit_pre'); ?>
<a id="edButtonHTML" onclick="switchEditors.go('<?php echo $id; ?>', 'html');"><?php _e('HTML'); ?></a>
<a id="edButtonPreview" class="active" onclick="switchEditors.go('<?php echo $id; ?>', 'tinymce');"><?php _e('Visual'); ?></a>
<?php } <?php }
} }

2
wp-includes/script-loader.php
View File

@ -66,7 +66,7 @@ function wp_default_scripts( &$scripts ) {
$visual_editor = apply_filters('visual_editor', array('tiny_mce')); $visual_editor = apply_filters('visual_editor', array('tiny_mce'));
$scripts->add( 'editor', false, $visual_editor, '20080321' ); $scripts->add( 'editor', false, $visual_editor, '20080321' );
$scripts->add( 'editor_functions', '/wp-admin/js/editor.js', false, '20080823' ); $scripts->add( 'editor_functions', '/wp-admin/js/editor.js', false, '20080928' );
// Modify this version when tinyMCE plugins are changed. // Modify this version when tinyMCE plugins are changed.
$mce_version = apply_filters('tiny_mce_version', '20080830'); $mce_version = apply_filters('tiny_mce_version', '20080830');