Ticket #5674: tmce3_extra.patch

wp-admin/js/post.js

@@ -178 +178 @@
         } );
         jQuery('.categorychecklist :checkbox').change( syncChecks ).filter( ':checked' ).change();
 });
+
+wpEditorInit = function() {
+    // Activate tinyMCE if it's the user's default editor
+    if ( ( 'undefined' == typeof wpTinyMCEConfig ) || 'tinymce' == wpTinyMCEConfig.defaultEditor ) {
+        document.getElementById('editorcontainer').style.padding = '0px';
+        tinyMCE.execCommand("mceAddControl", true, "content");
+        } else {
+        var H;
+        if ( H = tinymce.util.Cookie.getHash("TinyMCE_content_size") ) 
+            document.getElementById('content').style.height = H.ch - 30 + 'px';
+    }
+};
+
+switchEditors = {
+    
+    saveCallback : function(el, content, body) {
+    
+        document.getElementById(el).style.color = '#fff';
+        if ( tinyMCE.activeEditor.isHidden() ) 
+            content = document.getElementById(el).value;
+        else
+            content = this.pre_wpautop(content);
+
+        return content;
+    },
+
+    pre_wpautop : function(content) {
+           // We have a TON of cleanup to do.
+
+        // content = content.replace(/\n|\r/g, ' ');
+        // Remove anonymous, empty paragraphs.
+        content = content.replace(new RegExp('<p>(\\s|&nbsp;|<br>)*</p>', 'mg'), '');
+
+        // Mark </p> if it has any attributes.
+        content = content.replace(new RegExp('(<p[^>]+>.*?)</p>', 'mg'), '$1</p#>');
+
+        // Get it ready for wpautop.
+        content = content.replace(new RegExp('\\s*<p>', 'mgi'), '');
+        content = content.replace(new RegExp('\\s*</p>\\s*', 'mgi'), '\n\n');
+        content = content.replace(new RegExp('\\n\\s*\\n', 'mgi'), '\n\n');
+        content = content.replace(new RegExp('\\s*<br ?/?>\\s*', 'gi'), '\n');
+
+        // Fix some block element newline issues
+        var blocklist = 'blockquote|ul|ol|li|table|thead|tr|th|td|div|h\\d|pre';
+        content = content.replace(new RegExp('\\s*<(('+blocklist+') ?[^>]*)\\s*>', 'mg'), '\n<$1>');
+        content = content.replace(new RegExp('\\s*</('+blocklist+')>\\s*', 'mg'), '</$1>\n');
+        content = content.replace(new RegExp('<li>', 'g'), '\t<li>');
+                
+        if ( content.indexOf('<object') != -1 ) {
+            content = content.replace(new RegExp('\\s*<param([^>]*)>\\s*', 'g'), "<param$1>"); // no pee inside object/embed
+            content = content.replace(new RegExp('\\s*</embed>\\s*', 'g'), '</embed>');
+        }
+                
+        // Unmark special paragraph closing tags
+        content = content.replace(new RegExp('</p#>', 'g'), '</p>\n');
+        content = content.replace(new RegExp('\\s*(<p[^>]+>.*</p>)', 'mg'), '\n$1');
+
+        // Trim trailing whitespace
+        content = content.replace(new RegExp('\\s*$', ''), '');
+
+        // Hope.
+        return content;
+    },
+
+    go : function(id) {
+        var ed = tinyMCE.get(id);
+        var qt = document.getElementById('quicktags');
+        var H = document.getElementById('edButtonHTML');
+        var P = document.getElementById('edButtonPreview');
+        var ta = document.getElementById(id);
+        var ec = document.getElementById('editorcontainer');
+
+        if ( ! ed || ed.isHidden() ) {
+            ta.style.color = '#fff';
+        
+            this.edToggle(P, H);
+            edCloseAllTags(); // :-(
+
+            qt.style.display = 'none';
+            ec.style.padding = '0px';
+
+            ta.value = this.wpautop(ta.value);
+
+            if ( ed ) ed.show();
+            else tinyMCE.execCommand("mceAddControl", false, id);
+        
+            this.wpSetDefaultEditor( 'tinymce' );
+        } else {
+            this.edToggle(H, P);
+            tinyMCE.triggerSave();
+            ta.style.height = tinyMCE.activeEditor.contentAreaContainer.offsetHeight + 6 + 'px';
+
+            if ( tinymce.isIE6 ) 
+                ta.style.width = tinyMCE.activeEditor.contentAreaContainer.offsetWidth - 12 + 'px';
+
+            ed.hide();
+            ta.value = this.pre_wpautop(ta.value);
+        
+            qt.style.display = 'block';
+            ec.style.padding = '6px';
+            ta.style.color = '';
+
+            this.wpSetDefaultEditor( 'html' );
+        }
+    },
+
+    edToggle : function(A, B) {
+        A.className = 'active';
+        B.className = '';
+
+        B.onclick = A.onclick;
+        A.onclick = null;
+    },
+
+    wpSetDefaultEditor : function( editor ) {
+        try {
+            editor = escape( editor.toString() );
+        } catch(err) {
+            editor = 'tinymce';
+        }
+
+        var userID = document.getElementById('user-id');
+        var date = new Date();
+        date.setTime(date.getTime()+(10*365*24*60*60*1000));
+        document.cookie = "wordpress_editor_" + userID.value + "=" + editor + "; expires=" + date.toGMTString();
+    },
+
+    wpautop : function(pee) {
+        var blocklist = '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]';
+    
+        pee = pee + "\n\n";
+        pee = pee.replace(new RegExp('<br />\\s*<br />', 'gi'), "\n\n");
+        pee = pee.replace(new RegExp('(<(?:'+blocklist+')[^>]*>)', 'gi'), "\n$1"); 
+        pee = pee.replace(new RegExp('(</(?:'+blocklist+')>)', '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('([\\s\\S]+?)\\n\\n', 'mg'), "<p>$1</p>\n");
+        pee = pee.replace(new RegExp('<p>\\s*?</p>', 'gi'), '');
+        pee = pee.replace(new RegExp('<p>\\s*(</?(?:'+blocklist+')[^>]*>)\\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*(</?(?:'+blocklist+')[^>]*>)', 'gi'), "$1");
+        pee = pee.replace(new RegExp('(</?(?:'+blocklist+')[^>]*>)\\s*</p>', 'gi'), "$1"); 
+        pee = pee.replace(new RegExp('\\s*\\n', 'gi'), "<br />\n");
+        pee = pee.replace(new RegExp('(</?(?:'+blocklist+')[^>]*>)\\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;
+    }
+}

wp-admin/wp-admin.css

@@ -370 +370 @@
         width: 100%;
 }
 
-#postdivrich #content {
-        padding: 5px;
-        line-height: 140%;
+#editorcontainer #content {
+        padding: 0;
+        line-height: 150%;
+        border: 0 none;
 }
 
+#editorcontainer {
+        padding: 6px;
+}
+
 #currenttheme img {
         float: left;
         border: 1px solid #666;
@@ -394 +399 @@
 }
 
 #postdivrich #quicktags {
