Changeset 6770

Timestamp:

02/09/2008 01:08:28 PM (17 years ago)

Author:

ryan

Message:

Move editor js to editor.js. fixes #5799

Location:

trunk

Files:

• wp-admin/js/editor.js (added)
• wp-admin/js/post.js (modified) (1 diff)
• wp-admin/page-new.php (modified) (1 diff)
• wp-admin/page.php (modified) (1 diff)
• wp-admin/post-new.php (modified) (1 diff)
• wp-admin/post.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (2 diffs)

trunk/wp-admin/js/post.js

@@ -133 +133 @@
     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;
-    }
-}

trunk/wp-admin/page-new.php

@@ -6 +6 @@
 wp_enqueue_script('autosave');
 wp_enqueue_script('page');
+wp_enqueue_script('editor');
 wp_enqueue_script('thickbox');
 wp_enqueue_script('media-upload');

trunk/wp-admin/page.php

@@ -54 +54 @@
 
     wp_enqueue_script('page');
+    wp_enqueue_script('editor');
     wp_enqueue_script('thickbox');
     wp_enqueue_script('media-upload');

trunk/wp-admin/post-new.php

@@ -6 +6 @@
 wp_enqueue_script('autosave');
 wp_enqueue_script('post');
+wp_enqueue_script('editor');
 wp_enqueue_script('thickbox');
 wp_enqueue_script('media-upload');

trunk/wp-admin/post.php

@@ -63 +63 @@
 
     wp_enqueue_script('post');
+    wp_enqueue_script('editor');
     wp_enqueue_script('thickbox');
     wp_enqueue_script('media-upload');

trunk/wp-includes/script-loader.php

@@ -34 +34 @@
 
         $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'), '20080129' );
-
+        $this->add( 'wp_tiny_mce', $mce_config, array('tiny_mce'), '20080208' );
+        
         $this->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.6');
 
@@ -180 +180 @@
                 'cancel' => __('Cancel'),
             ));
+            $this->add( 'editor', '/wp-admin/js/editor.js', array('tiny_mce'), '20080208' );
         }
     }