Changeset 4206

Timestamp:

09/22/06 07:04:41 (2 years ago)

Author:

ryan

Message:

Tabbed editor from skeltoac. fixes #2829

Files:

• trunk/wp-admin/admin-functions.php (modified) (1 diff)
• trunk/wp-admin/inline-uploading.php (modified) (2 diffs)
• trunk/wp-admin/wp-admin.css (modified) (5 diffs)
• trunk/wp-includes/general-template.php (modified) (5 diffs)
• trunk/wp-includes/js/autosave.js.php (modified) (2 diffs)
• trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js (modified) (6 diffs)
• trunk/wp-includes/js/tinymce/tiny_mce_config.php (modified) (2 diffs)
• trunk/wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/admin-functions.php

@@ -1251 +1251 @@
-}
-
-function the_quicktags() {
-        echo '
-        <div id="quicktags">
-            ';
-        wp_print_scripts( 'quicktags' );
-        echo '          <script type="text/javascript">
-                //<![CDATA[
-                if ( typeof tinyMCE == "undefined" || tinyMCE.configs.length < 1 ) edToolbar();
-                //]]>
-            </script>
-        </div>
-';
-    echo '
-<script type="text/javascript">
-function edInsertContent(myField, myValue) {
-    //IE support
-    if (document.selection) {
-        myField.focus();
-        sel = document.selection.createRange();
-        sel.text = myValue;
-        myField.focus();
-    }
-    //MOZILLA/NETSCAPE support
-    else if (myField.selectionStart || myField.selectionStart == "0") {
-        var startPos = myField.selectionStart;
-        var endPos = myField.selectionEnd;
-        myField.value = myField.value.substring(0, startPos)
-                      + myValue 
-                      + myField.value.substring(endPos, myField.value.length);
-        myField.focus();
-        myField.selectionStart = startPos + myValue.length;
-        myField.selectionEnd = startPos + myValue.length;
-    } else {
-        myField.value += myValue;
-        myField.focus();
-    }
-}
-</script>
-';
-}
-
-function get_broken_themes() {
-    global $wp_broken_themes;

trunk/wp-admin/inline-uploading.php

@@ -411 +411 @@
-if (!win) win = top;
-tinyMCE = win.tinyMCE;
-richedit = ( typeof tinyMCE == 'object' && tinyMCE.configs.length > 0 );
-function sendToEditor(n) {
-    o = document.getElementById('div'+n);
@@ -421 +420 @@
-    h = h.replace(new RegExp('<IMG', 'g'), '<img'); // Lowercase again
-    h = h.replace(new RegExp('(<img .+?")>', 'g'), '$1 />'); // XHTML
-richedit
+typeof tinyMCE != 'undefined' && tinyMCE.getInstanceById('content')
-        win.tinyMCE.execCommand('mceInsertContent', false, h);
-    else

trunk/wp-admin/wp-admin.css

@@ -1 @@
-
+z
-    height: 100%; /* kill peekaboo bug in IE */
-}
@@ -491 +491 @@
-}
-
-#quicktags {
-    margin-left: -1px;
-}
-
-#currenttheme img {
-    float: left;
@@ -513 +509 @@
-}
-
+#postdivrich #quicktags {
+    background: #f0f0ee;
+    padding: 0px;
+    border: 1px solid #ccc;
+    border-bottom: none;
+}
+#postdiv #quicktags {
+    padding-right: 6px;
+}
+#postdivrich #quicktags {
+    display: none;
+}
+#quicktags #ed_toolbar {
+    padding: 0px 2px;
+}
+
+#ed_toolbar input {
+    background: #fff url( images/fade-butt.png ) repeat-x 0px -2px;
+    margin: 3px 2px 2px;
+}
+
-#quicktags #ed_strong {
-    font-weight: bold;
@@ -532 +549 @@
-#quicktags #ed_code {
-    font-family: "Courier New", Courier, mono;
+    margin-bottom: 3px;
-}
-
@@ -1119 +1137 @@
-    margin-left: 2em;
-}
+#postdivrich #edButtons {
+    padding-left: 3px;
+}
+#postdivrich #content, #postdivrich #content:active {
+    border: 1px solid #ccc;
+}
+#edButtons input, #edButtons input:active {
+    margin: 0px 2px -1px;
+}
+#edButtons input.edButtonFore, #edButtons input.edButtonFore:active {
+    background: #f0f0ee;
+    border-bottom: 1px solid #f0f0ee;
+}
+#edButtons input.edButtonBack, #edButtons input.edButtonBack:active {
+    background: #fff url( images/fade-butt.png ) repeat-x 0px 15px;
+    border-bottom: 1px solid #ccc;
+}