-        background: #f0f0ee;
+        background: #cee1ef;
         padding: 0;
-        border: 1px solid #ccc;
-        border-bottom: none;
+        border: 0 none;
 }
 
 #postdiv #quicktags {
@@ -1178 +1182 @@
         padding: 2px;
 }
 
-#poststuff .postbox, #titlediv {
+#poststuff .postbox, #titlediv, #poststuff .postarea {
         margin-left: 20px;
         border: 1px solid #ebebeb;
         border-right: 1px solid #ccc;
@@ -1188 +1192 @@
 }
 
 #poststuff .postarea {
-        margin-left: 20px;
         margin-right: 8px;
 }
 
@@ -1223 +1226 @@
 
 #poststuff #edButtonPreview, #poststuff #edButtonHTML {
         display: block;
-        height: 18px;
+        height: 20px;
         padding: 5px;
         margin-right: 8px;
         float: right;
@@ -1235 +1238 @@
         background: #cee1ef;
         color: #333;
         font-weight: bold;
-        -moz-border-radius: 2px;
+        -moz-border-radius-topright: 2px;
+        -moz-border-radius-topleft: 2px;
 }
 
 #poststuff #media-buttons {

wp-includes/general-template.php

@@ -928 +928 @@
         if ( user_can_richedit() ) :
                 $wp_default_editor = wp_default_editor();
                 $active = " class='active'";
-                $inactive = " onclick='switchEditors(\"$id\");'";
+                $inactive = " onclick='switchEditors.go(\"$id\");'";
 
                 if ( 'tinymce' == $wp_default_editor )
                         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.
-        ?>
-        <style type="text/css">
+                //      The following line moves the border so that the active button "attaches" to the toolbar. Only IE needs it. 
+        ?>      
+    <style type="text/css">
                 #postdivrich table, #postdivrich #quicktags {border-top: none;}
                 #quicktags {border-bottom: none; padding-bottom: 2px; margin-bottom: -1px;}
         </style>
+        
         <div id='editor-toolbar' style='display:none;'>
-                <div class='zerosize'><input accesskey='e' type='button' onclick='switchEditors("<?php echo $id; ?>")' /></div>
+                <div class='zerosize'><input accesskey='e' type='button' onclick='switchEditors.go("<?php echo $id; ?>")' /></div>
                 <a id='edButtonHTML'<?php echo 'html' == $wp_default_editor ? $active : $inactive; ?>><?php _e('HTML'); ?></a>
                 <a id='edButtonPreview'<?php echo 'tinymce' == $wp_default_editor ? $active : $inactive; ?>><?php _e('Visual'); ?></a>
 
@@ -973 +974 @@
         </script>
         <?php endif; // 'html' != $wp_default_editor
 
-        $the_editor = apply_filters('the_editor', "<div><textarea class='' $rows cols='40' name='$id' tabindex='2' id='$id'>%s</textarea></div>\n");
+        $the_editor = apply_filters('the_editor', "<div id='editorcontainer'><textarea class='' $rows cols='40' name='$id' tabindex='2' id='$id'>%s</textarea></div>\n");
         $the_editor_content = apply_filters('the_editor_content', $content);
 
         printf($the_editor, $the_editor_content);
