Changeset 4210

Timestamp:

09/22/06 22:24:50 (2 years ago)

Author:

ryan

Message:

Tabbed editor fixes from skeltoac. #2829

Files:

• trunk/wp-admin/admin-functions.php (modified) (1 diff)
• trunk/wp-admin/comment.php (modified) (1 diff)
• trunk/wp-includes/general-template.php (modified) (2 diffs)
• trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js (modified) (2 diffs)

trunk/wp-admin/admin-functions.php

@@ -1964 +1964 @@
-}
-
-function user_can_richedit() {
-    if ( 'true' != get_user_option('rich_editing') )
-        return false;
-
-    if ( preg_match('!opera[ /][2-8]|konqueror|safari!i', $_SERVER['HTTP_USER_AGENT']) )
-        return false;
-
-    return true; // Best guess
-}
-
-function the_attachment_links($id = false) {
-    $id = (int) $id;

trunk/wp-admin/comment.php

@@ -13 +13 @@
-case 'editcomment':
-    $title = __('Edit Comment');
-
-
+
-    require_once ('admin-header.php');
-

trunk/wp-includes/general-template.php

@@ -736 +736 @@
-}
-
+function user_can_richedit() {
+    $can = true;
+
+    if ( 'true' != get_user_option('rich_editing') || preg_match('!opera[ /][2-8]|konqueror|safari!i', $_SERVER['HTTP_USER_AGENT']) )
+        $can = false;
+
+    return apply_filters('user_can_richedit', $can);
+}
+
-function the_editor($content, $id = 'content', $prev_id = 'title') {
-    $rows = get_option('default_post_edit_rows');
@@ -748 +757 @@
-        //  The following line moves the border so that the active button "attaches" to the toolbar. Only IE needs it.
-    ?>
-!--[if IE]><
+
-        #postdivrich table, #postdivrich #quicktags {border-top: none;}
-        #quicktags {border-bottom: none; padding-bottom: 2px; margin-bottom: -1px;}
-        #edButtons {border-bottom: 1px solid #ccc;}
-<![endif]-->
+
-    <div id='edButtons' style='display:none;'>
-        <div class='zerosize'><input accesskey='e' type='button' onclick='switchEditors("<?php echo $id; ?>")' /></div>

trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js

@@ -474 +474 @@
-    var H = document.getElementById('edButtonHTML');
-    var P = document.getElementById('edButtonPreview');
-    var pdr = document.getElementById('postdivrich');
-    var ta = document.getElementById(id);
+    var pdr = ta.parentNode;
-
-    if ( inst ) {
@@ -492 +492 @@
-        var table = document.getElementById(inst.editorId + '_parent').getElementsByTagName('table')[0];
-        var y1 = table.offsetTop + table.offsetHeight;
+
+        if ( TinyMCE_AdvancedTheme._getCookie("TinyMCE_" + inst.editorId + "_height") == null ) {
+            var expires = new Date();
+            expires.setTime(expires.getTime() + 3600000 * 24 * 30);
+            var offset = tinyMCE.isMSIE ? 1 : 2;
+            TinyMCE_AdvancedTheme._setCookie("TinyMCE_" + inst.editorId + "_height", "" + (table.offsetHeight - offset), expires);
+        }
-
-        // Unload the rich editor