trunk/wp-includes/general-template.php

@@ -736 +736 @@
-}
-
-/**
- * Places a textarea according to the current user's preferences, filled with $content.
- * Also places a script block that enables tabbing between Title and Content.
- *
- * @param string Editor contents
- * @param string (optional) Previous form field's ID (for tabbing support)
- */
-function the_editor($content, $id = 'content', $prev_id = 'title') {
-    $rows = get_option('default_post_edit_rows');
@@ -750 +743 @@
-    $rows = "rows='$rows'";
-
-
-
-
+
-        add_filter('the_editor_content', 'wp_richedit_pre');
+
+        //  The following line moves the border so that the active button "attaches" to the toolbar. Only IE needs it.
+    ?>
+    <!--[if IE]><style type="text/css">
+        #postdivrich table, #postdivrich #quicktags {border-top: none;}
+        #quicktags {border-bottom: none; padding-bottom: 2px; margin-bottom: -1px;}
+        #edButtons {border-bottom: 1px solid #ccc;}
+    </style><![endif]-->
+    <div id='edButtons' style='display:none;'>
+        <div class='zerosize'><input accesskey='e' type='button' onclick='switchEditors("<?php echo $id; ?>")' /></div>
+        <input id='edButtonPreview' class='edButtonFore' type='button' value='<?php _e('Compose'); ?>' />
+        <input id='edButtonHTML' class='edButtonBack' type='button' value='<?php _e('HTML'); ?>' onclick='switchEditors("<?php echo $id; ?>")' />
+    </div>
+    <script type="text/javascript">
+        if ( typeof tinyMCE != "undefined" && tinyMCE.configs.length > 0 )
+            document.getElementById('edButtons').style.display = 'block';
+    </script>
+
+    <?php endif; ?>
+    <div id="quicktags">
+    <?php wp_print_scripts( 'quicktags' ); ?>
+    <script type="text/javascript">edToolbar()</script>
+    </div>
+    <script type="text/javascript">
+        if ( typeof tinyMCE != "undefined" && tinyMCE.configs.length > 0 )
+            document.getElementById("quicktags").style.display="none";
+
+        function edInsertContent(myField, myValue) {
+            //IE support
+            if (document.selection) {
+                myField.focus();
+                sel = document.selection.createRange();
+                sel.text = myValue;
+                myField.focus();
+            }
+            //MOZILLA/NETSCAPE support
+            else if (myField.selectionStart || myField.selectionStart == "0") {
+                var startPos = myField.selectionStart;
+                var endPos = myField.selectionEnd;
+                myField.value = myField.value.substring(0, startPos)
+                              + myValue 
+                              + myField.value.substring(endPos, myField.value.length);
+                myField.focus();
+                myField.selectionStart = startPos + myValue.length;
+                myField.selectionEnd = startPos + myValue.length;
+            } else {
+                myField.value += myValue;
+                myField.focus();
+            }
+        }
+    </script>
+    <?php
-
-    $the_editor = apply_filters('the_editor', "<div><textarea class='mceEditor' $rows cols='40' name='$id' tabindex='2' id='$id'>%s</textarea></div>\n");
@@ -764 +807 @@
-    //<!--
-    edCanvas = document.getElementById('<?php echo $id; ?>');
-
+$prev_id && 
-    // This code is meant to allow tabbing from Title to Post (TinyMCE).
-    if ( tinyMCE.isMSIE )
@@ -771 +814 @@
-                e = e ? e : window.event;
-                if (e.keyCode == 9 && !e.shiftKey && !e.controlKey && !e.altKey) {
-selectedInstance
+getInstanceById('<?php echo $id; ?>')
-                    if(typeof i ==  'undefined')
-                        return true;
-                                
+               
-                    this.blur();
-                    i.contentWindow.focus();
@@ -786 +829 @@
-                e = e ? e : window.event;
-                if (e.keyCode == 9 && !e.shiftKey && !e.controlKey && !e.altKey) {
-selectedInstance
+getInstanceById('<?php echo $id; ?>')
-                    if(typeof i ==  'undefined')
-                        return true;
-                                
+               
-                    this.blur();
-                    i.contentWindow.focus();

trunk/wp-includes/js/autosave.js.php

@@ -73 +73 @@
-function autosave() {
-    var form = $('post');
+    var rich = tinyMCE.getInstanceById('content') ? true : false;
-
-    autosaveAjax = new sack();
-
-    /* Gotta do this up here so we can check the length when tinyMCE is in use */
-
+|| rich == false 
-        autosaveAjax.setVar("content", form.content.value);
-    } else {
@@ -111 +112 @@
-        autosaveAjax.setVar("excerpt", form.excerpt.value);     
-        
-
+|| rich == false 
-        autosaveAjax.setVar("content", form.content.value);
-    } else {

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

@@ -39 +39 @@
-                + '<input type="button" accesskey="u" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'Undo\',false);" />'
-                + '<input type="button" accesskey="y" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'Redo\',false);" />'
-                + '<input type="button" accesskey="e" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceCodeEditor\',false);" />'
-                + '<input type="button" accesskey="h" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'wpHelp\',false);" />'
-
+
+
-                + '</div>';
-                return buttons+hiddenControls;
@@ -242 +242 @@
-                // Remove anonymous, empty paragraphs.
-                content = content.replace(new RegExp('<p>(\\s|&nbsp;)*</p>', 'mg'), '');
-
+
-                // Handle table badness.
-                content = content.replace(new RegExp('<(table( [^>]*)?)>.*?<((tr|thead)( [^>]*)?)>', 'mg'), '<$1><$3>');
@@ -249 +249 @@
-                content = content.replace(new RegExp('</tr>.*?<(tr|/table)>', 'mg'), '</tr><$1>');
-                content = content.replace(new RegExp('<(/?(table|tbody|tr|th|td)[^>]*)>(\\s*|(<br ?/?>)*)*', 'g'), '<$1>');
-
+
-                // Pretty it up for the source editor.
-                var blocklist = 'blockquote|ul|ol|li|table|thead|tr|th|td|div|h\\d|pre|p';
-                content = content.replace(new RegExp('\\s*</('+blocklist+')>\\s*', 'mg'), '</$1>\n');
-\\s*
+
-                content = content.replace(new RegExp('<((li|/?tr|/?thead|/?tfoot)( [^>]*)?)>', 'g'), '\t<$1>');
-                content = content.replace(new RegExp('<((td|th)( [^>]*)?)>', 'g'), '\t\t<$1>');
@@ -295 +295 @@
-
-        // Get it ready for wpautop.
-[\\s]*<p>[\\s]*
-[\\s]*</p>[\\s]
-\\s*\\n*
+\\s*<p>
+\\s*</p>\\s
+
-        content = content.replace(new RegExp('\\s*<br ?/?>\\s*', 'gi'), '\n');
-
@@ -310 +310 @@
-        content = content.replace(new RegExp('\\s*(<p[^>]+>.*</p>)', 'mg'), '\n$1');
-
-
-
+
-        content = content.replace(new RegExp('\\s*$', ''), '');
-
@@ -469 +468 @@
-    }
-}
+
+function switchEditors(id) {
+    var inst = tinyMCE.getInstanceById(id);
+    var qt = document.getElementById('quicktags');
+    var H = document.getElementById('edButtonHTML');
+    var P = document.getElementById('edButtonPreview');
+    var pdr = document.getElementById('postdivrich');
+    var ta = document.getElementById(id);
+
+    if ( inst ) {
+        edToggle(H, P);
+
+        if ( tinyMCE.isMSIE && !tinyMCE.isOpera ) {
+            // IE rejects the later overflow assignment so we skip this step.
+            // Alternate code might be nice. Until then, IE reflows.
+        } else {
+            // Lock the fieldset's height to prevent reflow/flicker
+            pdr.style.height = pdr.clientHeight + 'px';
+            pdr.style.overflow = 'hidden';
+        }
+
+        // Save the coords of the bottom right corner of the rich editor
+        var table = document.getElementById(inst.editorId + '_parent').getElementsByTagName('table')[0];
+        var y1 = table.offsetTop + table.offsetHeight;
+
+        // Unload the rich editor
+        inst.triggerSave(false, false);
+        htm = inst.formElement.value;
+        tinyMCE.removeMCEControl(id);
+        document.getElementById(id).value = htm;
+        --tinyMCE.idCounter;
+
+        // Reveal Quicktags and textarea
+        qt.style.display = 'block';
+        ta.style.display = 'inline';
+
+        // Set the textarea height to match the rich editor
+        y2 = ta.offsetTop + ta.offsetHeight;
+        ta.style.height = (ta.clientHeight + y1 - y2) + 'px';
+
+        // Tweak the widths
+        ta.parentNode.style.paddingRight = '2px';
+
+        if ( tinyMCE.isMSIE && !tinyMCE.isOpera ) {
+        } else {
+            // Unlock the fieldset's height
+            pdr.style.height = 'auto';
+            pdr.style.overflow = 'display';
+        }
+    } else {
+        edToggle(P, H);
+        edCloseAllTags(); // :-(
+
+        if ( tinyMCE.isMSIE && !tinyMCE.isOpera ) {
+        } else {
+            // Lock the fieldset's height
+            pdr.style.height = pdr.clientHeight + 'px';
+            pdr.style.overflow = 'hidden';
+        }
+
+        // Hide Quicktags and textarea
+        qt.style.display = 'none';
+        ta.style.display = 'none';
+
+        // Tweak the widths
+        ta.parentNode.style.paddingRight = '0px';
+
+        // Load the rich editor with formatted html
+        if ( tinyMCE.isMSIE ) {
+            ta.value = wpautop(ta.value);
+            tinyMCE.addMCEControl(ta, id);
+        } else {
+            htm = wpautop(ta.value);
+            tinyMCE.addMCEControl(ta, id);
+            tinyMCE.getInstanceById(id).execCommand('mceSetContent', null, htm);
+        }
+
+        if ( tinyMCE.isMSIE && !tinyMCE.isOpera ) {
+        } else {
+            // Unlock the fieldset's height
+            pdr.style.height = 'auto';
+            pdr.style.overflow = 'display';
+        }
+    }
+}
+
+function edToggle(A, B) {
+    A.className = 'edButtonFore';
+    B.className = 'edButtonBack';
+
+    B.onclick = A.onclick;
+    A.onclick = null;
+}
+
+function wpautop(pee) {
+    pee = pee + "\n\n";
+    pee = pee.replace(new RegExp('<br />\\s*<br />', 'gi'), "\n\n");
+    pee = pee.replace(new RegExp('(<(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|address|math|p|h[1-6])[^>]*>)', 'gi'), "\n$1"); 
+    pee = pee.replace(new RegExp('(</(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|address|math|p|h[1-6])>)', 'gi'), "$1\n\n");
+    pee = pee.replace(new RegExp("\\r\\n|\\r", 'g'), "\n");
+    pee = pee.replace(new RegExp("\\n\\s*\\n+", 'g'), "\n\n");
+    pee = pee.replace(new RegExp('\n*([^\Z]+?)\\n{2}', 'mg'), "<p>$1</p>\n");
+    pee = pee.replace(new RegExp('<p>\\s*?</p>', 'gi'), '');
+    pee = pee.replace(new RegExp('<p>\\s*(</?(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|hr|pre|select|form|blockquote|address|math|p|h[1-6])[^>]*>)\\s*</p>', 'gi'), "$1");
+    pee = pee.replace(new RegExp("<p>(<li.+?)</p>", 'gi'), "$1");
+    pee = pee.replace(new RegExp('<p><blockquote([^>]*)>', 'gi'), "<blockquote$1><p>");
+    pee = pee.replace(new RegExp('</blockquote></p>', 'gi'), '</p></blockquote>');
+    pee = pee.replace(new RegExp('<p>\\s*(</?(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|hr|pre|select|form|blockquote|address|math|p|h[1-6])[^>]*>)', 'gi'), "$1");
+    pee = pee.replace(new RegExp('(</?(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|address|math|p|h[1-6])[^>]*>)\\s*</p>', 'gi'), "$1"); 
+    pee = pee.replace(new RegExp('\\s*\\n', 'gi'), "<br />\n");
+    pee = pee.replace(new RegExp('(</?(?:table|thead|tfoot|caption|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|address|math|p|h[1-6])[^>]*>)\\s*<br />', 'gi'), "$1");
+    pee = pee.replace(new RegExp('<br />(\\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)>)', 'gi'), '$1');
+    pee = pee.replace(new RegExp('^((?:&nbsp;)*)\\s', 'mg'), '$1&nbsp;');
+    //pee = pee.replace(new RegExp('(<pre.*?>)(.*?)</pre>!ise', " stripslashes('$1') .  stripslashes(clean_pre('$2'))  . '</pre>' "); // Hmm...
+    return pee;
+}

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

@@ -22 +22 @@
-
-    // Set up init variables
-b
+strong/-b[*],-em/-i
-    $valid_elements = apply_filters('mce_valid_elements', $valid_elements);
-
@@ -29 +29 @@
-    $plugins = implode($plugins, ',');
-
-code', '
+
-    $mce_buttons = implode($mce_buttons, ',');
-

trunk/wp-includes/script-loader.php

@@ -16 +16 @@
-        $this->add( 'quicktags', '/wp-includes/js/quicktags.js', false, '3517' );
-        $this->add( 'colorpicker', '/wp-includes/js/colorpicker.js', false, '3517' );
-815
-416
+921
+921
-        $this->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.5.0');
-183
+206
-        $this->add( 'wp-ajax', '/wp-includes/js/wp-ajax-js.php', array('prototype'), '4187');
-        $this->add( 'listman', '/wp-includes/js/list-manipulation-js.php', array('wp-ajax', 'fat'), '4187');