@@ -986 +987 @@
         // If tinyMCE is defined.
         if ( typeof tinyMCE != 'undefined' ) {
         // This code is meant to allow tabbing from Title to Post (TinyMCE).
-                if ( tinyMCE.isMSIE ) {
-                        document.getElementById('<?php echo $prev_id; ?>').onkeydown = function (e) {
-                                if ( tinyMCE.idCounter == 0 )
-                                        return true;
-                                e = e ? e : window.event;
-                                if (e.keyCode == 9 && !e.shiftKey && !e.controlKey && !e.altKey) {
-                                        var i = tinyMCE.getInstanceById('<?php echo $id; ?>');
-                                        if(typeof i ==  'undefined')
-                                                return true;
-                                        tinyMCE.execCommand("mceStartTyping");
-                                        this.blur();
-                                        i.contentWindow.focus();
-                                        e.returnValue = false;
-                                        return false;
-                                }
-                        }
-                } else {
-                        document.getElementById('<?php echo $prev_id; ?>').onkeypress = function (e) {
-                                if ( tinyMCE.idCounter == 0 )
-                                        return true;
-                                e = e ? e : window.event;
-                                if (e.keyCode == 9 && !e.shiftKey && !e.controlKey && !e.altKey) {
-                                        var i = tinyMCE.getInstanceById('<?php echo $id; ?>');
-                                        if(typeof i ==  'undefined')
-                                                return true;
-                                        tinyMCE.execCommand("mceStartTyping");
-                                        this.blur();
-                                        i.contentWindow.focus();
-                                        e.returnValue = false;
-                                        return false;
-                                }
-                        }
-                }
+        document.getElementById('<?php echo $prev_id; ?>').onkeydown = function (e) {
+            e = e || window.event;
+            if (e.keyCode == 9 && !e.shiftKey && !e.controlKey && !e.altKey) {
+                if ( tinyMCE.activeEditor ) {
+                    e = null;
+                    if ( tinyMCE.activeEditor.isHidden() ) return true;
+                    tinyMCE.activeEditor.focus();
+                    return false;
+                }
+                return true;
+            }
+        }
         }
         <?php endif; ?>
         //-->

wp-includes/js/autosave.js

@@ -82 +82 @@
 }
 
 function autosave() {
-        var rich = ((typeof tinyMCE != "undefined") && tinyMCE.getInstanceById('content')) ? true : false;
+        var rich = ( (typeof tinyMCE != "undefined") && tinyMCE.activeEditor && ! tinyMCE.activeEditor.isHidden() ) ? true : false;
         var post_data = {
                         action: "autosave",
                         post_ID:  jQuery("#post_ID").val() || 0,
@@ -93 +93 @@
                 };
 
         /* Gotta do this up here so we can check the length when tinyMCE is in use */
-        if ( typeof tinyMCE == "undefined" || tinyMCE.configs.length < 1 || rich == false ) {
-                post_data["content"] = jQuery("#content").val();
-        } else {
+        if ( rich ) {
                 // Don't run while the TinyMCE spellcheck is on.
-                if(tinyMCE.selectedInstance.spellcheckerOn) return;
-                tinyMCE.wpTriggerSave();
-                post_data["content"] = jQuery("#content").val();
-        }
+                if ( tinyMCE.activeEditor.plugins.spellchecker && tinyMCE.activeEditor.plugins.spellchecker.active ) return;
+                tinyMCE.triggerSave();
+        } 
+        
+    post_data["content"] = jQuery("#content").val();
 
         if(post_data["post_title"].length==0 || post_data["content"].length==0 || post_data["post_title"] + post_data["content"] == autosaveLast) {
                 return;
@@ -122 +121 @@
         if( jQuery("#excerpt"))
                 post_data["excerpt"] = jQuery("#excerpt").val();
 
-        if ( typeof tinyMCE == "undefined" || tinyMCE.configs.length < 1 || rich == false ) {
-                post_data["content"] = jQuery("#content").val();
-        } else {
-                tinyMCE.wpTriggerSave();
-                post_data["content"] = jQuery("#content").val();
-        }
+        if ( rich ) 
+        tinyMCE.triggerSave();
+    
+        post_data["content"] = jQuery("#content").val();
 
         if(parseInt(post_data["post_ID"]) < 1) {
                 post_data["temp_ID"] = post_data["post_ID"];

wp-includes/script-loader.php

@@ -30 +30 @@
                 $this->add( 'colorpicker', '/wp-includes/js/colorpicker.js', false, '3517' );
 
                 // Modify this version when tinyMCE plugins are changed
-                $this->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_gzip.php', false, '20080105' );
+                $this->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_gzip.php', false, '20080129' );
 
                 $mce_config = apply_filters('tiny_mce_config_url', '/wp-includes/js/tinymce/tiny_mce_config.php');
-                $this->add( 'wp_tiny_mce', $mce_config, array('tiny_mce'), '20080105' );
+                $this->add( 'wp_tiny_mce', $mce_config, array('tiny_mce'), '20080129' );
 
                 $this->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.6');