Changeset 6694

Timestamp:

01/31/2008 06:10:46 PM (17 years ago)

Author:

ryan

Message:

TinyMCE 3.0 Final from azaozz. see #5674

Location:

trunk

Files:

• wp-admin/js/post.js (modified) (1 diff)
• wp-admin/wp-admin.css (modified) (6 diffs)
• wp-includes/general-template.php (modified) (3 diffs)
• wp-includes/js/autosave.js (modified) (3 diffs)
• wp-includes/js/tinymce/plugins/autosave/editor_plugin.js (modified) (1 diff)
• wp-includes/js/tinymce/plugins/directionality/editor_plugin.js (modified) (1 diff)
• wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js (modified) (1 diff)
• wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm (modified) (2 diffs)
• wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js (modified) (1 diff)
• wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif (modified) (previous)
• wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/drag.gif (added)
• wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css (modified) (1 diff)
• wp-includes/js/tinymce/plugins/media/editor_plugin.js (modified) (1 diff)
• wp-includes/js/tinymce/plugins/media/media.htm (modified) (3 diffs)
• wp-includes/js/tinymce/plugins/paste/editor_plugin.js (modified) (1 diff)
• wp-includes/js/tinymce/plugins/paste/pastetext.htm (modified) (2 diffs)
• wp-includes/js/tinymce/plugins/paste/pasteword.htm (modified) (1 diff)
• wp-includes/js/tinymce/plugins/safari/editor_plugin.js (modified) (1 diff)
• wp-includes/js/tinymce/plugins/wordpress/css (added)
• wp-includes/js/tinymce/plugins/wordpress/css/content.css (added)
• wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js (modified) (1 diff)
• wp-includes/js/tinymce/plugins/wordpress/img (added)
• wp-includes/js/tinymce/plugins/wordpress/img/help.gif (added)
• wp-includes/js/tinymce/plugins/wordpress/img/more.gif (added)
• wp-includes/js/tinymce/plugins/wordpress/img/more_bug.gif (added)
• wp-includes/js/tinymce/plugins/wordpress/img/page.gif (added)
• wp-includes/js/tinymce/plugins/wordpress/img/page_bug.gif (added)
• wp-includes/js/tinymce/plugins/wordpress/img/toolbars.gif (added)
• wp-includes/js/tinymce/plugins/wordpress/img/trans.gif (added)
• wp-includes/js/tinymce/plugins/wordpress/js (added)
• wp-includes/js/tinymce/plugins/wordpress/langs/en.js (modified) (1 diff)
• wp-includes/js/tinymce/themes/advanced/anchor.htm (modified) (2 diffs)
• wp-includes/js/tinymce/themes/advanced/charmap.htm (modified) (1 diff)
• wp-includes/js/tinymce/themes/advanced/editor_template.js (modified) (1 diff)
• wp-includes/js/tinymce/themes/advanced/image.htm (modified) (2 diffs)
• wp-includes/js/tinymce/themes/advanced/img/fm.gif (added)
• wp-includes/js/tinymce/themes/advanced/img/gotmoxie.png (added)
• wp-includes/js/tinymce/themes/advanced/img/sflogo.png (added)
• wp-includes/js/tinymce/themes/advanced/js/charmap.js (modified) (1 diff)
• wp-includes/js/tinymce/themes/advanced/link.htm (modified) (2 diffs)
• wp-includes/js/tinymce/themes/advanced/skins/default/content.css (modified) (1 diff)
• wp-includes/js/tinymce/themes/advanced/skins/default/ui.css (modified) (2 diffs)
• wp-includes/js/tinymce/themes/advanced/skins/o2k7/content.css (modified) (1 diff)
• wp-includes/js/tinymce/themes/advanced/skins/o2k7/ui.css (modified) (2 diffs)
• wp-includes/js/tinymce/themes/advanced/skins/wp_theme (added)
• wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css (added)
• wp-includes/js/tinymce/themes/advanced/skins/wp_theme/dialog.css (added)
• wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img (added)
• wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/butt2.png (added)
• wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/button_bg.png (added)
• wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/down_arrow.gif (added)
• wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/fade-butt.png (added)
• wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/separator.gif (added)
• wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css (added)
• wp-includes/js/tinymce/themes/advanced/source_editor.htm (modified) (2 diffs)
• wp-includes/js/tinymce/tiny_mce.js (modified) (1 diff)
• wp-includes/js/tinymce/tiny_mce_config.php (modified) (3 diffs)
• wp-includes/js/tinymce/tiny_mce_gzip.php (modified) (4 diffs)
• wp-includes/js/tinymce/tiny_mce_popup.js (modified) (2 diffs)
• wp-includes/js/tinymce/wordpress.css (added)
• wp-includes/js/tinymce/wp-mce-help.php (modified) (6 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/js/post.js

@@ -179 +179 @@
     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/wp-admin.css

@@ -371 +371 @@
 }
 
-#postdivrich #content {
-    padding: 5px;
-    line-height: 140%;
+#editorcontainer #content {
+    padding: 0;
+    line-height: 150%;
+    border: 0 none;
+}
+
+#editorcontainer {
+    padding: 6px;
 }
 
@@ -395 +400 @@
 
 #postdivrich #quicktags {
-    background: #f0f0ee;
-    padding: 0;
-    border: 1px solid #ccc;
-    border-bottom: none;
+    background: #cee1ef;
+    padding: 0;
+    border: 0 none;
 }
 
@@ -1179 +1183 @@
 }
 
-#poststuff .postbox, #titlediv {
+#poststuff .postbox, #titlediv, #poststuff .postarea {
     margin-left: 20px;
     border: 1px solid #ebebeb;
@@ -1189 +1193 @@
 
 #poststuff .postarea {
-    margin-left: 20px;
     margin-right: 8px;
 }
@@ -1224 +1227 @@
 #poststuff #edButtonPreview, #poststuff #edButtonHTML {
     display: block;
-    height: 18px;
+    height: 20px;
     padding: 5px;
     margin-right: 8px;
@@ -1236 +1239 @@
     color: #333;
     font-weight: bold;
-    -moz-border-radius: 2px;
+    -moz-border-radius-topright: 2px;
+    -moz-border-radius-topleft: 2px;
 }
 

trunk/wp-includes/general-template.php

@@ -929 +929 @@
         $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>
@@ -974 +975 @@
     <?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);
 
@@ -987 +988 @@
     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; ?>

trunk/wp-includes/js/autosave.js

@@ -83 +83 @@
 
 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",
@@ -94 +94 @@
 
     /* 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) {
@@ -123 +122 @@
         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) {

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

@@ -1 @@
-/**
- * $Id$
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-    tinymce.create('tinymce.plugins.AutoSavePlugin', {
-        init : function(ed, url) {
-            var t = this;
-
-            t.editor = ed;
-
-            window.onbeforeunload = tinymce.plugins.AutoSavePlugin._beforeUnloadHandler;
-        },
-
-        getInfo : function() {
-            return {
-                longname : 'Auto save',
-                author : 'Moxiecode Systems AB',
-                authorurl : 'http://tinymce.moxiecode.com',
-                infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autosave',
-                version : tinymce.majorVersion + "." + tinymce.minorVersion
-            };
-        },
-
-        // Private plugin internal methods
-
-        'static' : {
-            _beforeUnloadHandler : function() {
-                var msg;
-
-                tinymce.each(tinyMCE.editors, function(ed) {
-                    if (ed.getParam("fullscreen_is_enabled"))
-                        return;
-
-                    if (ed.isDirty()) {
-                        msg = ed.getLang("autosave.unload_msg");
-                        return false;
-                    }
-                });
-
-                return msg;
-            }
-        }
-    });
-
-    // Register plugin
-    tinymce.PluginManager.add('autosave', tinymce.plugins.AutoSavePlugin);
-})();
+(function(){tinymce.create('tinymce.plugins.AutoSavePlugin',{init:function(ed,url){var t=this;t.editor=ed;window.onbeforeunload=tinymce.plugins.AutoSavePlugin._beforeUnloadHandler;},getInfo:function(){return{longname:'Auto save',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autosave',version:tinymce.majorVersion+"."+tinymce.minorVersion};},'static':{_beforeUnloadHandler:function(){var msg;tinymce.each(tinyMCE.editors,function(ed){if(ed.getParam("fullscreen_is_enabled"))return;if(ed.isDirty()){msg=ed.getLang("autosave.unload_msg");return false;}});return msg;}}});tinymce.PluginManager.add('autosave',tinymce.plugins.AutoSavePlugin);})();

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

@@ -1 @@
-/**
- * $Id: editor_plugin_src.js 520 2008-01-07 16:30:32Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-    tinymce.create('tinymce.plugins.Directionality', {
-        init : function(ed, url) {
-            var t = this;
-
-            t.editor = ed;
-
-            ed.addCommand('mceDirectionLTR', function() {
-                var e = ed.dom.getParent(ed.selection.getNode(), ed.dom.isBlock);
-
-                if (e) {
-                    if (ed.dom.getAttrib(e, "dir") != "ltr")
-                        ed.dom.setAttrib(e, "dir", "ltr");
-                    else
-                        ed.dom.setAttrib(e, "dir", "");
-                }
-
-                ed.nodeChanged();
-            });
-
-            ed.addCommand('mceDirectionRTL', function() {
-                var e = ed.dom.getParent(ed.selection.getNode(), ed.dom.isBlock);
-
-                if (e) {
-                    if (ed.dom.getAttrib(e, "dir") != "rtl")
-                        ed.dom.setAttrib(e, "dir", "rtl");
-                    else
-                        ed.dom.setAttrib(e, "dir", "");
-                }
-
-                ed.nodeChanged();
-            });
-
-            ed.addButton('ltr', {title : 'directionality.ltr_desc', cmd : 'mceDirectionLTR'});
-            ed.addButton('rtl', {title : 'directionality.rtl_desc', cmd : 'mceDirectionRTL'});
-
-            ed.onNodeChange.add(t._nodeChange, t);
-        },
-
-        getInfo : function() {
-            return {
-                longname : 'Directionality',
-                author : 'Moxiecode Systems AB',
-                authorurl : 'http://tinymce.moxiecode.com',
-                infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/directionality',
-                version : tinymce.majorVersion + "." + tinymce.minorVersion
-            };
-        },
-
-        // Private methods
-
-        _nodeChange : function(ed, cm, n) {
-            var dom = ed.dom, dir;
-
-            n = dom.getParent(n, dom.isBlock);
-            if (!n) {
-                cm.setDisabled('ltr', 1);
-                cm.setDisabled('rtl', 1);
-                return;
-            }
-
-            dir = dom.getAttrib(n, 'dir');
-            cm.setActive('ltr', dir == "ltr");
-            cm.setDisabled('ltr', 0);
-            cm.setActive('rtl', dir == "rtl");
-            cm.setDisabled('rtl', 0);
-        }
-    });
-
-    // Register plugin
-    tinymce.PluginManager.add('directionality', tinymce.plugins.Directionality);
-})();
+(function(){tinymce.create('tinymce.plugins.Directionality',{init:function(ed,url){var t=this;t.editor=ed;ed.addCommand('mceDirectionLTR',function(){var e=ed.dom.getParent(ed.selection.getNode(),ed.dom.isBlock);if(e){if(ed.dom.getAttrib(e,"dir")!="ltr")ed.dom.setAttrib(e,"dir","ltr");else ed.dom.setAttrib(e,"dir","");}ed.nodeChanged();});ed.addCommand('mceDirectionRTL',function(){var e=ed.dom.getParent(ed.selection.getNode(),ed.dom.isBlock);if(e){if(ed.dom.getAttrib(e,"dir")!="rtl")ed.dom.setAttrib(e,"dir","rtl");else ed.dom.setAttrib(e,"dir","");}ed.nodeChanged();});ed.addButton('ltr',{title:'directionality.ltr_desc',cmd:'mceDirectionLTR'});ed.addButton('rtl',{title:'directionality.rtl_desc',cmd:'mceDirectionRTL'});ed.onNodeChange.add(t._nodeChange,t);},getInfo:function(){return{longname:'Directionality',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/directionality',version:tinymce.majorVersion+"."+tinymce.minorVersion};},_nodeChange:function(ed,cm,n){var dom=ed.dom,dir;n=dom.getParent(n,dom.isBlock);if(!n){cm.setDisabled('ltr',1);cm.setDisabled('rtl',1);return;}dir=dom.getAttrib(n,'dir');cm.setActive('ltr',dir=="ltr");cm.setDisabled('ltr',0);cm.setActive('rtl',dir=="rtl");cm.setDisabled('rtl',0);}});tinymce.PluginManager.add('directionality',tinymce.plugins.Directionality);})();

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

@@ -1 @@
-/**
- * $Id: editor_plugin_src.js 544 2008-01-17 13:07:00Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-    var DOM = tinymce.DOM;
-
-    tinymce.create('tinymce.plugins.FullScreenPlugin', {
-        init : function(ed, url) {
-            var t = this, s = {}, vp;
-
-            t.editor = ed;
-
-            // Register commands
-            ed.addCommand('mceFullScreen', function() {
-                var win, de = document.documentElement;
-
-                if (ed.getParam('fullscreen_is_enabled')) {
-                    if (ed.getParam('fullscreen_new_window'))
-                        closeFullscreen(); // Call to close in new window
-                    else {
-                        window.setTimeout(function() {
-                            tinyMCE.get(ed.getParam('fullscreen_editor_id')).setContent(ed.getContent({format : 'raw'}), {format : 'raw'});
-                            tinyMCE.remove(ed);
-                            DOM.remove('mce_fullscreen_container');
-                            de.style.overflow = ed.getParam('fullscreen_html_overflow');
-                            DOM.setStyle(document.body, 'overflow', ed.getParam('fullscreen_overflow'));
-                            window.scrollTo(ed.getParam('fullscreen_scrollx'), ed.getParam('fullscreen_scrolly'));
-                        }, 10);
-                    }
-
-                    return;
-                }
-
-                if (ed.getParam('fullscreen_new_window')) {
-                    win = window.open(url + "/fullscreen.htm", "mceFullScreenPopup", "fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=no,left=0,top=0,width=" + screen.availWidth + ",height=" + screen.availHeight);
-                    try {
-                        win.resizeTo(screen.availWidth, screen.availHeight);
-                    } catch (e) {
-                        // Ignore
-                    }
-                } else {
-                    s.fullscreen_overflow = DOM.getStyle(document.body, 'overflow', 1) || 'auto';
-                    s.fullscreen_html_overflow = DOM.getStyle(de, 'overflow', 1);
-                    vp = DOM.getViewPort();
-                    s.fullscreen_scrollx = vp.x;
-                    s.fullscreen_scrolly = vp.y;
-
-                    // Fixes an Opera bug where the scrollbars doesn't reappear
-                    if (tinymce.isOpera && s.fullscreen_overflow == 'visible')
-                        s.fullscreen_overflow = 'auto';
-
-                    // Fixes an IE bug where horizontal scrollbars would appear
-                    if (tinymce.isIE && s.fullscreen_overflow == 'scroll')
-                        s.fullscreen_overflow = 'auto';
-
-                    if (s.fullscreen_overflow == '0px')
-                        s.fullscreen_overflow = '';
-
-                    DOM.setStyle(document.body, 'overflow', 'hidden');
-                    de.style.overflow = 'hidden'; //Fix for IE6/7
-                    vp = DOM.getViewPort();
-                    window.scrollTo(0, 0);
-
-                    if (tinymce.isIE)
-                        vp.h -= 1;
-
-                    n = DOM.add(document.body, 'div', {id : 'mce_fullscreen_container', style : 'position:absolute;top:0;left:0;width:' + vp.w + 'px;height:' + vp.h + 'px;z-index:150;'});
-                    DOM.add(n, 'div', {id : 'mce_fullscreen'});
-
-                    tinymce.each(ed.settings, function(v, n) {
-                        s[n] = v;
-                    });
-
-                    s.id = 'mce_fullscreen';
-                    s.width = n.clientWidth;
-                    s.height = n.clientHeight - 15;
-                    s.fullscreen_is_enabled = true;
-                    s.fullscreen_editor_id = ed.id;
-                    s.theme_advanced_resizing = false;
-
-                    tinymce.each(ed.getParam('fullscreen_settings'), function(v, k) {
-                        s[k] = v;
-                    });
-
-                    if (s.theme_advanced_toolbar_location === 'external')
-                        s.theme_advanced_toolbar_location = 'top';
-
-                    t.fullscreenEditor = new tinymce.Editor('mce_fullscreen', s);
-                    t.fullscreenEditor.onInit.add(function() {
-                        t.fullscreenEditor.setContent(ed.getContent({format : 'raw', no_events : 1}), {format : 'raw', no_events : 1});
-                    });
-
-                    t.fullscreenEditor.render();
-                    tinyMCE.add(t.fullscreenEditor);
-
-                    t.fullscreenElement = new tinymce.dom.Element('mce_fullscreen_container');
-                    t.fullscreenElement.update();
-                    //document.body.overflow = 'hidden';
-                }
-            });
-
-            // Register buttons
-            ed.addButton('fullscreen', {title : 'fullscreen.desc', cmd : 'mceFullScreen'});
-
-            ed.onNodeChange.add(function(ed, cm) {
-                cm.setActive('fullscreen', ed.getParam('fullscreen_is_enabled'));
-            });
-        },
-
-        getInfo : function() {
-            return {
-                longname : 'Fullscreen',
-                author : 'Moxiecode Systems AB',
-                authorurl : 'http://tinymce.moxiecode.com',
-                infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen',
-                version : tinymce.majorVersion + "." + tinymce.minorVersion
-            };
-        }
-    });
-
-    // Register plugin
-    tinymce.PluginManager.add('fullscreen', tinymce.plugins.FullScreenPlugin);
-})();
+(function(){var DOM=tinymce.DOM;tinymce.create('tinymce.plugins.FullScreenPlugin',{init:function(ed,url){var t=this,s={},vp;t.editor=ed;ed.addCommand('mceFullScreen',function(){var win,de=document.documentElement;if(ed.getParam('fullscreen_is_enabled')){if(ed.getParam('fullscreen_new_window'))closeFullscreen();else{window.setTimeout(function(){tinyMCE.get(ed.getParam('fullscreen_editor_id')).setContent(ed.getContent({format:'raw'}),{format:'raw'});tinyMCE.remove(ed);DOM.remove('mce_fullscreen_container');de.style.overflow=ed.getParam('fullscreen_html_overflow');DOM.setStyle(document.body,'overflow',ed.getParam('fullscreen_overflow'));window.scrollTo(ed.getParam('fullscreen_scrollx'),ed.getParam('fullscreen_scrolly'));},10);}return;}if(ed.getParam('fullscreen_new_window')){win=window.open(url+"/fullscreen.htm","mceFullScreenPopup","fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=no,left=0,top=0,width="+screen.availWidth+",height="+screen.availHeight);try{win.resizeTo(screen.availWidth,screen.availHeight);}catch(e){}}else{s.fullscreen_overflow=DOM.getStyle(document.body,'overflow',1)||'auto';s.fullscreen_html_overflow=DOM.getStyle(de,'overflow',1);vp=DOM.getViewPort();s.fullscreen_scrollx=vp.x;s.fullscreen_scrolly=vp.y;if(tinymce.isOpera&&s.fullscreen_overflow=='visible')s.fullscreen_overflow='auto';if(tinymce.isIE&&s.fullscreen_overflow=='scroll')s.fullscreen_overflow='auto';if(s.fullscreen_overflow=='0px')s.fullscreen_overflow='';DOM.setStyle(document.body,'overflow','hidden');de.style.overflow='hidden';vp=DOM.getViewPort();window.scrollTo(0,0);if(tinymce.isIE)vp.h-=1;n=DOM.add(document.body,'div',{id:'mce_fullscreen_container',style:'position:absolute;top:0;left:0;width:'+vp.w+'px;height:'+vp.h+'px;z-index:150;'});DOM.add(n,'div',{id:'mce_fullscreen'});tinymce.each(ed.settings,function(v,n){s[n]=v;});s.id='mce_fullscreen';s.width=n.clientWidth;s.height=n.clientHeight-15;s.fullscreen_is_enabled=true;s.fullscreen_editor_id=ed.id;s.theme_advanced_resizing=false;tinymce.each(ed.getParam('fullscreen_settings'),function(v,k){s[k]=v;});if(s.theme_advanced_toolbar_location==='external')s.theme_advanced_toolbar_location='top';t.fullscreenEditor=new tinymce.Editor('mce_fullscreen',s);t.fullscreenEditor.onInit.add(function(){t.fullscreenEditor.setContent(ed.getContent({format:'raw',no_events:1}),{format:'raw',no_events:1});});t.fullscreenEditor.render();tinyMCE.add(t.fullscreenEditor);t.fullscreenElement=new tinymce.dom.Element('mce_fullscreen_container');t.fullscreenElement.update();}});ed.addButton('fullscreen',{title:'fullscreen.desc',cmd:'mceFullScreen'});ed.onNodeChange.add(function(ed,cm){cm.setActive('fullscreen',ed.getParam('fullscreen_is_enabled'));});},getInfo:function(){return{longname:'Fullscreen',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen',version:tinymce.majorVersion+"."+tinymce.minorVersion};}});tinymce.PluginManager.add('fullscreen',tinymce.plugins.FullScreenPlugin);})();

trunk/wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm

@@ +1 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-    <title>{$lang_fullscreen_title}</title>
+    <title></title>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
     <script type="text/javascript" src="../../tiny_mce.js"></script>
@@ -70 +71 @@
             return false;
         }
-
-        function init() {
-            var e = document.getElementById('fullscreenarea');
-            e.value = window.opener.tinyMCE.activeEditor.getContent({format : 'raw'});
-            settings['width'] = e.clientWidth;
-            settings['height'] = e.clientHeight;
-            tinyMCE.init(settings);
-        }
     </script>
     <base target="_self" />
 </head>
-<body onload="init();" style="margin:0; overflow:hidden; height:100%;" scrolling="no" scroll="no">
-<form onsubmit="doParentSubmit();" style="height: 100%">
+<body style="margin:0;overflow:hidden;width:100%;height:100%" scrolling="no" scroll="no">
+<form onsubmit="doParentSubmit();">
 <textarea id="fullscreenarea" style="width:100%; height:100%"></textarea>
 </form>
+
+<script type="text/javascript">
+        var e = document.getElementById('fullscreenarea');
+        e.value = window.opener.tinyMCE.activeEditor.getContent({format : 'raw'});
+        settings['width'] = window.innerWidth || document.body.clientWidth;
+        settings['height'] = (window.innerHeight || document.body.clientHeight) - 18;
+        tinyMCE.init(settings);
+</script>
+
 </body>
 </html>

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

@@ -1 @@
-/**
- * $Id: editor_plugin_src.js 520 2008-01-07 16:30:32Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-    var DOM = tinymce.DOM, Element = tinymce.dom.Element, Event = tinymce.dom.Event, each = tinymce.each, is = tinymce.is;
-
-    tinymce.create('tinymce.plugins.InlinePopups', {
-        init : function(ed, url) {
-            // Replace window manager
-            ed.onBeforeRenderUI.add(function() {
-                ed.windowManager = new tinymce.InlineWindowManager(ed);
-                DOM.loadCSS(url + '/skins/' + (ed.settings.inlinepopups_skin || 'clearlooks2') + "/window.css");
-            });
-        },
-
-        getInfo : function() {
-            return {
-                longname : 'InlinePopups',
-                author : 'Moxiecode Systems AB',
-                authorurl : 'http://tinymce.moxiecode.com',
-                infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/inlinepopups',
-                version : tinymce.majorVersion + "." + tinymce.minorVersion
-            };
-        }
-    });
-
-    tinymce.create('tinymce.InlineWindowManager:tinymce.WindowManager', {
-        InlineWindowManager : function(ed) {
-            var t = this;
-
-            t.parent(ed);
-            t.zIndex = 1000;
-        },
-
-        open : function(f, p) {
-            var t = this, id, opt = '', ed = t.editor, dw = 0, dh = 0, vp, po, mdf, clf, we, w;
-
-            f = f || {};
-            p = p || {};
-
-            // Run native windows
-            if (!f.inline)
-                return t.parent(f, p);
-
-            t.bookmark = ed.selection.getBookmark('simple');
-            id = DOM.uniqueId();
-            vp = DOM.getViewPort();
-            f.width = parseInt(f.width || 320);
-            f.height = parseInt(f.height || 240) + (tinymce.isIE ? 8 : 0);
-            f.min_width = parseInt(f.min_width || 150);
-            f.min_height = parseInt(f.min_height || 100);
-            f.max_width = parseInt(f.max_width || 2000);
-            f.max_height = parseInt(f.max_height || 2000);
-            f.left = f.left || Math.round(Math.max(vp.x, vp.x + (vp.w / 2.0) - (f.width / 2.0)));
-            f.top = f.top || Math.round(Math.max(vp.y, vp.y + (vp.h / 2.0) - (f.height / 2.0)));
-            f.movable = f.resizable = true;
-            p.mce_width = f.width;
-            p.mce_height = f.height;
-            p.mce_inline = true;
-            p.mce_window_id = id;
-
-            // Transpose
-//          po = DOM.getPos(ed.getContainer());
-//          f.left -= po.x;
-//          f.top -= po.y;
-
-            t.features = f;
-            t.params = p;
-            t.onOpen.dispatch(t, f, p);
-
-            if (f.type) {
-                opt += ' modal ' + f.type;
-                f.resizable = false;
-            }
-
-            if (f.statusbar)
-                opt += ' statusbar';
-
-            if (f.resizable)
-                opt += ' resizable';
-
-            if (f.minimizable)
-                opt += ' minimizable';
-
-            if (f.maximizable)
-                opt += ' maximizable';
-
-            if (f.movable)
-                opt += ' movable';
-
-            // Create DOM objects
-            t._addAll(document.body, 
-                ['div', {id : id, 'class' : ed.settings.inlinepopups_skin || 'clearlooks2', style : 'width:100px;height:100px'}, 
-                    ['div', {id : id + '_wrapper', 'class' : 'wrapper' + opt},
-                        ['div', {id : id + '_top', 'class' : 'top'}, 
-                            ['div', {'class' : 'left'}],
-                            ['div', {'class' : 'center'}],
-                            ['div', {'class' : 'right'}],
-                            ['span', {id : id + '_title'}, f.title || '']
-                        ],
-
-                        ['div', {id : id + '_middle', 'class' : 'middle'}, 
-                            ['div', {id : id + '_left', 'class' : 'left'}],
-                            ['span', {id : id + '_content'}],
-                            ['div', {id : id + '_right', 'class' : 'right'}]
-                        ],
-
-                        ['div', {id : id + '_bottom', 'class' : 'bottom'},
-                            ['div', {'class' : 'left'}],
-                            ['div', {'class' : 'center'}],
-                            ['div', {'class' : 'right'}],
-                            ['span', {id : id + '_status'}, 'Content']
-                        ],
-
-                        ['a', {'class' : 'move', href : 'javascript:;'}],
-                        ['a', {'class' : 'min', href : 'javascript:;', onmousedown : 'return false;'}],
-                        ['a', {'class' : 'max', href : 'javascript:;', onmousedown : 'return false;'}],
-                        ['a', {'class' : 'med', href : 'javascript:;', onmousedown : 'return false;'}],
-                        ['a', {'class' : 'close', href : 'javascript:;', onmousedown : 'return false;'}],
-                        ['a', {id : id + '_resize_n', 'class' : 'resize resize-n', href : 'javascript:;'}],
-                        ['a', {id : id + '_resize_s', 'class' : 'resize resize-s', href : 'javascript:;'}],
-                        ['a', {id : id + '_resize_w', 'class' : 'resize resize-w', href : 'javascript:;'}],
-                        ['a', {id : id + '_resize_e', 'class' : 'resize resize-e', href : 'javascript:;'}],
-                        ['a', {id : id + '_resize_nw', 'class' : 'resize resize-nw', href : 'javascript:;'}],
-                        ['a', {id : id + '_resize_ne', 'class' : 'resize resize-ne', href : 'javascript:;'}],
-                        ['a', {id : id + '_resize_sw', 'class' : 'resize resize-sw', href : 'javascript:;'}],
-                        ['a', {id : id + '_resize_se', 'class' : 'resize resize-se', href : 'javascript:;'}]
-                    ]
-                ]
-            );
-
-            DOM.setStyles(id, {top : -10000, left : -10000});
-
-            // Fix gecko rendering bug, where the editors iframe messed with window contents
-            if (tinymce.isGecko)
-                DOM.setStyle(id, 'overflow', 'auto');
-
-            // Measure borders
-            if (!f.type) {
-                dw += DOM.get(id + '_left').clientWidth;
-                dw += DOM.get(id + '_right').clientWidth;
-                dh += DOM.get(id + '_top').clientHeight;
-                dh += DOM.get(id + '_bottom').clientHeight;
-            }
-
-            // Resize window
-            DOM.setStyles(id, {top : f.top, left : f.left, width : f.width + dw, height : f.height + dh});
-
-            if (!f.type) {
-                DOM.add(id + '_content', 'iframe', {id : id + '_ifr', src : 'javascript:""', frameBorder : 0, style : 'border:0;width:10px;height:10px'});
-                DOM.setStyles(id + '_ifr', {width : f.width, height : f.height});
-                DOM.setAttrib(id + '_ifr', 'src', f.url || f.file);
-            } else {
-                DOM.add(id + '_wrapper', 'a', {id : id + '_ok', 'class' : 'button ok', href : 'javascript:;', onmousedown : 'return false;'}, 'Ok');
-
-                if (f.type == 'confirm')
-                    DOM.add(id + '_wrapper', 'a', {'class' : 'button cancel', href : 'javascript:;', onmousedown : 'return false;'}, 'Cancel');
-
-                DOM.add(id + '_middle', 'div', {'class' : 'icon'});
-                DOM.setHTML(id + '_content', f.content.replace('\n', '<br />'));
-            }
-
-            // Register events
-            mdf = Event.add(id, 'mousedown', function(e) {
-                var n = e.target, w, vp;
-
-                w = t.windows[id];
-                t.focus(id);
-
-                if (n.nodeName == 'A' || n.nodeName == 'a') {
-                    if (n.className == 'max') {
-                        w.oldPos = w.element.getXY();
-                        w.oldSize = w.element.getSize();
-
-                        vp = DOM.getViewPort();
-
-                        // Reduce viewport size to avoid scrollbars
-                        vp.w -= 2;
-                        vp.h -= 2;
-
-                        w.element.moveTo(vp.x, vp.y);
-                        w.element.resizeTo(vp.w, vp.h);
-                        DOM.setStyles(id + '_ifr', {width : vp.w - w.deltaWidth, height : vp.h - w.deltaHeight});
-                        DOM.addClass(id + '_wrapper', 'maximized');
-                    } else if (n.className == 'med') {
-                        // Reset to old size
-                        w.element.moveTo(w.oldPos.x, w.oldPos.y);
-                        w.element.resizeTo(w.oldSize.w, w.oldSize.h);
-                        w.iframeElement.resizeTo(w.oldSize.w - w.deltaWidth, w.oldSize.h - w.deltaHeight);
-
-                        DOM.removeClass(id + '_wrapper', 'maximized');
-                    } else if (n.className == 'move')
-                        return t._startDrag(id, e, n.className);
-                    else if (DOM.hasClass(n, 'resize'))
-                        return t._startDrag(id, e, n.className.substring(7));
-                }
-            });
-
-            clf = Event.add(id, 'click', function(e) {
-                var n = e.target;
-
-                t.focus(id);
-
-                if (n.nodeName == 'A' || n.nodeName == 'a') {
-                    switch (n.className) {
-                        case 'close':
-                            t.close(null, id);
-                            return Event.cancel(e);
-
-                        case 'button ok':
-                        case 'button cancel':
-                            f.button_func(n.className == 'button ok');
-                            return Event.cancel(e);
-                    }
-                }
-            });
-
-            // Add window
-            t.windows = t.windows || {};
-            w = t.windows[id] = {
-                id : id,
-                mousedown_func : mdf,
-                click_func : clf,
-                element : new Element(id, {blocker : 1, container : ed.getContainer()}),
-                iframeElement : new Element(id + '_ifr'),
-                features : f,
-                deltaWidth : dw,
-                deltaHeight : dh
-            };
-
-            w.iframeElement.on('focus', function() {
-                t.focus(id);
-            });
-
-            t.focus(id);
-            t._fixIELayout(id, 1);
-
-//          if (DOM.get(id + '_ok'))
-//              DOM.get(id + '_ok').focus();
-
-            return w;
-        },
-
-        focus : function(id) {
-            var t = this, w = t.windows[id];
-
-            w.zIndex = this.zIndex++;
-            w.element.setStyle('zIndex', w.zIndex);
-            w.element.update();
-
-            id = id + '_wrapper';
-            DOM.removeClass(t.lastId, 'focus');
-            DOM.addClass(id, 'focus');
-            t.lastId = id;
-        },
-
-        _addAll : function(te, ne) {
-            var i, n, t = this, dom = tinymce.DOM;
-
-            if (is(ne, 'string'))
-                te.appendChild(dom.doc.createTextNode(ne));
-            else if (ne.length) {
-                te = te.appendChild(dom.create(ne[0], ne[1]));
-
-                for (i=2; i<ne.length; i++)
-                    t._addAll(te, ne[i]);
-            }
-        },
-
-        _startDrag : function(id, se, ac) {
-            var t = this, mu, mm, d = document, eb, w = t.windows[id], we = w.element, sp = we.getXY(), p, sz, ph, cp, vp, sx, sy, sex, sey, dx, dy, dw, dh;
-
-            // Get positons and sizes
-//          cp = DOM.getPos(t.editor.getContainer());
-            cp = {x : 0, y : 0};
-            vp = DOM.getViewPort();
-
-            // Reduce viewport size to avoid scrollbars
-            vp.w -= 2;
-            vp.h -= 2;
-
-            sex = se.screenX;
-            sey = se.screenY;
-            dx = dy = dw = dh = 0;
-
-            // Handle mouse up
-            mu = Event.add(d, 'mouseup', function(e) {
-                Event.remove(d, 'mouseup', mu);
-                Event.remove(d, 'mousemove', mm);
-
-                if (eb)
-                    eb.remove();
-
-                we.moveBy(dx, dy);
-                we.resizeBy(dw, dh);
-                sz = we.getSize();
-                DOM.setStyles(id + '_ifr', {width : sz.w - w.deltaWidth, height : sz.h - w.deltaHeight});
-                t._fixIELayout(id, 1);
-
-                return Event.cancel(e);
-            });
-
-            if (ac != 'move')
-                startMove();
-
-            function startMove() {
-                if (eb)
-                    return;
-
-                t._fixIELayout(id, 0);
-
-                // Setup event blocker
-                DOM.add(d.body, 'div', {
-                    id : 'mceEventBlocker',
-                    'class' : 'mceEventBlocker ' + (t.editor.settings.inlinepopups_skin || 'clearlooks2'),
-                    style : {left : vp.x, top : vp.y, width : vp.w - 20, height : vp.h - 20, zIndex : 20001}
-                });
-                eb = new Element('mceEventBlocker');
-                eb.update();
-
-                // Setup placeholder
-                p = we.getXY();
-                sz = we.getSize();
-                sx = cp.x + p.x - vp.x;
-                sy = cp.y + p.y - vp.y;
-                DOM.add(eb.get(), 'div', {id : 'mcePlaceHolder', 'class' : 'placeholder', style : {left : sx, top : sy, width : sz.w, height : sz.h}});
-                ph = new Element('mcePlaceHolder');
-            };
-
-            // Handle mouse move/drag
-            mm = Event.add(d, 'mousemove', function(e) {
-                var x, y, v;
-
-                startMove();
-
-                x = e.screenX - sex;
-                y = e.screenY - sey;
-
-                switch (ac) {
-                    case 'resize-w':
-                        dx = x;
-                        dw = 0 - x;
-                        break;
-
-                    case 'resize-e':
-                        dw = x;
-                        break;
-
-                    case 'resize-n':
-                    case 'resize-nw':
-                    case 'resize-ne':
-                        if (ac == "resize-nw") {
-                            dx = x;
-                            dw = 0 - x;
-                        } else if (ac == "resize-ne")
-                            dw = x;
-
-                        dy = y;
-                        dh = 0 - y;
-                        break;
-
-                    case 'resize-s':
-                    case 'resize-sw':
-                    case 'resize-se':
-                        if (ac == "resize-sw") {
-                            dx = x;
-                            dw = 0 - x;
-                        } else if (ac == "resize-se")
-                            dw = x;
-
-                        dh = y;
-                        break;
-
-                    case 'move':
-                        dx = x;
-                        dy = y;
-                        break;
-                }
-
-                // Boundary check
-                if (dw < (v = w.features.min_width - sz.w)) {
-                    if (dx !== 0)
-                        dx += dw - v;
-
-                    dw = v;
-                }
-    
-                if (dh < (v = w.features.min_height - sz.h)) {
-                    if (dy !== 0)
-                        dy += dh - v;
-
-                    dh = v;
-                }
-
-                dw = Math.min(dw, w.features.max_width - sz.w);
-                dh = Math.min(dh, w.features.max_height - sz.h);
-                dx = Math.max(dx, vp.x - (sx + vp.x));
-                dy = Math.max(dy, vp.y - (sy + vp.y));
-                dx = Math.min(dx, (vp.w + vp.x) - (sx + sz.w + vp.x));
-                dy = Math.min(dy, (vp.h + vp.y) - (sy + sz.h + vp.y));
-
-                // Move if needed
-                if (dx + dy !== 0) {
-                    if (sx + dx < 0)
-                        dx = 0;
-    
-                    if (sy + dy < 0)
-                        dy = 0;
-
-                    ph.moveTo(sx + dx, sy + dy);
-                }
-
-                // Resize if needed
-                if (dw + dh !== 0)
-                    ph.resizeTo(sz.w + dw, sz.h + dh);
-
-                return Event.cancel(e);
-            });
-
-            return Event.cancel(se);
-        },
-
-        resizeBy : function(dw, dh, id) {
-            var w = this.windows[id];
-
-            if (w) {
-                w.element.resizeBy(dw, dh);
-                w.iframeElement.resizeBy(dw, dh);
-            }
-        },
-
-        close : function(win, id) {
-            var t = this, w, d = document, ix = 0, fw;
-
-            // Probably not inline
-            if (!id && win) {
-                t.parent(win);
-                return;
-            }
-
-            if (w = t.windows[id]) {
-                t.onClose.dispatch(t);
-                Event.remove(d, 'mousedown', w.mousedownFunc);
-                Event.remove(d, 'click', w.clickFunc);
-
-                DOM.setAttrib(id + '_ifr', 'src', 'javascript:""'); // Prevent leak
-                w.element.remove();
-                delete t.windows[id];
-
-                // Find front most window and focus that
-                each (t.windows, function(w) {
-                    if (w.zIndex > ix) {
-                        fw = w;
-                        ix = w.zIndex;
-                    }
-                });
-
-                if (fw)
-                    t.focus(fw.id);
-            }
-        },
-
-        setTitle : function(ti, id) {
-            DOM.get(id + '_title').innerHTML = DOM.encode(ti);
-        },
-
-        alert : function(txt, cb, s) {
-            var t = this, w;
-
-            w = t.open({
-                title : t,
-                type : 'alert',
-                button_func : function(s) {
-                    if (cb)
-                        cb.call(s || t, s);
-
-                    t.close(null, w.id);
-                },
-                content : DOM.encode(t.editor.getLang(txt, txt)),
-                inline : 1,
-                width : 400,
-                height : 130
-            });
-        },
-
-        confirm : function(txt, cb, s) {
-            var t = this, w;
-
-            w = t.open({
-                title : t,
-                type : 'confirm',
-                button_func : function(s) {
-                    if (cb)
-                        cb.call(s || t, s);
-
-                    t.close(null, w.id);
-                },
-                content : DOM.encode(t.editor.getLang(txt, txt)),
-                inline : 1,
-                width : 400,
-                height : 130
-            });
-        },
-
-        // Internal functions
-
-        _fixIELayout : function(id, s) {
-            var w, img;
-
-            if (!tinymce.isIE6)
-                return;
-
-            // Fixes the bug where hover flickers and does odd things in IE6
-            each(['n','s','w','e','nw','ne','sw','se'], function(v) {
-                var e = DOM.get(id + '_resize_' + v);
-
-                DOM.setStyles(e, {
-                    width : s ? e.clientWidth : '',
-                    height : s ? e.clientHeight : '',
-                    cursor : DOM.getStyle(e, 'cursor', 1)
-                });
-
-                DOM.setStyle(id + "_bottom", 'bottom', '-1px');
-
-                e = 0;
-            });
-
-            // Fixes graphics glitch
-            if (w = this.windows[id]) {
-                // Fixes rendering bug after resize
-                w.element.hide();
-                w.element.show();
-
-                // Forced a repaint of the window
-                //DOM.get(id).style.filter = '';
-
-                // IE has a bug where images used in CSS won't get loaded
-                // sometimes when the cache in the browser is disabled
-                // This fix tries to solve it by loading the images using the image object
-                each(DOM.select('div,a', id), function(e, i) {
-                    if (e.currentStyle.backgroundImage != 'none') {
-                        img = new Image();
-                        img.src = e.currentStyle.backgroundImage.replace(/url\(\"(.+)\"\)/, '$1');
-                    }
-                });
-
-                DOM.get(id).style.filter = '';
-            }
-        }
-    });
-
-    // Register plugin
-    tinymce.PluginManager.add('inlinepopups', tinymce.plugins.InlinePopups);
-})();
-
+(function(){var DOM=tinymce.DOM,Element=tinymce.dom.Element,Event=tinymce.dom.Event,each=tinymce.each,is=tinymce.is;tinymce.create('tinymce.plugins.InlinePopups',{init:function(ed,url){ed.onBeforeRenderUI.add(function(){ed.windowManager=new tinymce.InlineWindowManager(ed);DOM.loadCSS(url+'/skins/'+(ed.settings.inlinepopups_skin||'clearlooks2')+"/window.css");});},getInfo:function(){return{longname:'InlinePopups',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/inlinepopups',version:tinymce.majorVersion+"."+tinymce.minorVersion};}});tinymce.create('tinymce.InlineWindowManager:tinymce.WindowManager',{InlineWindowManager:function(ed){var t=this;t.parent(ed);t.zIndex=1000;},open:function(f,p){var t=this,id,opt='',ed=t.editor,dw=0,dh=0,vp,po,mdf,clf,we,w;f=f||{};p=p||{};if(!f.inline)return t.parent(f,p);t.bookmark=ed.selection.getBookmark('simple');id=DOM.uniqueId();vp=DOM.getViewPort();f.width=parseInt(f.width||320);f.height=parseInt(f.height||240)+(tinymce.isIE?8:0);f.min_width=parseInt(f.min_width||150);f.min_height=parseInt(f.min_height||100);f.max_width=parseInt(f.max_width||2000);f.max_height=parseInt(f.max_height||2000);f.left=f.left||Math.round(Math.max(vp.x,vp.x+(vp.w/ 2.0) - (f.width /2.0)));f.top=f.top||Math.round(Math.max(vp.y,vp.y+(vp.h/ 2.0) - (f.height /2.0)));f.movable=f.resizable=true;p.mce_width=f.width;p.mce_height=f.height;p.mce_inline=true;p.mce_window_id=id;t.features=f;t.params=p;t.onOpen.dispatch(t,f,p);if(f.type){opt+=' modal '+f.type;f.resizable=false;}if(f.statusbar)opt+=' statusbar';if(f.resizable)opt+=' resizable';if(f.minimizable)opt+=' minimizable';if(f.maximizable)opt+=' maximizable';if(f.movable)opt+=' movable';t._addAll(document.body,['div',{id:id,'class':ed.settings.inlinepopups_skin||'clearlooks2',style:'width:100px;height:100px'},['div',{id:id+'_wrapper','class':'wrapper'+opt},['div',{id:id+'_top','class':'top'},['div',{'class':'left'}],['div',{'class':'center'}],['div',{'class':'right'}],['span',{id:id+'_title'},f.title||'']],['div',{id:id+'_middle','class':'middle'},['div',{id:id+'_left','class':'left'}],['span',{id:id+'_content'}],['div',{id:id+'_right','class':'right'}]],['div',{id:id+'_bottom','class':'bottom'},['div',{'class':'left'}],['div',{'class':'center'}],['div',{'class':'right'}],['span',{id:id+'_status'},'Content']],['a',{'class':'move',href:'javascript:;'}],['a',{'class':'min',href:'javascript:;',onmousedown:'return false;'}],['a',{'class':'max',href:'javascript:;',onmousedown:'return false;'}],['a',{'class':'med',href:'javascript:;',onmousedown:'return false;'}],['a',{'class':'close',href:'javascript:;',onmousedown:'return false;'}],['a',{id:id+'_resize_n','class':'resize resize-n',href:'javascript:;'}],['a',{id:id+'_resize_s','class':'resize resize-s',href:'javascript:;'}],['a',{id:id+'_resize_w','class':'resize resize-w',href:'javascript:;'}],['a',{id:id+'_resize_e','class':'resize resize-e',href:'javascript:;'}],['a',{id:id+'_resize_nw','class':'resize resize-nw',href:'javascript:;'}],['a',{id:id+'_resize_ne','class':'resize resize-ne',href:'javascript:;'}],['a',{id:id+'_resize_sw','class':'resize resize-sw',href:'javascript:;'}],['a',{id:id+'_resize_se','class':'resize resize-se',href:'javascript:;'}]]]);DOM.setStyles(id,{top:-10000,left:-10000});if(tinymce.isGecko)DOM.setStyle(id,'overflow','auto');if(!f.type){dw+=DOM.get(id+'_left').clientWidth;dw+=DOM.get(id+'_right').clientWidth;dh+=DOM.get(id+'_top').clientHeight;dh+=DOM.get(id+'_bottom').clientHeight;}DOM.setStyles(id,{top:f.top,left:f.left,width:f.width+dw,height:f.height+dh});if(!f.type){DOM.add(id+'_content','iframe',{id:id+'_ifr',src:'javascript:""',frameBorder:0,style:'border:0;width:10px;height:10px'});DOM.setStyles(id+'_ifr',{width:f.width,height:f.height});DOM.setAttrib(id+'_ifr','src',f.url||f.file);}else{DOM.add(id+'_wrapper','a',{id:id+'_ok','class':'button ok',href:'javascript:;',onmousedown:'return false;'},'Ok');if(f.type=='confirm')DOM.add(id+'_wrapper','a',{'class':'button cancel',href:'javascript:;',onmousedown:'return false;'},'Cancel');DOM.add(id+'_middle','div',{'class':'icon'});DOM.setHTML(id+'_content',f.content.replace('\n','<br />'));}mdf=Event.add(id,'mousedown',function(e){var n=e.target,w,vp;w=t.windows[id];t.focus(id);if(n.nodeName=='A'||n.nodeName=='a'){if(n.className=='max'){w.oldPos=w.element.getXY();w.oldSize=w.element.getSize();vp=DOM.getViewPort();vp.w-=2;vp.h-=2;w.element.moveTo(vp.x,vp.y);w.element.resizeTo(vp.w,vp.h);DOM.setStyles(id+'_ifr',{width:vp.w-w.deltaWidth,height:vp.h-w.deltaHeight});DOM.addClass(id+'_wrapper','maximized');}else if(n.className=='med'){w.element.moveTo(w.oldPos.x,w.oldPos.y);w.element.resizeTo(w.oldSize.w,w.oldSize.h);w.iframeElement.resizeTo(w.oldSize.w-w.deltaWidth,w.oldSize.h-w.deltaHeight);DOM.removeClass(id+'_wrapper','maximized');}else if(n.className=='move')return t._startDrag(id,e,n.className);else if(DOM.hasClass(n,'resize'))return t._startDrag(id,e,n.className.substring(7));}});clf=Event.add(id,'click',function(e){var n=e.target;t.focus(id);if(n.nodeName=='A'||n.nodeName=='a'){switch(n.className){case'close':t.close(null,id);return Event.cancel(e);case'button ok':case'button cancel':f.button_func(n.className=='button ok');return Event.cancel(e);}}});t.windows=t.windows||{};w=t.windows[id]={id:id,mousedown_func:mdf,click_func:clf,element:new Element(id,{blocker:1,container:ed.getContainer()}),iframeElement:new Element(id+'_ifr'),features:f,deltaWidth:dw,deltaHeight:dh};w.iframeElement.on('focus',function(){t.focus(id);});t.focus(id);t._fixIELayout(id,1);return w;},focus:function(id){var t=this,w=t.windows[id];w.zIndex=this.zIndex++;w.element.setStyle('zIndex',w.zIndex);w.element.update();id=id+'_wrapper';DOM.removeClass(t.lastId,'focus');DOM.addClass(id,'focus');t.lastId=id;},_addAll:function(te,ne){var i,n,t=this,dom=tinymce.DOM;if(is(ne,'string'))te.appendChild(dom.doc.createTextNode(ne));else if(ne.length){te=te.appendChild(dom.create(ne[0],ne[1]));for(i=2;i<ne.length;i++)t._addAll(te,ne[i]);}},_startDrag:function(id,se,ac){var t=this,mu,mm,d=document,eb,w=t.windows[id],we=w.element,sp=we.getXY(),p,sz,ph,cp,vp,sx,sy,sex,sey,dx,dy,dw,dh;cp={x:0,y:0};vp=DOM.getViewPort();vp.w-=2;vp.h-=2;sex=se.screenX;sey=se.screenY;dx=dy=dw=dh=0;mu=Event.add(d,'mouseup',function(e){Event.remove(d,'mouseup',mu);Event.remove(d,'mousemove',mm);if(eb)eb.remove();we.moveBy(dx,dy);we.resizeBy(dw,dh);sz=we.getSize();DOM.setStyles(id+'_ifr',{width:sz.w-w.deltaWidth,height:sz.h-w.deltaHeight});t._fixIELayout(id,1);return Event.cancel(e);});if(ac!='move')startMove();function startMove(){if(eb)return;t._fixIELayout(id,0);DOM.add(d.body,'div',{id:'mceEventBlocker','class':'mceEventBlocker '+(t.editor.settings.inlinepopups_skin||'clearlooks2'),style:{left:vp.x,top:vp.y,width:vp.w-20,height:vp.h-20,zIndex:20001}});eb=new Element('mceEventBlocker');eb.update();p=we.getXY();sz=we.getSize();sx=cp.x+p.x-vp.x;sy=cp.y+p.y-vp.y;DOM.add(eb.get(),'div',{id:'mcePlaceHolder','class':'placeholder',style:{left:sx,top:sy,width:sz.w,height:sz.h}});ph=new Element('mcePlaceHolder');};mm=Event.add(d,'mousemove',function(e){var x,y,v;startMove();x=e.screenX-sex;y=e.screenY-sey;switch(ac){case'resize-w':dx=x;dw=0-x;break;case'resize-e':dw=x;break;case'resize-n':case'resize-nw':case'resize-ne':if(ac=="resize-nw"){dx=x;dw=0-x;}else if(ac=="resize-ne")dw=x;dy=y;dh=0-y;break;case'resize-s':case'resize-sw':case'resize-se':if(ac=="resize-sw"){dx=x;dw=0-x;}else if(ac=="resize-se")dw=x;dh=y;break;case'move':dx=x;dy=y;break;}if(dw<(v=w.features.min_width-sz.w)){if(dx!==0)dx+=dw-v;dw=v;}if(dh<(v=w.features.min_height-sz.h)){if(dy!==0)dy+=dh-v;dh=v;}dw=Math.min(dw,w.features.max_width-sz.w);dh=Math.min(dh,w.features.max_height-sz.h);dx=Math.max(dx,vp.x-(sx+vp.x));dy=Math.max(dy,vp.y-(sy+vp.y));dx=Math.min(dx,(vp.w+vp.x)-(sx+sz.w+vp.x));dy=Math.min(dy,(vp.h+vp.y)-(sy+sz.h+vp.y));if(dx+dy!==0){if(sx+dx<0)dx=0;if(sy+dy<0)dy=0;ph.moveTo(sx+dx,sy+dy);}if(dw+dh!==0)ph.resizeTo(sz.w+dw,sz.h+dh);return Event.cancel(e);});return Event.cancel(se);},resizeBy:function(dw,dh,id){var w=this.windows[id];if(w){w.element.resizeBy(dw,dh);w.iframeElement.resizeBy(dw,dh);}},close:function(win,id){var t=this,w,d=document,ix=0,fw;if(!id&&win){t.parent(win);return;}if(w=t.windows[id]){t.onClose.dispatch(t);Event.remove(d,'mousedown',w.mousedownFunc);Event.remove(d,'click',w.clickFunc);DOM.setAttrib(id+'_ifr','src','javascript:""');w.element.remove();delete t.windows[id];each(t.windows,function(w){if(w.zIndex>ix){fw=w;ix=w.zIndex;}});if(fw)t.focus(fw.id);}},setTitle:function(ti,id){DOM.get(id+'_title').innerHTML=DOM.encode(ti);},alert:function(txt,cb,s){var t=this,w;w=t.open({title:t,type:'alert',button_func:function(s){if(cb)cb.call(s||t,s);t.close(null,w.id);},content:DOM.encode(t.editor.getLang(txt,txt)),inline:1,width:400,height:130});},confirm:function(txt,cb,s){var t=this,w;w=t.open({title:t,type:'confirm',button_func:function(s){if(cb)cb.call(s||t,s);t.close(null,w.id);},content:DOM.encode(t.editor.getLang(txt,txt)),inline:1,width:400,height:130});},_fixIELayout:function(id,s){var w,img;if(!tinymce.isIE6)return;each(['n','s','w','e','nw','ne','sw','se'],function(v){var e=DOM.get(id+'_resize_'+v);DOM.setStyles(e,{width:s?e.clientWidth:'',height:s?e.clientHeight:'',cursor:DOM.getStyle(e,'cursor',1)});DOM.setStyle(id+"_bottom",'bottom','-1px');e=0;});if(w=this.windows[id]){w.element.hide();w.element.show();each(DOM.select('div,a',id),function(e,i){if(e.currentStyle.backgroundImage!='none'){img=new Image();img.src=e.currentStyle.backgroundImage.replace(/url\(\"(.+)\"\)/,'$1');}});DOM.get(id).style.filter='';}}});tinymce.PluginManager.add('inlinepopups',tinymce.plugins.InlinePopups);})();

trunk/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css

@@ -9 +9 @@
 
 /* Top */
-.clearlooks2 .top, .clearlooks2 .top div {top:0; width:100%; height:23px}
-.clearlooks2 .top .left {width:6px; background:url(img/corners.gif)}
-.clearlooks2 .top .center {right:6px; width:100%; height:23px; background:url(img/horizontal.gif) 12px 0; clip:rect(auto auto auto 12px)}
-.clearlooks2 .top .right {right:0; width:6px; height:23px; background:url(img/corners.gif) -12px 0}
-.clearlooks2 .top span {width:100%; text-align:center; vertical-align:middle; line-height:23px; font-weight:bold}
-.clearlooks2 .focus .top .left {background:url(img/corners.gif) -6px 0}
-.clearlooks2 .focus .top .center {background:url(img/horizontal.gif) 0 -23px}
-.clearlooks2 .focus .top .right {background:url(img/corners.gif) -18px 0}
-.clearlooks2 .focus .top span {color:#FFF}
+.clearlooks2 .top, 
+.clearlooks2 .top div {
+top:0; 
+width:100%; 
+height:23px
+}
+.clearlooks2 .top .left {
+width:55%; 
+background: #cee1ef;
+border-left: 1px solid #c6d9e9;
+border-top: 1px solid #c6d9e9;
+}
+.clearlooks2 .top .center {
+/*right:6px; 
+width:100%; 
+height:23px; 
+background: #dedede;
+border-top: 1px solid #ccc;*/
+}
+.clearlooks2 .top .right {
+right:0; 
+width:55%; 
+height:23px; 
+background: #cee1ef;
+border-right: 1px solid #c6d9e9;
+border-top: 1px solid #c6d9e9;
+}
+.clearlooks2 .top span {
+width:100%;
+font: 12px/20px bold "Lucida Grande","Lucida Sans Unicode",Tahoma,Verdana,sans-serif;
+text-align:center; 
+vertical-align:middle; 
+line-height:23px; 
+font-weight:bold
+}
+.clearlooks2 .focus .top .left {
+background: #2683ae;
+border-left: 1px solid #464646;
+border-top: 1px solid #464646;
+}
+.clearlooks2 .focus .top .center {
+/*background: #2683ae;
+border-top: 1px solid #454545;*/
+}
+.clearlooks2 .focus .top .right {
+background: #2683ae;
+border-right: 1px solid #464646;
+border-top: 1px solid #464646;
+}
+.clearlooks2 .focus .top span {
+color:#FFF
+}
 
 /* Middle */
 .clearlooks2 .middle, .clearlooks2 .middle div {top:0}
 .clearlooks2 .middle {width:100%; height:100%; clip:rect(23px auto auto auto)}
-.clearlooks2 .middle .left {left:0; width:5px; height:100%; background:url(img/vertical.gif) -5px 0}
+.clearlooks2 .middle .left {left:0; width:5px; height:100%; background:#eaf3ea;border-left:1px solid #c6d9e9;}
 .clearlooks2 .middle span {top:23px; left:5px; width:100%; height:100%; background:#FFF}
-.clearlooks2 .middle .right {right:0; width:5px; height:100%; background:url(img/vertical.gif)}
+.clearlooks2 .middle .right {right:0; width:5px; height:100%; background:#eaf3ea;border-right:1px solid #c6d9e9;}
 
 /* Bottom */
 .clearlooks2 .bottom, .clearlooks2 .bottom div {height:6px}
-.clearlooks2 .bottom {left:0; bottom:0; width:100%}
-.clearlooks2 .bottom div {top:0}
-.clearlooks2 .bottom .left {left:0; width:5px; background:url(img/corners.gif) -34px -6px}
-.clearlooks2 .bottom .center {left:5px; width:100%; background:url(img/horizontal.gif) 0 -46px}
-.clearlooks2 .bottom .right {right:0; width:5px; background: url(img/corners.gif) -34px 0}
+.clearlooks2 .bottom {left:0; bottom:0; width:100%;background:#eaf3ea;border-bottom:1px solid #c6d9e9;}
+.clearlooks2 .bottom div {top:0;}
+.clearlooks2 .bottom .left {left:0; width:5px; background:#eaf3ea;border-left:1px solid #c6d9e9;}
+.clearlooks2 .bottom .center {left:5px; width:100%; }
+.clearlooks2 .bottom .right {right:0; width:6px; background:#eaf3ea url(img/drag.gif) no-repeat;border-right:1px solid #c6d9e9;}
 .clearlooks2 .bottom span {display:none}
 .clearlooks2 .statusbar .bottom, .clearlooks2 .statusbar .bottom div {height:23px}

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

@@ -1 @@
-/**
- * $Id: editor_plugin_src.js 520 2008-01-07 16:30:32Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-    var each = tinymce.each;
-
-    tinymce.create('tinymce.plugins.MediaPlugin', {
-        init : function(ed, url) {
-            var t = this;
-            
-            t.editor = ed;
-            t.url = url;
-
-            function isMediaElm(n) {
-                return /^(mceItemFlash|mceItemShockWave|mceItemWindowsMedia|mceItemQuickTime|mceItemRealMedia)$/.test(n.className);
-            };
-
-            // Register commands
-            ed.addCommand('mceMedia', function() {
-                ed.windowManager.open({
-                    file : url + '/media.htm',
-                    width : 430 + parseInt(ed.getLang('media.delta_width', 0)),
-                    height : 470 + parseInt(ed.getLang('media.delta_height', 0)),
-                    inline : 1
-                }, {
-                    plugin_url : url
-                });
-            });
-
-            // Register buttons
-            ed.addButton('media', {title : 'media.desc', cmd : 'mceMedia'});
-
-            ed.onNodeChange.add(function(ed, cm, n) {
-                cm.setActive('media', n.nodeName == 'IMG' && isMediaElm(n));
-            });
-
-            ed.onInit.add(function() {
-                var lo = {
-                    mceItemFlash : 'flash',
-                    mceItemShockWave : 'shockwave',
-                    mceItemWindowsMedia : 'windowsmedia',
-                    mceItemQuickTime : 'quicktime',
-                    mceItemRealMedia : 'realmedia'
-                };
-
-                ed.dom.loadCSS(url + "/css/content.css");
-
-                if (ed.theme.onResolveName) {
-                    ed.theme.onResolveName.add(function(th, o) {
-                        if (o.name == 'img') {
-                            each(lo, function(v, k) {
-                                if (ed.dom.hasClass(o.node, k)) {
-                                    o.name = v;
-                                    o.title = ed.dom.getAttrib(o.node, 'title');
-                                    return false;
-                                }
-                            });
-                        }
-                    });
-                }
-
-                if (ed && ed.plugins.contextmenu) {
-                    ed.plugins.contextmenu.onContextMenu.add(function(th, m, e) {
-                        if (e.nodeName == 'IMG' && /mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(e.className)) {
-                            m.add({title : 'media.edit', icon : 'media', cmd : 'mceMedia'});
-                        }
-                    });
-                }
-            });
-
-            ed.onBeforeSetContent.add(function(ed, o) {
-                var h = o.content;
-
-                h = h.replace(/<script[^>]*>\s*write(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)\(\{([^\)]*)\}\);\s*<\/script>/gi, function(a, b, c) {
-                    var o = eval("({" + c + "})");
-
-                    return '<img class="mceItem' + b + '" title="' + ed.dom.encode(c) + '" src="' + url + '/img/trans.gif" width="' + o.width + '" height="' + o.height + '" />'
-                });
-
-                h = h.replace(/<object([^>]*)>/gi, '<div class="mceItemObject" $1>');
-                h = h.replace(/<embed([^>]*)>/gi, '<div class="mceItemEmbed" $1>');
-                h = h.replace(/<\/(object|embed)([^>]*)>/gi, '</div>');
-                h = h.replace(/<param([^>]*)>/gi, function(a, b) {return '<div ' + b.replace(/value=/g, '_value=') + ' class="mceItemParam"></div>'});
-                h = h.replace(/\/ class=\"mceItemParam\"><\/div>/gi, 'class="mceItemParam"></div>');
-
-                o.content = h;
-            });
-
-            ed.onSetContent.add(function() {
-                t._divsToImgs(ed.getBody());
-            });
-
-            ed.onPreProcess.add(function(ed, o) {
-                var dom = ed.dom;
-
-                if (o.set) {
-                    t._divsToImgs(o.node);
-
-                    each(dom.select('IMG', o.node), function(n) {
-                        var p;
-
-                        if (isMediaElm(n)) {
-                            p = t._parse(n.title);
-                            dom.setAttrib(n, 'width', dom.getAttrib(n, 'width', p.width || 100));
-                            dom.setAttrib(n, 'height', dom.getAttrib(n, 'height', p.height || 100));
-                        }
-                    });
-                }
-
-                if (o.get) {
-                    each(dom.select('IMG', o.node), function(n) {
-                        var ci, cb, mt;
-
-                        if (ed.getParam('media_use_script')) {
-                            if (isMediaElm(n))
-                                n.className = n.className.replace(/mceItem/g, 'mceTemp');
-
-                            return;
-                        }
-
-                        switch (n.className) {
-                            case 'mceItemFlash':
-                                ci = 'd27cdb6e-ae6d-11cf-96b8-444553540000';
-                                cb = 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';
-                                mt = 'application/x-shockwave-flash';
-                                break;
-
-                            case 'mceItemShockWave':
-                                ci = '166b1bca-3f9c-11cf-8075-444553540000';
-                                cb = 'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0';
-                                mt = 'application/x-director';
-                                break;
-
-                            case 'mceItemWindowsMedia':
-                                ci = ed.getParam('media_wmp6_compatible') ? '05589fa1-c356-11ce-bf01-00aa0055595a' : '6bf52a52-394a-11d3-b153-00c04f79faa6';
-                                cb = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';
-                                mt = 'application/x-mplayer2';
-                                break;
-
-                            case 'mceItemQuickTime':
-                                ci = '02bf25d5-8c17-4b23-bc80-d3488abddc6b';
-                                cb = 'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0';
-                                mt = 'video/quicktime';
-                                break;
-
-                            case 'mceItemRealMedia':
-                                ci = 'cfcdaa03-8be4-11cf-b84b-0020afbbccfa';
-                                cb = 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';
-                                mt = 'audio/x-pn-realaudio-plugin';
-                                break;
-                        }
-
-                        if (ci) {
-                            dom.replace(t._buildObj({
-                                classid : ci,
-                                codebase : cb,
-                                type : mt
-                            }, n), n);
-                        }
-                    });
-                }
-            });
-
-            ed.onPostProcess.add(function(ed, o) {
-                o.content = o.content.replace(/_value=/g, 'value=');
-            });
-
-            if (ed.getParam('media_use_script')) {
-                function getAttr(s, n) {
-                    n = new RegExp(n + '=\"([^\"]+)\"', 'g').exec(s);
-
-                    return n ? ed.dom.decode(n[1]) : '';
-                };
-
-                ed.onPostProcess.add(function(ed, o) {
-                    o.content = o.content.replace(/<img[^>]+>/g, function(im) {
-                        var cl = getAttr(im, 'class');
-
-                        if (/^(mceTempFlash|mceTempShockWave|mceTempWindowsMedia|mceTempQuickTime|mceTempRealMedia)$/.test(cl)) {
-                            at = t._parse(getAttr(im, 'title'));
-                            at.width = getAttr(im, 'width');
-                            at.height = getAttr(im, 'height');
-                            im = '<script type="text/javascript">write' + cl.substring(7) + '({' + t._serialize(at) + '});</script>';
-                        }
-
-                        return im;
-                    });
-                });
-            }
-        },
-
-        getInfo : function() {
-            return {
-                longname : 'Media',
-                author : 'Moxiecode Systems AB',
-                authorurl : 'http://tinymce.moxiecode.com',
-                infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/media',
-                version : tinymce.majorVersion + "." + tinymce.minorVersion
-            };
-        },
-
-        // Private methods
-
-        _buildObj : function(o, n) {
-            var ob, ed = this.editor, dom = ed.dom, p = this._parse(n.title);
-
-            p.width = o.width = dom.getAttrib(n, 'width') || 100;
-            p.height = o.height = dom.getAttrib(n, 'height') || 100;
-
-            ob = dom.create('div', {
-                mce_name : 'object',
-                classid : "clsid:" + o.classid,
-                codebase : o.codebase,
-                width : o.width,
-                height : o.height
-            });
-
-            if (p.src)
-                p.src = ed.convertURL(p.src, 'src', n);
-
-            each (p, function(v, k) {
-                if (v && !/^(width|height|codebase|classid)$/.test(k))
-                    dom.add(ob, 'div', {mce_name : 'param', name : k, '_value' : v});
-            });
-
-            dom.add(ob, 'div', tinymce.extend({mce_name : 'embed', type : o.type}, p));
-
-            return ob;
-        },
-
-        _divsToImgs : function(p) {
-            var t = this, dom = t.editor.dom, im, ci;
-
-            each(dom.select('div', p), function(n) {
-                // Convert object into image
-                if (dom.getAttrib(n, 'class') == 'mceItemObject') {
-                    ci = dom.getAttrib(n, "classid").toLowerCase().replace(/\s+/g, '');
-
-                    switch (ci) {
-                        case 'clsid:d27cdb6e-ae6d-11cf-96b8-444553540000':
-                            dom.replace(t._createImg('mceItemFlash', n), n);
-                            break;
-
-                        case 'clsid:166b1bca-3f9c-11cf-8075-444553540000':
-                            dom.replace(t._createImg('mceItemShockWave', n), n);
-                            break;
-
-                        case 'clsid:6bf52a52-394a-11d3-b153-00c04f79faa6':
-                        case 'clsid:22d6f312-b0f6-11d0-94ab-0080c74c7e95':
-                        case 'clsid:05589fa1-c356-11ce-bf01-00aa0055595a':
-                            dom.replace(t._createImg('mceItemWindowsMedia', n), n);
-                            break;
-
-                        case 'clsid:02bf25d5-8c17-4b23-bc80-d3488abddc6b':
-                            dom.replace(t._createImg('mceItemQuickTime', n), n);
-                            break;
-
-                        case 'clsid:cfcdaa03-8be4-11cf-b84b-0020afbbccfa':
-                            dom.replace(t._createImg('mceItemRealMedia', n), n);
-                            break;
-
-                        default:
-                            dom.replace(t._createImg('mceItemFlash', n), n);
-                    }
-                }
-            });
-        },
-
-        _createImg : function(cl, n) {
-            var im, dom = this.editor.dom, pa = {}, ti = '';
-
-            // Create image
-            im = dom.create('img', {
-                src : this.url + '/img/trans.gif',
-                width : dom.getAttrib(n, 'width') || 100,
-                height : dom.getAttrib(n, 'height') || 100,
-                'class' : cl
-            });
-
-            // Setup base parameters
-            each(['id', 'name', 'width', 'height', 'bgcolor', 'align'], function(n) {
-                var v = dom.getAttrib(n, 'align');
-
-                if (v)
-                    pa[v] = v;
-            });
-
-            // Add optional parameters
-            each(dom.select('div', n), function(n) {
-                if (dom.hasClass(n, 'mceItemParam'))
-                    pa[dom.getAttrib(n, 'name')] = dom.getAttrib(n, '_value');
-            });
-
-            // Use src not movie
-            if (pa.movie) {
-                pa.src = pa.movie;
-                delete pa.movie;
-            }
-
-            delete pa.width;
-            delete pa.height;
-
-            im.title = this._serialize(pa);
-
-            return im;
-        },
-
-        _parse : function(s) {
-            return tinymce.util.JSON.parse('{' + s + '}');
-        },
-
-        _serialize : function(o) {
-            return tinymce.util.JSON.serialize(o).replace(/[{}]/g, '');
-        }
-    });
-
-    // Register plugin
-    tinymce.PluginManager.add('media', tinymce.plugins.MediaPlugin);
-})();
+(function(){var each=tinymce.each;tinymce.create('tinymce.plugins.MediaPlugin',{init:function(ed,url){var t=this;t.editor=ed;t.url=url;function isMediaElm(n){return/^(mceItemFlash|mceItemShockWave|mceItemWindowsMedia|mceItemQuickTime|mceItemRealMedia)$/.test(n.className);};ed.addCommand('mceMedia',function(){ed.windowManager.open({file:url+'/media.htm',width:430+parseInt(ed.getLang('media.delta_width',0)),height:470+parseInt(ed.getLang('media.delta_height',0)),inline:1},{plugin_url:url});});ed.addButton('media',{title:'media.desc',cmd:'mceMedia'});ed.onNodeChange.add(function(ed,cm,n){cm.setActive('media',n.nodeName=='IMG'&&isMediaElm(n));});ed.onInit.add(function(){var lo={mceItemFlash:'flash',mceItemShockWave:'shockwave',mceItemWindowsMedia:'windowsmedia',mceItemQuickTime:'quicktime',mceItemRealMedia:'realmedia'};ed.dom.loadCSS(url+"/css/content.css");if(ed.theme.onResolveName){ed.theme.onResolveName.add(function(th,o){if(o.name=='img'){each(lo,function(v,k){if(ed.dom.hasClass(o.node,k)){o.name=v;o.title=ed.dom.getAttrib(o.node,'title');return false;}});}});}if(ed&&ed.plugins.contextmenu){ed.plugins.contextmenu.onContextMenu.add(function(th,m,e){if(e.nodeName=='IMG'&&/mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(e.className)){m.add({title:'media.edit',icon:'media',cmd:'mceMedia'});}});}});ed.onBeforeSetContent.add(function(ed,o){var h=o.content;h=h.replace(/<script[^>]*>\s*write(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)\(\{([^\)]*)\}\);\s*<\/script>/gi,function(a,b,c){var o=eval("({"+c+"})");return'<img class="mceItem'+b+'" title="'+ed.dom.encode(c)+'" src="'+url+'/img/trans.gif" width="'+o.width+'" height="'+o.height+'" />'});h=h.replace(/<object([^>]*)>/gi,'<span class="mceItemObject" $1>');h=h.replace(/<embed([^>]*)>/gi,'<span class="mceItemEmbed" $1>');h=h.replace(/<\/(object|embed)([^>]*)>/gi,'</span>');h=h.replace(/<param([^>]*)>/gi,function(a,b){return'<span '+b.replace(/value=/g,'_value=')+' class="mceItemParam"></span>'});h=h.replace(/\/ class=\"mceItemParam\"><\/span>/gi,'class="mceItemParam"></span>');o.content=h;});ed.onSetContent.add(function(){t._spansToImgs(ed.getBody());});ed.onPreProcess.add(function(ed,o){var dom=ed.dom;if(o.set){t._spansToImgs(o.node);each(dom.select('IMG',o.node),function(n){var p;if(isMediaElm(n)){p=t._parse(n.title);dom.setAttrib(n,'width',dom.getAttrib(n,'width',p.width||100));dom.setAttrib(n,'height',dom.getAttrib(n,'height',p.height||100));}});}if(o.get){each(dom.select('IMG',o.node),function(n){var ci,cb,mt;if(ed.getParam('media_use_script')){if(isMediaElm(n))n.className=n.className.replace(/mceItem/g,'mceTemp');return;}switch(n.className){case'mceItemFlash':ci='d27cdb6e-ae6d-11cf-96b8-444553540000';cb='http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';mt='application/x-shockwave-flash';break;case'mceItemShockWave':ci='166b1bca-3f9c-11cf-8075-444553540000';cb='http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0';mt='application/x-director';break;case'mceItemWindowsMedia':ci=ed.getParam('media_wmp6_compatible')?'05589fa1-c356-11ce-bf01-00aa0055595a':'6bf52a52-394a-11d3-b153-00c04f79faa6';cb='http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';mt='application/x-mplayer2';break;case'mceItemQuickTime':ci='02bf25d5-8c17-4b23-bc80-d3488abddc6b';cb='http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0';mt='video/quicktime';break;case'mceItemRealMedia':ci='cfcdaa03-8be4-11cf-b84b-0020afbbccfa';cb='http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';mt='audio/x-pn-realaudio-plugin';break;}if(ci){dom.replace(t._buildObj({classid:ci,codebase:cb,type:mt},n),n);}});}});ed.onPostProcess.add(function(ed,o){o.content=o.content.replace(/_value=/g,'value=');});if(ed.getParam('media_use_script')){function getAttr(s,n){n=new RegExp(n+'=\"([^\"]+)\"','g').exec(s);return n?ed.dom.decode(n[1]):'';};ed.onPostProcess.add(function(ed,o){o.content=o.content.replace(/<img[^>]+>/g,function(im){var cl=getAttr(im,'class');if(/^(mceTempFlash|mceTempShockWave|mceTempWindowsMedia|mceTempQuickTime|mceTempRealMedia)$/.test(cl)){at=t._parse(getAttr(im,'title'));at.width=getAttr(im,'width');at.height=getAttr(im,'height');im='<script type="text/javascript">write'+cl.substring(7)+'({'+t._serialize(at)+'});</script>';}return im;});});}},getInfo:function(){return{longname:'Media',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/media',version:tinymce.majorVersion+"."+tinymce.minorVersion};},_buildObj:function(o,n){var ob,ed=this.editor,dom=ed.dom,p=this._parse(n.title);p.width=o.width=dom.getAttrib(n,'width')||100;p.height=o.height=dom.getAttrib(n,'height')||100;ob=dom.create('span',{mce_name:'object',classid:"clsid:"+o.classid,codebase:o.codebase,width:o.width,height:o.height});if(p.src)p.src=ed.convertURL(p.src,'src',n);each(p,function(v,k){if(v&&!/^(width|height|codebase|classid)$/.test(k))dom.add(ob,'span',{mce_name:'param',name:k,'_value':v});});dom.add(ob,'span',tinymce.extend({mce_name:'embed',type:o.type},p));return ob;},_spansToImgs:function(p){var t=this,dom=t.editor.dom,im,ci;each(dom.select('span',p),function(n){if(dom.getAttrib(n,'class')=='mceItemObject'){ci=dom.getAttrib(n,"classid").toLowerCase().replace(/\s+/g,'');switch(ci){case'clsid:d27cdb6e-ae6d-11cf-96b8-444553540000':dom.replace(t._createImg('mceItemFlash',n),n);break;case'clsid:166b1bca-3f9c-11cf-8075-444553540000':dom.replace(t._createImg('mceItemShockWave',n),n);break;case'clsid:6bf52a52-394a-11d3-b153-00c04f79faa6':case'clsid:22d6f312-b0f6-11d0-94ab-0080c74c7e95':case'clsid:05589fa1-c356-11ce-bf01-00aa0055595a':dom.replace(t._createImg('mceItemWindowsMedia',n),n);break;case'clsid:02bf25d5-8c17-4b23-bc80-d3488abddc6b':dom.replace(t._createImg('mceItemQuickTime',n),n);break;case'clsid:cfcdaa03-8be4-11cf-b84b-0020afbbccfa':dom.replace(t._createImg('mceItemRealMedia',n),n);break;default:dom.replace(t._createImg('mceItemFlash',n),n);}}});},_createImg:function(cl,n){var im,dom=this.editor.dom,pa={},ti='';im=dom.create('img',{src:this.url+'/img/trans.gif',width:dom.getAttrib(n,'width')||100,height:dom.getAttrib(n,'height')||100,'class':cl});each(['id','name','width','height','bgcolor','align'],function(n){var v=dom.getAttrib(n,'align');if(v)pa[v]=v;});each(dom.select('span',n),function(n){if(dom.hasClass(n,'mceItemParam'))pa[dom.getAttrib(n,'name')]=dom.getAttrib(n,'_value');});if(pa.movie){pa.src=pa.movie;delete pa.movie;}delete pa.width;delete pa.height;im.title=this._serialize(pa);return im;},_parse:function(s){return tinymce.util.JSON.parse('{'+s+'}');},_serialize:function(o){return tinymce.util.JSON.serialize(o).replace(/[{}]/g,'');}});tinymce.PluginManager.add('media',tinymce.plugins.MediaPlugin);})();

trunk/wp-includes/js/tinymce/plugins/media/media.htm

@@ -3 +3 @@
 <head>
     <title>{#media_dlg.title}</title>
-    <script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+    <script type="text/javascript" src="../../tiny_mce_popup.js"></script>
     <script type="text/javascript" src="js/media.js"></script>
     <script type="text/javascript" src="../../utils/mctabs.js"></script>
@@ -10 +10 @@
     <script type="text/javascript" src="../../utils/editable_selects.js"></script>
     <link href="css/media.css" rel="stylesheet" type="text/css" />
-    <base target="_self" />
+    <script type="text/javascript">tinyMCEPopup.onInit.add(function(){window.setTimeout(function(){document.getElementById('src').focus();},500);});</script>
+    <base target="_self" />
 </head>
 <body style="display: none">
@@ -812 +813 @@
         <div class="mceActionPanel">
             <div style="float: left">
-                <input type="button" id="insert" name="insert" value="{#insert}" onclick="insertMedia();" />
+                <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
             </div>
 
             <div style="float: right">
-                <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+                <input type="submit" id="insert" name="insert" value="{#insert}" onclick="insertMedia();" />
             </div>
         </div>

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

@@ -1 @@
-/**
- * $Id: editor_plugin_src.js 520 2008-01-07 16:30:32Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-    var Event = tinymce.dom.Event;
-
-    tinymce.create('tinymce.plugins.PastePlugin', {
-        init : function(ed, url) {
-            var t = this;
-
-            t.editor = ed; 
-
-            // Register commands
-            ed.addCommand('mcePasteText', function(ui, v) {
-                if (ui) {
-                    ed.windowManager.open({
-                        file : url + '/pastetext.htm',
-                        width : 450,
-                        height : 400,
-                        inline : 1
-                    }, {
-                        plugin_url : url
-                    });
-                } else
-                    t._insertText(v.html, v.linebreaks);
-            });
-
-            ed.addCommand('mcePasteWord', function(ui, v) {
-                if (ui) {
-                    ed.windowManager.open({
-                        file : url + '/pasteword.htm',
-                        width : 450,
-                        height : 400,
-                        inline : 1
-                    }, {
-                        plugin_url : url
-                    });
-                } else
-                    t._insertWordContent(v);
-            });
-
-            ed.addCommand('mceSelectAll', function() {
-                ed.execCommand('selectall'); 
-            });
-
-            // Register buttons
-            ed.addButton('pastetext', {title : 'paste.paste_text_desc', cmd : 'mcePasteText', ui : true});
-            ed.addButton('pasteword', {title : 'paste.paste_word_desc', cmd : 'mcePasteWord', ui : true});
-            ed.addButton('selectall', {title : 'paste.selectall_desc', cmd : 'mceSelectAll'});
-
-            if (ed.getParam("paste_auto_cleanup_on_paste", false)) {
-                ed.onPaste.add(function(ed, e) {
-                    return t._handlePasteEvent(e)
-                });
-            }
-
-            if (!tinymce.isIE && ed.getParam("paste_auto_cleanup_on_paste", false)) {
-                // Force paste dialog if non IE browser
-                ed.onKeyDown.add(function(ed, e) {
-                    if (e.ctrlKey && e.keyCode == 86) {
-                        window.setTimeout(function() {
-                            ed.execCommand("mcePasteText", true);
-                        }, 1);
-
-                        Event.cancel(e);
-                    }
-                });
-            }
-        },
-
-        getInfo : function() {
-            return {
-                longname : 'Paste text/word',
-                author : 'Moxiecode Systems AB',
-                authorurl : 'http://tinymce.moxiecode.com',
-                infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste',
-                version : tinymce.majorVersion + "." + tinymce.minorVersion
-            };
-        },
-
-        // Private methods
-
-        _handlePasteEvent : function(e) {
-            var html = this._clipboardHTML(), ed = this.editor, sel = ed.selection, r;
-
-            // Removes italic, strong etc, the if was needed due to bug #1437114
-            if (ed && (r = sel.getRng()) && r.text.length > 0)
-                ed.execCommand('delete');
-
-            if (html && html.length > 0)
-                ed.execCommand('mcePasteWord', false, html);
-
-            return Event.cancel(e);
-        },
-
-        _insertText : function(content, bLinebreaks) { 
-            if (content && content.length > 0) {
-                if (bLinebreaks) { 
-                    // Special paragraph treatment 
-                    if (this.editor.getParam("paste_create_paragraphs", true)) {
-                        var rl = this.editor.getParam("paste_replace_list", '\u2122,<sup>TM</sup>,\u2026,...,\u201c|\u201d,",\u2019,\',\u2013|\u2014|\u2015|\u2212,-').split(',');
-                        for (var i=0; i<rl.length; i+=2)
-                            content = content.replace(new RegExp(rl[i], 'gi'), rl[i+1]);
-
-                        content = content.replace(/\r\n\r\n/g, '</p><p>');
-                        content = content.replace(/\r\r/g, '</p><p>');
-                        content = content.replace(/\n\n/g, '</p><p>');
-
-                        // Has paragraphs 
-                        if ((pos = content.indexOf('</p><p>')) != -1) { 
-                            this.editor.execCommand("Delete"); 
-
-                            var node = this.editor.selection.getNode(); 
-
-                            // Get list of elements to break 
-                            var breakElms = [];
-
-                            do { 
-                                if (node.nodeType == 1) { 
-                                    // Don't break tables and break at body 
-                                    if (node.nodeName == "TD" || node.nodeName == "BODY") 
-                                        break; 
-            
-                                    breakElms[breakElms.length] = node; 
-                                } 
-                            } while(node = node.parentNode); 
-
-                            var before = "", after = "</p>"; 
-                            before += content.substring(0, pos); 
-
-                            for (var i=0; i<breakElms.length; i++) { 
-                                before += "</" + breakElms[i].nodeName + ">"; 
-                                after += "<" + breakElms[(breakElms.length-1)-i].nodeName + ">"; 
-                            } 
-
-                            before += "<p>"; 
-                            content = before + content.substring(pos+7) + after; 
-                        } 
-                    } 
-
-                    if (this.editor.getParam("paste_create_linebreaks", true)) {
-                        content = content.replace(/\r\n/g, '<br />');
-                        content = content.replace(/\r/g, '<br />');
-                        content = content.replace(/\n/g, '<br />');
-                    }
-                } 
-            
-                this.editor.execCommand("mceInsertRawHTML", false, content); 
-            }
-        },
-
-        _insertWordContent : function(content) { 
-            var t = this, ed = t.editor;
-
-            if (content && content.length > 0) {
-                // Cleanup Word content
-                var bull = String.fromCharCode(8226);
-                var middot = String.fromCharCode(183);
-                var cb;
-
-                if ((cb = this.editor.getParam("paste_insert_word_content_callback", "")) != "")
-                    content = eval(cb + "('before', content)");
-
-                var rl = this.editor.getParam("paste_replace_list", '\u2122,<sup>TM</sup>,\u2026,...,\u201c|\u201d,",\u2019,\',\u2013|\u2014|\u2015|\u2212,-').split(',');
-                for (var i=0; i<rl.length; i+=2)
-                    content = content.replace(new RegExp(rl[i], 'gi'), rl[i+1]);
-
-                if (this.editor.getParam("paste_convert_headers_to_strong", false)) {
-                    content = content.replace(new RegExp('<p class=MsoHeading.*?>(.*?)<\/p>', 'gi'), '<p><b>$1</b></p>');
-                }
-
-                content = content.replace(new RegExp('tab-stops: list [0-9]+.0pt">', 'gi'), '">' + "--list--");
-                content = content.replace(new RegExp(bull + "(.*?)<BR>", "gi"), "<p>" + middot + "$1</p>");
-                content = content.replace(new RegExp('<SPAN style="mso-list: Ignore">', 'gi'), "<span>" + bull); // Covert to bull list
-                content = content.replace(/<o:p><\/o:p>/gi, "");
-                content = content.replace(new RegExp('<br style="page-break-before: always;.*>', 'gi'), '-- page break --'); // Replace pagebreaks
-                content = content.replace(new RegExp('<(!--)([^>]*)(--)>', 'g'), "");  // Word comments
-
-                if (this.editor.getParam("paste_remove_spans", true))
-                    content = content.replace(/<\/?span[^>]*>/gi, "");
-
-                if (this.editor.getParam("paste_remove_styles", true))
-                    content = content.replace(new RegExp('<(\\w[^>]*) style="([^"]*)"([^>]*)', 'gi'), "<$1$3");
-
-                content = content.replace(/<\/?font[^>]*>/gi, "");
-
-                // Strips class attributes.
-                switch (this.editor.getParam("paste_strip_class_attributes", "all")) {
-                    case "all":
-                        content = content.replace(/<(\w[^>]*) class=([^ |>]*)([^>]*)/gi, "<$1$3");
-                        break;
-
-                    case "mso":
-                        content = content.replace(new RegExp('<(\\w[^>]*) class="?mso([^ |>]*)([^>]*)', 'gi'), "<$1$3");
-                        break;
-                }
-
-                content = content.replace(new RegExp('href="?' + this._reEscape("" + document.location) + '', 'gi'), 'href="' + this.editor.documentBaseURI.getURI());
-                content = content.replace(/<(\w[^>]*) lang=([^ |>]*)([^>]*)/gi, "<$1$3");
-                content = content.replace(/<\\?\?xml[^>]*>/gi, "");
-                content = content.replace(/<\/?\w+:[^>]*>/gi, "");
-                content = content.replace(/-- page break --\s*<p>&nbsp;<\/p>/gi, ""); // Remove pagebreaks
-                content = content.replace(/-- page break --/gi, ""); // Remove pagebreaks
-
-        //      content = content.replace(/\/?&nbsp;*/gi, ""); &nbsp;
-        //      content = content.replace(/<p>&nbsp;<\/p>/gi, '');
-
-                if (!this.editor.getParam('force_p_newlines')) {
-                    content = content.replace('', '' ,'gi');
-                    content = content.replace('</p>', '<br /><br />' ,'gi');
-                }
-
-                if (!tinymce.isIE && !this.editor.getParam('force_p_newlines')) {
-                    content = content.replace(/<\/?p[^>]*>/gi, "");
-                }
-
-                content = content.replace(/<\/?div[^>]*>/gi, "");
-
-                // Convert all middlot lists to UL lists
-                if (this.editor.getParam("paste_convert_middot_lists", true)) {
-                    var div = ed.dom.create("div", null, content);
-
-                    // Convert all middot paragraphs to li elements
-                    var className = this.editor.getParam("paste_unindented_list_class", "unIndentedList");
-
-                    while (this._convertMiddots(div, "--list--")) ; // bull
-                    while (this._convertMiddots(div, middot, className)) ; // Middot
-                    while (this._convertMiddots(div, bull)) ; // bull
-
-                    content = div.innerHTML;
-                }
-
-                // Replace all headers with strong and fix some other issues
-                if (this.editor.getParam("paste_convert_headers_to_strong", false)) {
-                    content = content.replace(/<h[1-6]>&nbsp;<\/h[1-6]>/gi, '<p>&nbsp;&nbsp;</p>');
-                    content = content.replace(/<h[1-6]>/gi, '<p><b>');
-                    content = content.replace(/<\/h[1-6]>/gi, '</b></p>');
-                    content = content.replace(/<b>&nbsp;<\/b>/gi, '<b>&nbsp;&nbsp;</b>');
-                    content = content.replace(/^(&nbsp;)*/gi, '');
-                }
-
-                content = content.replace(/--list--/gi, ""); // Remove --list--
-
-                if ((cb = this.editor.getParam("paste_insert_word_content_callback", "")) != "")
-                    content = eval(cb + "('after', content)");
-
-                // Insert cleaned content
-                this.editor.execCommand("mceInsertContent", false, content);
-
-                if (this.editor.getParam('paste_force_cleanup_wordpaste', true)) {
-                    var ed = this.editor;
-
-                    window.setTimeout(function() {
-                        ed.execCommand("mceCleanup");
-                    }, 1); // Do normal cleanup detached from this thread
-                }
-            }
-        },
-
-        _reEscape : function(s) {
-            var l = "?.\\*[](){}+^$:";
-            var o = "";
-
-            for (var i=0; i<s.length; i++) {
-                var c = s.charAt(i);
-
-                if (l.indexOf(c) != -1)
-                    o += '\\' + c;
-                else
-                    o += c;
-            }
-
-            return o;
-        },
-
-        _convertMiddots : function(div, search, class_name) {
-            var mdot = String.fromCharCode(183);
-            var bull = String.fromCharCode(8226);
-
-            var nodes = div.getElementsByTagName("p");
-            var prevul;
-            for (var i=0; i<nodes.length; i++) {
-                var p = nodes[i];
-
-                // Is middot
-                if (p.innerHTML.indexOf(search) == 0) {
-                    var ul = document.createElement("ul");
-
-                    if (class_name)
-                        ul.className = class_name;
-
-                    // Add the first one
-                    var li = document.createElement("li");
-                    li.innerHTML = p.innerHTML.replace(new RegExp('' + mdot + '|' + bull + '|--list--|&nbsp;', "gi"), '');
-                    ul.appendChild(li);
-
-                    // Add the rest
-                    var np = p.nextSibling;
-                    while (np) {
-                        // If the node is whitespace, then
-                        // ignore it and continue on.
-                        if (np.nodeType == 3 && new RegExp('^\\s$', 'm').test(np.nodeValue)) {
-                                np = np.nextSibling;
-                                continue;
-                        }
-
-                        if (search == mdot) {
-                                if (np.nodeType == 1 && new RegExp('^o(\\s+|&nbsp;)').test(np.innerHTML)) {
-                                        // Second level of nesting
-                                        if (!prevul) {
-                                                prevul = ul;
-                                                ul = document.createElement("ul");
-                                                prevul.appendChild(ul);
-                                        }
-                                        np.innerHTML = np.innerHTML.replace(/^o/, '');
-                                } else {
-                                        // Pop the stack if we're going back up to the first level
-                                        if (prevul) {
-                                                ul = prevul;
-                                                prevul = null;
-                                        }
-                                        // Not element or middot paragraph
-                                        if (np.nodeType != 1 || np.innerHTML.indexOf(search) != 0)
-                                                break;
-                                }
-                        } else {
-                                // Not element or middot paragraph
-                                if (np.nodeType != 1 || np.innerHTML.indexOf(search) != 0)
-                                        break;
-                            }
-
-                        var cp = np.nextSibling;
-                        var li = document.createElement("li");
-                        li.innerHTML = np.innerHTML.replace(new RegExp('' + mdot + '|' + bull + '|--list--|&nbsp;', "gi"), '');
-                        np.parentNode.removeChild(np);
-                        ul.appendChild(li);
-                        np = cp;
-                    }
-
-                    p.parentNode.replaceChild(ul, p);
-
-                    return true;
-                }
-            }
-
-            return false;
-        },
-
-        _clipboardHTML : function() {
-            var div = document.getElementById('_TinyMCE_clipboardHTML');
-
-            if (!div) {
-                var div = document.createElement('DIV');
-                div.id = '_TinyMCE_clipboardHTML';
-
-                with (div.style) {
-                    visibility = 'hidden';
-                    overflow = 'hidden';
-                    position = 'absolute';
-                    width = 1;
-                    height = 1;
-                }
-
-                document.body.appendChild(div);
-            }
-
-            div.innerHTML = '';
-            var rng = document.body.createTextRange();
-            rng.moveToElementText(div);
-            rng.execCommand('Paste');
-            var html = div.innerHTML;
-            div.innerHTML = '';
-            return html;
-        }
-    });
-
-    // Register plugin
-    tinymce.PluginManager.add('paste', tinymce.plugins.PastePlugin);
-})();
+(function(){var Event=tinymce.dom.Event;tinymce.create('tinymce.plugins.PastePlugin',{init:function(ed,url){var t=this;t.editor=ed;ed.addCommand('mcePasteText',function(ui,v){if(ui){ed.windowManager.open({file:url+'/pastetext.htm',width:450,height:400,inline:1},{plugin_url:url});}else t._insertText(v.html,v.linebreaks);});ed.addCommand('mcePasteWord',function(ui,v){if(ui){ed.windowManager.open({file:url+'/pasteword.htm',width:450,height:400,inline:1},{plugin_url:url});}else t._insertWordContent(v);});ed.addCommand('mceSelectAll',function(){ed.execCommand('selectall');});ed.addButton('pastetext',{title:'paste.paste_text_desc',cmd:'mcePasteText',ui:true});ed.addButton('pasteword',{title:'paste.paste_word_desc',cmd:'mcePasteWord',ui:true});ed.addButton('selectall',{title:'paste.selectall_desc',cmd:'mceSelectAll'});if(ed.getParam("paste_auto_cleanup_on_paste",false)){ed.onPaste.add(function(ed,e){return t._handlePasteEvent(e)});}if(!tinymce.isIE&&ed.getParam("paste_auto_cleanup_on_paste",false)){ed.onKeyDown.add(function(ed,e){if(e.ctrlKey&&e.keyCode==86){window.setTimeout(function(){ed.execCommand("mcePasteText",true);},1);Event.cancel(e);}});}},getInfo:function(){return{longname:'Paste text/word',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste',version:tinymce.majorVersion+"."+tinymce.minorVersion};},_handlePasteEvent:function(e){var html=this._clipboardHTML(),ed=this.editor,sel=ed.selection,r;if(ed&&(r=sel.getRng())&&r.text.length>0)ed.execCommand('delete');if(html&&html.length>0)ed.execCommand('mcePasteWord',false,html);return Event.cancel(e);},_insertText:function(content,bLinebreaks){if(content&&content.length>0){if(bLinebreaks){if(this.editor.getParam("paste_create_paragraphs",true)){var rl=this.editor.getParam("paste_replace_list",'\u2122,<sup>TM</sup>,\u2026,...,\u201c|\u201d,",\u2019,\',\u2013|\u2014|\u2015|\u2212,-').split(',');for(var i=0;i<rl.length;i+=2)content=content.replace(new RegExp(rl[i],'gi'),rl[i+1]);content=content.replace(/\r\n\r\n/g,'</p><p>');content=content.replace(/\r\r/g,'</p><p>');content=content.replace(/\n\n/g,'</p><p>');if((pos=content.indexOf('</p><p>'))!=-1){this.editor.execCommand("Delete");var node=this.editor.selection.getNode();var breakElms=[];do{if(node.nodeType==1){if(node.nodeName=="TD"||node.nodeName=="BODY")break;breakElms[breakElms.length]=node;}}while(node=node.parentNode);var before="",after="</p>";before+=content.substring(0,pos);for(var i=0;i<breakElms.length;i++){before+="</"+breakElms[i].nodeName+">";after+="<"+breakElms[(breakElms.length-1)-i].nodeName+">";}before+="<p>";content=before+content.substring(pos+7)+after;}}if(this.editor.getParam("paste_create_linebreaks",true)){content=content.replace(/\r\n/g,'<br />');content=content.replace(/\r/g,'<br />');content=content.replace(/\n/g,'<br />');}}this.editor.execCommand("mceInsertRawHTML",false,content);}},_insertWordContent:function(content){var t=this,ed=t.editor;if(content&&content.length>0){var bull=String.fromCharCode(8226);var middot=String.fromCharCode(183);var cb;if((cb=this.editor.getParam("paste_insert_word_content_callback",""))!="")content=eval(cb+"('before', content)");var rl=this.editor.getParam("paste_replace_list",'\u2122,<sup>TM</sup>,\u2026,...,\u201c|\u201d,",\u2019,\',\u2013|\u2014|\u2015|\u2212,-').split(',');for(var i=0;i<rl.length;i+=2)content=content.replace(new RegExp(rl[i],'gi'),rl[i+1]);if(this.editor.getParam("paste_convert_headers_to_strong",false)){content=content.replace(new RegExp('<p class=MsoHeading.*?>(.*?)<\/p>','gi'),'<p><b>$1</b></p>');}content=content.replace(new RegExp('tab-stops: list [0-9]+.0pt">','gi'),'">'+"--list--");content=content.replace(new RegExp(bull+"(.*?)<BR>","gi"),"<p>"+middot+"$1</p>");content=content.replace(new RegExp('<SPAN style="mso-list: Ignore">','gi'),"<span>"+bull);content=content.replace(/<o:p><\/o:p>/gi,"");content=content.replace(new RegExp('<br style="page-break-before: always;.*>','gi'),'-- page break --');content=content.replace(new RegExp('<(!--)([^>]*)(--)>','g'),"");if(this.editor.getParam("paste_remove_spans",true))content=content.replace(/<\/?span[^>]*>/gi,"");if(this.editor.getParam("paste_remove_styles",true))content=content.replace(new RegExp('<(\\w[^>]*) style="([^"]*)"([^>]*)','gi'),"<$1$3");content=content.replace(/<\/?font[^>]*>/gi,"");switch(this.editor.getParam("paste_strip_class_attributes","all")){case"all":content=content.replace(/<(\w[^>]*) class=([^ |>]*)([^>]*)/gi,"<$1$3");break;case"mso":content=content.replace(new RegExp('<(\\w[^>]*) class="?mso([^ |>]*)([^>]*)','gi'),"<$1$3");break;}content=content.replace(new RegExp('href="?'+this._reEscape(""+document.location)+'','gi'),'href="'+this.editor.documentBaseURI.getURI());content=content.replace(/<(\w[^>]*) lang=([^ |>]*)([^>]*)/gi,"<$1$3");content=content.replace(/<\\?\?xml[^>]*>/gi,"");content=content.replace(/<\/?\w+:[^>]*>/gi,"");content=content.replace(/-- page break --\s*<p>&nbsp;<\/p>/gi,"");content=content.replace(/-- page break --/gi,"");if(!this.editor.getParam('force_p_newlines')){content=content.replace('','','gi');content=content.replace('</p>','<br /><br />','gi');}if(!tinymce.isIE&&!this.editor.getParam('force_p_newlines')){content=content.replace(/<\/?p[^>]*>/gi,"");}content=content.replace(/<\/?div[^>]*>/gi,"");if(this.editor.getParam("paste_convert_middot_lists",true)){var div=ed.dom.create("div",null,content);var className=this.editor.getParam("paste_unindented_list_class","unIndentedList");while(this._convertMiddots(div,"--list--"));while(this._convertMiddots(div,middot,className));while(this._convertMiddots(div,bull));content=div.innerHTML;}if(this.editor.getParam("paste_convert_headers_to_strong",false)){content=content.replace(/<h[1-6]>&nbsp;<\/h[1-6]>/gi,'<p>&nbsp;&nbsp;</p>');content=content.replace(/<h[1-6]>/gi,'<p><b>');content=content.replace(/<\/h[1-6]>/gi,'</b></p>');content=content.replace(/<b>&nbsp;<\/b>/gi,'<b>&nbsp;&nbsp;</b>');content=content.replace(/^(&nbsp;)*/gi,'');}content=content.replace(/--list--/gi,"");if((cb=this.editor.getParam("paste_insert_word_content_callback",""))!="")content=eval(cb+"('after', content)");this.editor.execCommand("mceInsertContent",false,content);if(this.editor.getParam('paste_force_cleanup_wordpaste',true)){var ed=this.editor;window.setTimeout(function(){ed.execCommand("mceCleanup");},1);}}},_reEscape:function(s){var l="?.\\*[](){}+^$:";var o="";for(var i=0;i<s.length;i++){var c=s.charAt(i);if(l.indexOf(c)!=-1)o+='\\'+c;else o+=c;}return o;},_convertMiddots:function(div,search,class_name){var mdot=String.fromCharCode(183);var bull=String.fromCharCode(8226);var nodes=div.getElementsByTagName("p");var prevul;for(var i=0;i<nodes.length;i++){var p=nodes[i];if(p.innerHTML.indexOf(search)==0){var ul=document.createElement("ul");if(class_name)ul.className=class_name;var li=document.createElement("li");li.innerHTML=p.innerHTML.replace(new RegExp(''+mdot+'|'+bull+'|--list--|&nbsp;',"gi"),'');ul.appendChild(li);var np=p.nextSibling;while(np){if(np.nodeType==3&&new RegExp('^\\s$','m').test(np.nodeValue)){np=np.nextSibling;continue;}if(search==mdot){if(np.nodeType==1&&new RegExp('^o(\\s+|&nbsp;)').test(np.innerHTML)){if(!prevul){prevul=ul;ul=document.createElement("ul");prevul.appendChild(ul);}np.innerHTML=np.innerHTML.replace(/^o/,'');}else{if(prevul){ul=prevul;prevul=null;}if(np.nodeType!=1||np.innerHTML.indexOf(search)!=0)break;}}else{if(np.nodeType!=1||np.innerHTML.indexOf(search)!=0)break;}var cp=np.nextSibling;var li=document.createElement("li");li.innerHTML=np.innerHTML.replace(new RegExp(''+mdot+'|'+bull+'|--list--|&nbsp;',"gi"),'');np.parentNode.removeChild(np);ul.appendChild(li);np=cp;}p.parentNode.replaceChild(ul,p);return true;}}return false;},_clipboardHTML:function(){var div=document.getElementById('_TinyMCE_clipboardHTML');if(!div){var div=document.createElement('DIV');div.id='_TinyMCE_clipboardHTML';with(div.style){visibility='hidden';overflow='hidden';position='absolute';width=1;height=1;}document.body.appendChild(div);}div.innerHTML='';var rng=document.body.createTextRange();rng.moveToElementText(div);rng.execCommand('Paste');var html=div.innerHTML;div.innerHTML='';return html;}});tinymce.PluginManager.add('paste',tinymce.plugins.PastePlugin);})();

trunk/wp-includes/js/tinymce/plugins/paste/pastetext.htm

@@ -3 +3 @@
     <title>{#paste.paste_text_desc}</title>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-    <script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+    <script type="text/javascript" src="../../tiny_mce_popup.js"></script>
     <script type="text/javascript" src="js/pastetext.js"></script>
-    <base target="_self" />
+    <script type="text/javascript">tinyMCEPopup.onInit.add(function(){window.setTimeout(function(){document.getElementById('htmlSource').focus();},500);});</script>
+    <base target="_self" />
 </head>
 <body onresize="resizeInputs();" style="display:none; overflow:hidden;">
@@ -23 +24 @@
     <div class="mceActionPanel">
         <div style="float: left">
-            <input type="button" name="insert" value="{#insert}" onclick="saveContent();" id="insert" />
+            <input type="button" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" id="cancel" />
         </div>
 
         <div style="float: right">
-            <input type="button" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" id="cancel" />
+            <input type="submit" name="insert" value="{#insert}" onclick="saveContent();" id="insert" />
         </div>
     </div>

trunk/wp-includes/js/tinymce/plugins/paste/pasteword.htm

@@ -18 +18 @@
         <div class="mceActionPanel">
             <div style="float: left">
-                <input type="button" id="insert" name="insert" value="{#insert}" onclick="saveContent();" />
+                <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
             </div>
 
             <div style="float: right">
-                <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+                <input type="submit" id="insert" name="insert" value="{#insert}" onclick="saveContent();" />
             </div>
         </div>

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

@@ -1 @@
-/**
- * $Id: editor_plugin_src.js 264 2007-04-26 20:53:09Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-    var Event = tinymce.dom.Event, grep = tinymce.grep, each = tinymce.each, inArray = tinymce.inArray, isOldWebKit = tinymce.isOldWebKit;
-
-    tinymce.create('tinymce.plugins.Safari', {
-        init : function(ed) {
-            var t = this, dom;
-
-            // Ignore on non webkit
-            if (!tinymce.isWebKit)
-                return;
-
-            t.editor = ed;
-            t.webKitFontSizes = ['x-small', 'small', 'medium', 'large', 'x-large', 'xx-large', '-webkit-xxx-large'];
-            t.namedFontSizes = ['xx-small', 'x-small','small','medium','large','x-large', 'xx-large'];
-
-            // Safari will crash if the build in createlink command is used
-/*          ed.addCommand('CreateLink', function(u, v) {
-                ed.execCommand("mceInsertContent", false, '<a href="' + dom.encode(v) + '">' + ed.selection.getContent() + '</a>');
-            });*/
-
-            // Workaround for FormatBlock bug, http://bugs.webkit.org/show_bug.cgi?id=16004
-            ed.addCommand('FormatBlock', function(u, v) {
-                var dom = ed.dom, e = dom.getParent(ed.selection.getNode(), dom.isBlock);
-
-                if (e)
-                    dom.replace(dom.create(v), e, 1);
-                else
-                    ed.getDoc().execCommand("FormatBlock", false, v);
-            });
-
-            // Workaround for InsertHTML bug, http://bugs.webkit.org/show_bug.cgi?id=16382
-            ed.addCommand('mceInsertContent', function(u, v) {
-                ed.getDoc().execCommand("InsertText", false, 'mce_marker');
-                ed.getBody().innerHTML = ed.getBody().innerHTML.replace(/mce_marker/g, v + '<span id="_mce_tmp">XX</span>');
-                ed.selection.select(ed.dom.get('_mce_tmp'));
-                ed.getDoc().execCommand("Delete", false, ' ');
-            });
-
-            // Workaround for List ID bug, http://bugs.webkit.org/show_bug.cgi?id=16004
-/*          function addList(c) {
-                var cb = Event.add(ed.getDoc(), 'DOMNodeInserted', function(e) {
-                    e = e.target;
-
-                    if (e.nodeName == 'OL' || e.nodeName == 'UL')
-                        e.id = '';
-                });
-
-                ed.getDoc().execCommand(c, false, false);
-                Event.remove(ed.getDoc(), 'DOMNodeInserted', cb);
-            };
-
-            ed.addCommand('InsertUnorderedList', function() {addList('InsertUnorderedList');});
-            ed.addCommand('InsertOrderedList', function() {addList('InsertOrderedList');});*/
-
-            // Safari returns incorrect values
-            ed.addQueryValueHandler('FontSize', function(u, v) {
-                var e, v;
-
-                // Check for the real font size at the start of selection
-                if ((e = ed.dom.getParent(ed.selection.getStart(), 'span')) && (v = e.style.fontSize))
-                    return tinymce.inArray(t.namedFontSizes, v) + 1;
-
-                // Check for the real font size at the end of selection
-                if ((e = ed.dom.getParent(ed.selection.getEnd(), 'span')) && (v = e.style.fontSize))
-                    return tinymce.inArray(t.namedFontSizes, v) + 1;
-
-                // Return default value it's better than nothing right!
-                return ed.getDoc().queryCommandValue('FontSize');
-            });
-
-            // Safari returns incorrect values
-            ed.addQueryValueHandler('FontName', function(u, v) {
-                var e, v;
-
-                // Check for the real font name at the start of selection
-                if ((e = ed.dom.getParent(ed.selection.getStart(), 'span')) && (v = e.style.fontFamily))
-                    return v.replace(/, /g, ',');
-
-                // Check for the real font name at the end of selection
-                if ((e = ed.dom.getParent(ed.selection.getEnd(), 'span')) && (v = e.style.fontFamily))
-                    return v.replace(/, /g, ',');
-
-                // Return default value it's better than nothing right!
-                return ed.getDoc().queryCommandValue('FontName');
-            });
-
-            // Workaround for bug, http://bugs.webkit.org/show_bug.cgi?id=12250
-            ed.onClick.add(function(ed, e) {
-                e = e.target;
-
-                if (e.nodeName == 'IMG') {
-                    t.selElm = e;
-                    ed.selection.select(e);
-                } else
-                    t.selElm = null;
-            });
-
-            ed.onBeforeExecCommand.add(function(ed, c, b) {
-                var r = t.bookmarkRng;
-
-                // Restore selection
-                if (r) {
-                    ed.selection.setRng(r);
-                    t.bookmarkRng = null;
-                    //console.debug('restore', r.startContainer, r.startOffset, r.endContainer, r.endOffset);
-                }
-            });
-
-            ed.onInit.add(function() {
-                t._fixWebKitSpans();
-
-                ed.windowManager.onOpen.add(function() {
-                    var r = ed.selection.getRng();
-
-                    // Store selection if valid
-                    if (r.startContainer != ed.getDoc()) {
-                        t.bookmarkRng = r.cloneRange();
-                        //console.debug('store', r.startContainer, r.startOffset, r.endContainer, r.endOffset);
-                    }
-                });
-
-                ed.windowManager.onClose.add(function() {
-                    t.bookmarkRng = null;
-                });
-
-                if (isOldWebKit)
-                    t._patchSafari2x(ed);
-            });
-
-            ed.onSetContent.add(function() {
-                dom = ed.dom;
-
-                // Convert strong,b,em,u,strike to spans
-                each(['strong','b','em','u','strike','sub','sup','a'], function(v) {
-                    each(grep(dom.select(v)).reverse(), function(n) {
-                        var nn = n.nodeName.toLowerCase(), st;
-
-                        // Convert anchors into images
-                        if (nn == 'a') {
-                            if (n.name)
-                                dom.replace(dom.create('img', {mce_name : 'a', name : n.name, 'class' : 'mceItemAnchor'}), n);
-
-                            return;
-                        }
-
-                        switch (nn) {
-                            case 'b':
-                            case 'strong':
-                                if (nn == 'b')
-                                    nn = 'strong';
-
-                                st = 'font-weight: bold;';
-                                break;
-
-                            case 'em':
-                                st = 'font-style: italic;';
-                                break;
-
-                            case 'u':
-                                st = 'text-decoration: underline;';
-                                break;
-
-                            case 'sub':
-                                st = 'vertical-align: sub;';
-                                break;
-
-                            case 'sup':
-                                st = 'vertical-align: super;';
-                                break;
-
-                            case 'strike':
-                                st = 'text-decoration: line-through;';
-                                break;
-                        }
-
-                        dom.replace(dom.create('span', {mce_name : nn, style : st, 'class' : 'Apple-style-span'}), n, 1);
-                    });
-                });
-            });
-
-            ed.onPreProcess.add(function(ed, o) {
-                dom = ed.dom;
-
-                each(grep(o.node.getElementsByTagName('span')).reverse(), function(n) {
-                    var v, bg;
-
-                    if (o.get) {
-                        if (dom.hasClass(n, 'Apple-style-span')) {
-                            bg = n.style.backgroundColor;
-
-                            switch (dom.getAttrib(n, 'mce_name')) {
-                                case 'font':
-                                    if (!ed.settings.convert_fonts_to_spans)
-                                        dom.setAttrib(n, 'style', '');
-                                    break;
-
-                                case 'strong':
-                                case 'em':
-                                case 'sub':
-                                case 'sup':
-                                    dom.setAttrib(n, 'style', '');
-                                    break;
-
-                                case 'strike':
-                                case 'u':
-                                    if (!ed.settings.inline_styles)
-                                        dom.setAttrib(n, 'style', '');
-                                    else
-                                        dom.setAttrib(n, 'mce_name', '');
-
-                                    break;
-
-                                default:
-                                    if (!ed.settings.inline_styles)
-                                        dom.setAttrib(n, 'style', '');
-                            }
-
-
-                            if (bg)
-                                n.style.backgroundColor = bg;
-                        }
-                    }
-
-                    if (dom.hasClass(n, 'mceItemRemoved'))
-                        dom.remove(n, 1);
-                });
-            });
-
-            ed.onPostProcess.add(function(ed, o) {
-                // Safari adds BR at end of all block elements
-                o.content = o.content.replace(/<br \/><\/(h[1-6]|div|p|address|pre)>/g, '</$1>');
-
-                // Safari adds id="undefined" to HR elements
-                o.content = o.content.replace(/ id=\"undefined\"/g, '');
-            });
-        },
-
-        _fixWebKitSpans : function() {
-            var t = this, ed = t.editor;
-
-            if (!isOldWebKit) {
-                // Use mutator events on new WebKit
-                Event.add(ed.getDoc(), 'DOMNodeInserted', function(e) {
-                    e = e.target;
-
-                    if (e && e.nodeType == 1)
-                        t._fixAppleSpan(e);
-                });
-            } else {
-                // Do post command processing in old WebKit since the browser crashes on Mutator events :(
-                ed.onExecCommand.add(function() {
-                    each(ed.dom.select('span'), function(n) {
-                        t._fixAppleSpan(n);
-                    });
-
-                    ed.nodeChanged();
-                });
-            }
-        },
-
-        _fixAppleSpan : function(e) {
-            var ed = this.editor, dom = ed.dom, fz = this.webKitFontSizes, fzn = this.namedFontSizes, s = ed.settings, st, p;
-
-            if (dom.getAttrib(e, 'mce_fixed'))
-                return;
-
-            // Handle Apple style spans
-            if (e.nodeName == 'SPAN' && e.className == 'Apple-style-span') {
-                st = e.style;
-
-                if (!s.convert_fonts_to_spans) {
-                    if (st.fontSize) {
-                        dom.setAttrib(e, 'mce_name', 'font');
-                        dom.setAttrib(e, 'size', inArray(fz, st.fontSize) + 1);
-                    }
-
-                    if (st.fontFamily) {
-                        dom.setAttrib(e, 'mce_name', 'font');
-                        dom.setAttrib(e, 'face', st.fontFamily);
-                    }
-
-                    if (st.color) {
-                        dom.setAttrib(e, 'mce_name', 'font');
-                        dom.setAttrib(e, 'color', dom.toHex(st.color));
-                    }
-
-                    if (st.backgroundColor) {
-                        dom.setAttrib(e, 'mce_name', 'font');
-                        dom.setStyle(e, 'background-color', st.backgroundColor);
-                    }
-                } else {
-                    if (st.fontSize)
-                        dom.setStyle(e, 'fontSize', fzn[inArray(fz, st.fontSize)]);
-                }
-
-                if (st.fontWeight == 'bold')
-                    dom.setAttrib(e, 'mce_name', 'strong');
-
-                if (st.fontStyle == 'italic')
-                    dom.setAttrib(e, 'mce_name', 'em');
-
-                if (st.textDecoration == 'underline')
-                    dom.setAttrib(e, 'mce_name', 'u');
-
-                if (st.textDecoration == 'line-through')
-                    dom.setAttrib(e, 'mce_name', 'strike');
-
-                if (st.verticalAlign == 'super')
-                    dom.setAttrib(e, 'mce_name', 'sup');
-
-                if (st.verticalAlign == 'sub')
-                    dom.setAttrib(e, 'mce_name', 'sub');
-
-                dom.setAttrib(e, 'mce_fixed', '1');
-            }
-        },
-
-        _patchSafari2x : function(ed) {
-            var t = this, setContent, getNode, dom = ed.dom, lr;
-
-            // Inline dialogs
-            if (ed.windowManager.onBeforeOpen) {
-                ed.windowManager.onBeforeOpen.add(function() {
-                    r = ed.selection.getRng();
-                });
-            }
-
-            // Fake select on 2.x
-            ed.selection.select = function(n) {
-                this.getSel().setBaseAndExtent(n, 0, n, 1);
-            };
-
-            getNode = ed.selection.getNode;
-            ed.selection.getNode = function() {
-                return t.selElm || getNode.call(this);
-            };
-
-            // Fake range on Safari 2.x
-            ed.selection.getRng = function() {
-                var t = this, s = t.getSel(), d = ed.getDoc(), r, rb, ra, di;
-
-                // Fake range on Safari 2.x
-                if (s.anchorNode) {
-                    r = d.createRange();
-
-                    try {
-                        // Setup before range
-                        rb = d.createRange();
-                        rb.setStart(s.anchorNode, s.anchorOffset);
-                        rb.collapse(1);
-
-                        // Setup after range
-                        ra = d.createRange();
-                        ra.setStart(s.focusNode, s.focusOffset);
-                        ra.collapse(1);
-
-                        // Setup start/end points by comparing locations
-                        di = rb.compareBoundaryPoints(rb.START_TO_END, ra) < 0;
-                        r.setStart(di ? s.anchorNode : s.focusNode, di ? s.anchorOffset : s.focusOffset);
-                        r.setEnd(di ? s.focusNode : s.anchorNode, di ? s.focusOffset : s.anchorOffset);
-
-                        lr = r;
-                    } catch (ex) {
-                        // Sometimes fails, at least we tried to do it by the book. I hope Safari 2.x will go disappear soooon!!!
-                    }
-                }
-
-                return r || lr;
-            };
-
-            // Fix setContent so it works
-            setContent = ed.selection.setContent;
-            ed.selection.setContent = function(h, s) {
-                var r = this.getRng(), b;
-
-                try {
-                    setContent.call(this, h, s);
-                } catch (ex) {
-                    // Workaround for Safari 2.x
-                    b = dom.create('body');
-                    b.innerHTML = h;
-
-                    each(b.childNodes, function(n) {
-                        r.insertNode(n.cloneNode(true));
-                    });
-                }
-            };
-        }
-    });
-
-    // Register plugin
-    tinymce.PluginManager.add('safari', tinymce.plugins.Safari);
-})();
-
+(function(){var Event=tinymce.dom.Event,grep=tinymce.grep,each=tinymce.each,inArray=tinymce.inArray,isOldWebKit=tinymce.isOldWebKit;tinymce.create('tinymce.plugins.Safari',{init:function(ed){var t=this,dom;if(!tinymce.isWebKit)return;t.editor=ed;t.webKitFontSizes=['x-small','small','medium','large','x-large','xx-large','-webkit-xxx-large'];t.namedFontSizes=['xx-small','x-small','small','medium','large','x-large','xx-large'];ed.addCommand('FormatBlock',function(u,v){var dom=ed.dom,e=dom.getParent(ed.selection.getNode(),dom.isBlock);if(e)dom.replace(dom.create(v),e,1);else ed.getDoc().execCommand("FormatBlock",false,v);});ed.addCommand('mceInsertContent',function(u,v){ed.getDoc().execCommand("InsertText",false,'mce_marker');ed.getBody().innerHTML=ed.getBody().innerHTML.replace(/mce_marker/g,v+'<span id="_mce_tmp">XX</span>');ed.selection.select(ed.dom.get('_mce_tmp'));ed.getDoc().execCommand("Delete",false,' ');});ed.onKeyPress.add(function(ed,e){if(e.keyCode==13&&e.shiftKey){t._insertBR(ed);Event.cancel(e);}});ed.addQueryValueHandler('FontSize',function(u,v){var e,v;if((e=ed.dom.getParent(ed.selection.getStart(),'span'))&&(v=e.style.fontSize))return tinymce.inArray(t.namedFontSizes,v)+1;if((e=ed.dom.getParent(ed.selection.getEnd(),'span'))&&(v=e.style.fontSize))return tinymce.inArray(t.namedFontSizes,v)+1;return ed.getDoc().queryCommandValue('FontSize');});ed.addQueryValueHandler('FontName',function(u,v){var e,v;if((e=ed.dom.getParent(ed.selection.getStart(),'span'))&&(v=e.style.fontFamily))return v.replace(/, /g,',');if((e=ed.dom.getParent(ed.selection.getEnd(),'span'))&&(v=e.style.fontFamily))return v.replace(/, /g,',');return ed.getDoc().queryCommandValue('FontName');});ed.onClick.add(function(ed,e){e=e.target;if(e.nodeName=='IMG'){t.selElm=e;ed.selection.select(e);}else t.selElm=null;});ed.onBeforeExecCommand.add(function(ed,c,b){var r=t.bookmarkRng;if(r){ed.selection.setRng(r);t.bookmarkRng=null;}});ed.onInit.add(function(){t._fixWebKitSpans();ed.windowManager.onOpen.add(function(){var r=ed.selection.getRng();if(r.startContainer!=ed.getDoc()){t.bookmarkRng=r.cloneRange();}});ed.windowManager.onClose.add(function(){t.bookmarkRng=null;});if(isOldWebKit)t._patchSafari2x(ed);});ed.onSetContent.add(function(){dom=ed.dom;each(['strong','b','em','u','strike','sub','sup','a'],function(v){each(grep(dom.select(v)).reverse(),function(n){var nn=n.nodeName.toLowerCase(),st;if(nn=='a'){if(n.name)dom.replace(dom.create('img',{mce_name:'a',name:n.name,'class':'mceItemAnchor'}),n);return;}switch(nn){case'b':case'strong':if(nn=='b')nn='strong';st='font-weight: bold;';break;case'em':st='font-style: italic;';break;case'u':st='text-decoration: underline;';break;case'sub':st='vertical-align: sub;';break;case'sup':st='vertical-align: super;';break;case'strike':st='text-decoration: line-through;';break;}dom.replace(dom.create('span',{mce_name:nn,style:st,'class':'Apple-style-span'}),n,1);});});});ed.onPreProcess.add(function(ed,o){dom=ed.dom;each(grep(o.node.getElementsByTagName('span')).reverse(),function(n){var v,bg;if(o.get){if(dom.hasClass(n,'Apple-style-span')){bg=n.style.backgroundColor;switch(dom.getAttrib(n,'mce_name')){case'font':if(!ed.settings.convert_fonts_to_spans)dom.setAttrib(n,'style','');break;case'strong':case'em':case'sub':case'sup':dom.setAttrib(n,'style','');break;case'strike':case'u':if(!ed.settings.inline_styles)dom.setAttrib(n,'style','');else dom.setAttrib(n,'mce_name','');break;default:if(!ed.settings.inline_styles)dom.setAttrib(n,'style','');}if(bg)n.style.backgroundColor=bg;}}if(dom.hasClass(n,'mceItemRemoved'))dom.remove(n,1);});});ed.onPostProcess.add(function(ed,o){o.content=o.content.replace(/<br \/><\/(h[1-6]|div|p|address|pre)>/g,'</$1>');o.content=o.content.replace(/ id=\"undefined\"/g,'');});},_fixWebKitSpans:function(){var t=this,ed=t.editor;if(!isOldWebKit){Event.add(ed.getDoc(),'DOMNodeInserted',function(e){e=e.target;if(e&&e.nodeType==1)t._fixAppleSpan(e);});}else{ed.onExecCommand.add(function(){each(ed.dom.select('span'),function(n){t._fixAppleSpan(n);});ed.nodeChanged();});}},_fixAppleSpan:function(e){var ed=this.editor,dom=ed.dom,fz=this.webKitFontSizes,fzn=this.namedFontSizes,s=ed.settings,st,p;if(dom.getAttrib(e,'mce_fixed'))return;if(e.nodeName=='SPAN'&&e.className=='Apple-style-span'){st=e.style;if(!s.convert_fonts_to_spans){if(st.fontSize){dom.setAttrib(e,'mce_name','font');dom.setAttrib(e,'size',inArray(fz,st.fontSize)+1);}if(st.fontFamily){dom.setAttrib(e,'mce_name','font');dom.setAttrib(e,'face',st.fontFamily);}if(st.color){dom.setAttrib(e,'mce_name','font');dom.setAttrib(e,'color',dom.toHex(st.color));}if(st.backgroundColor){dom.setAttrib(e,'mce_name','font');dom.setStyle(e,'background-color',st.backgroundColor);}}else{if(st.fontSize)dom.setStyle(e,'fontSize',fzn[inArray(fz,st.fontSize)]);}if(st.fontWeight=='bold')dom.setAttrib(e,'mce_name','strong');if(st.fontStyle=='italic')dom.setAttrib(e,'mce_name','em');if(st.textDecoration=='underline')dom.setAttrib(e,'mce_name','u');if(st.textDecoration=='line-through')dom.setAttrib(e,'mce_name','strike');if(st.verticalAlign=='super')dom.setAttrib(e,'mce_name','sup');if(st.verticalAlign=='sub')dom.setAttrib(e,'mce_name','sub');dom.setAttrib(e,'mce_fixed','1');}},_patchSafari2x:function(ed){var t=this,setContent,getNode,dom=ed.dom,lr;if(ed.windowManager.onBeforeOpen){ed.windowManager.onBeforeOpen.add(function(){r=ed.selection.getRng();});}ed.selection.select=function(n){this.getSel().setBaseAndExtent(n,0,n,1);};getNode=ed.selection.getNode;ed.selection.getNode=function(){return t.selElm||getNode.call(this);};ed.selection.getRng=function(){var t=this,s=t.getSel(),d=ed.getDoc(),r,rb,ra,di;if(s.anchorNode){r=d.createRange();try{rb=d.createRange();rb.setStart(s.anchorNode,s.anchorOffset);rb.collapse(1);ra=d.createRange();ra.setStart(s.focusNode,s.focusOffset);ra.collapse(1);di=rb.compareBoundaryPoints(rb.START_TO_END,ra)<0;r.setStart(di?s.anchorNode:s.focusNode,di?s.anchorOffset:s.focusOffset);r.setEnd(di?s.focusNode:s.anchorNode,di?s.focusOffset:s.anchorOffset);lr=r;}catch(ex){}}return r||lr;};setContent=ed.selection.setContent;ed.selection.setContent=function(h,s){var r=this.getRng(),b;try{setContent.call(this,h,s);}catch(ex){b=dom.create('body');b.innerHTML=h;each(b.childNodes,function(n){r.insertNode(n.cloneNode(true));});}};},_insertBR:function(ed){var dom=ed.dom,s=ed.selection,r=s.getRng(),br;r.insertNode(br=dom.create('br'));r.setStartAfter(br);r.setEndAfter(br);s.setRng(r);if(s.getSel().focusNode==br.previousSibling){s.select(dom.insertAfter(dom.doc.createTextNode('\u00a0'),br));s.collapse(1);}ed.getWin().scrollTo(0,dom.getPos(s.getRng().startContainer).y);}});tinymce.PluginManager.add('safari',tinymce.plugins.Safari);})();

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

@@ -1 @@
-/* Import plugin specific language pack */
-//tinyMCE.importPluginLanguagePack('wordpress', 'en');
+/**
+ * Wordpress plugin.
+ */
 
-var TinyMCE_wordpressPlugin = {
-    getInfo : function() {
-        return {
-            longname : 'WordPress Plugin',
-            author : 'WordPress',
-            authorurl : 'http://wordpress.org',
-            infourl : 'http://wordpress.org',
-            version : '1'
-        };
-    },
+(function() {
+    var DOM = tinymce.DOM;
 
-    getControlHTML : function(control_name) {
-        switch (control_name) {
-            case "wp_more":
-                return tinyMCE.getButtonHTML(control_name, 'lang_wordpress_more_button', '{$pluginurl}/images/more.gif', 'wpMore');
-            case "wp_page":
-                return tinyMCE.getButtonHTML(control_name, 'lang_wordpress_page_button', '{$pluginurl}/images/page.gif', 'wpPage');
-            case "wp_help":
-                var buttons = tinyMCE.getButtonHTML(control_name, 'lang_help_button_title', '{$pluginurl}/images/help.gif', 'wpHelp');
-                var hiddenControls = '<div class="zerosize">'
-                + '<input type="button" accesskey="n" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceSpellCheck\',false);" />'
-                + '<input type="button" accesskey="k" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'Strikethrough\',false);" />'
-                + '<input type="button" accesskey="l" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'InsertUnorderedList\',false);" />'
-                + '<input type="button" accesskey="o" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'InsertOrderedList\',false);" />'
-                + '<input type="button" accesskey="w" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'Outdent\',false);" />'
-                + '<input type="button" accesskey="q" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'Indent\',false);" />'
-                + '<input type="button" accesskey="f" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'JustifyLeft\',false);" />'
-                + '<input type="button" accesskey="c" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'JustifyCenter\',false);" />'
-                + '<input type="button" accesskey="r" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'JustifyRight\',false);" />'
-                + '<input type="button" accesskey="j" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'JustifyFull\',false);" />'
-                + '<input type="button" accesskey="a" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceLink\',true);" />'
-                + '<input type="button" accesskey="s" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'unlink\',false);" />'
-                + '<input type="button" accesskey="m" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'mceImage\',true);" />'
-                + '<input type="button" accesskey="t" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'wpMore\');" />'
-                + '<input type="button" accesskey="g" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'wpPage\');" />'
-                + '<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="h" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'wpHelp\',false);" />'
-                + '<input type="button" accesskey="b" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'Bold\',false);" />'
-                + '<input type="button" accesskey="v" onclick="tinyMCE.execInstanceCommand(\'{$editor_id}\',\'wpAdv\',false);" />'
-                + '</div>';
-                return buttons+hiddenControls;
-            case "wp_adv":
-                return tinyMCE.getButtonHTML(control_name, 'lang_wordpress_adv_button', '{$pluginurl}/images/toolbars.gif', 'wpAdv');
-            case "wp_adv_start":
-                return '<div id="wpadvbar" style="display:none;"><br />';
-            case "wp_adv_end":
-                return '</div>';
-        }
-        return '';
-    },
+    // Load plugin specific language pack
+    tinymce.PluginManager.requireLangPack('wordpress');
 
-    execCommand : function(editor_id, element, command, user_interface, value) {
-        var inst = tinyMCE.getInstanceById(editor_id);
-        var focusElm = inst.getFocusElement();
-        var doc = inst.getDoc();
+    tinymce.create('tinymce.plugins.WordPress', {
+        init : function(ed, url) {
+            var t = this, tbId = ed.getParam('wordpress_adv_toolbar', 'toolbar2');
+            var moreHTML = '<img src="' + url + '/img/trans.gif" class="mceWPmore mceItemNoResize" title="'+ed.getLang('wordpress.wp_more_alt')+'" />';
+            var nextpageHTML = '<img src="' + url + '/img/trans.gif" class="mceWPnextpage mceItemNoResize" title="'+ed.getLang('wordpress.wp_page_alt')+'" />';
 
-        function getAttrib(elm, name) {
-            return elm.getAttribute(name) ? elm.getAttribute(name) : "";
-        }
+            // Hides the specified toolbar and resizes the iframe
+            ed.onPostRender.add(function() {
+                DOM.hide(ed.controlManager.get(tbId).id);
+                t._resizeIframe(ed, tbId, 28);
+            });
 
-        // Handle commands
-        switch (command) {
-            case "wpMore":
-                var flag = "";
-                var template = new Array();
-                var altMore = tinyMCE.getLang('lang_wordpress_more_alt');
+            // Register buttons
+            ed.addButton('wp_more', {
+                title : 'wordpress.wp_more_desc',
+                image : url + '/img/more.gif',
+                onclick : function() {
+                    ed.execCommand('mceInsertContent', 0, moreHTML);
+                }
+            });
 
-                // Is selection a image
-                if (focusElm != null && focusElm.nodeName.toLowerCase() == "img") {
-                    flag = getAttrib(focusElm, 'class');
+            ed.addButton('wp_page', {
+                title : 'wordpress.wp_page_desc',
+                image : url + '/img/page.gif',
+                onclick : function() {
+        //          ed.execCommand('mcePageBreak');
+                    ed.execCommand('mceInsertContent', 0, nextpageHTML);
+                }
+            });
 
-                    if (flag != 'mce_plugin_wordpress_more') // Not a wordpress
-                        return true;
+            ed.addButton('wp_help', {
+                title : 'wordpress.wp_help_desc',
+                image : url + '/img/help.gif',
+                onclick : function() {
+                    ed.windowManager.open({
+                        url : tinymce.baseURL + '/wp-mce-help.php',
+                        width : 450,
+                        height : 420,
+                        inline : 1
+                    });
+                }
+            });
 
-                    action = "update";
-                }
+            ed.addButton('wp_adv', {
+                title : 'wordpress.wp_adv_desc',
+                image : url + '/img/toolbars.gif',
+                onclick : function() {
+                    var id = ed.controlManager.get(tbId).id, cm = ed.controlManager;
 
-                html = ''
-                    + '<img src="' + (tinyMCE.getParam("theme_href") + "/images/spacer.gif") + '" '
-                    + ' width="100%" height="10px" '
-                    + 'alt="'+altMore+'" title="'+altMore+'" class="mce_plugin_wordpress_more" name="mce_plugin_wordpress_more" />';
-                tinyMCE.execInstanceCommand(editor_id, 'mceInsertContent', false, html);
-                tinyMCE.selectedInstance.repaint();
-                return true;
-
-            case "wpPage":
-                var flag = "";
-                var template = new Array();
-                var altPage = tinyMCE.getLang('lang_wordpress_more_alt');
-
-                // Is selection a image
-                if (focusElm != null && focusElm.nodeName.toLowerCase() == "img") {
-                    flag = getAttrib(focusElm, 'name');
-
-                    if (flag != 'mce_plugin_wordpress_page') // Not a wordpress
-                        return true;
-
-                    action = "update";
-                }
-
-                html = ''
-                    + '<img src="' + (tinyMCE.getParam("theme_href") + "/images/spacer.gif") + '" '
-                    + ' width="100%" height="10px" '
-                    + 'alt="'+altPage+'" title="'+altPage+'" class="mce_plugin_wordpress_page" name="mce_plugin_wordpress_page" />';
-                tinyMCE.execCommand("mceInsertContent",true,html);
-                tinyMCE.selectedInstance.repaint();
-                return true;
-
-            case "wpHelp":
-                var template = new Array();
-
-                template['file']   = tinyMCE.baseURL + '/wp-mce-help.php';
-                template['width']  = 480;
-                template['height'] = 380;
-
-                args = {
-                    resizable : 'yes',
-                    scrollbars : 'yes'
-                };
-
-                tinyMCE.openWindow(template, args);
-                return true;
-            case "wpAdv":
-                var adv = document.getElementById('wpadvbar');
-                if ( adv.style.display == 'none' ) {
-                    adv.style.display = 'block';
-                    tinyMCE.switchClass(editor_id + '_wp_adv', 'mceButtonSelected');
-                } else {
-                    adv.style.display = 'none';
-                    tinyMCE.switchClass(editor_id + '_wp_adv', 'mceButtonNormal');
-                }
-                return true;
-        }
-
-        // Pass to next handler in chain
-        return false;
-    },
-
-    cleanup : function(type, content) {
-        switch (type) {
-
-            case "insert_to_editor":
-                var startPos = 0;
-                var altMore = tinyMCE.getLang('lang_wordpress_more_alt');
-                var altPage = tinyMCE.getLang('lang_wordpress_page_alt');
-
-                // Parse all <!--more--> tags and replace them with images
-                while ((startPos = content.indexOf('<!--more', startPos)) != -1) {
-                    var endPos = content.indexOf('-->', startPos) + 3;
-                    // Insert image
-                    var moreText = content.substring(startPos + 8, endPos - 3);
-                    var contentAfter = content.substring(endPos);
-                    content = content.substring(0, startPos);
-                    content += '<img src="' + (tinyMCE.getParam("theme_href") + "/images/spacer.gif") + '" ';
-                    content += ' width="100%" height="10px" moretext="'+moreText+'" ';
-                    content += 'alt="'+altMore+'" title="'+altMore+'" class="mce_plugin_wordpress_more" name="mce_plugin_wordpress_more" />';
-                    content += contentAfter;
-
-                    startPos++;
-                }
-                var startPos = 0;
-
-                // Parse all <!--page--> tags and replace them with images
-                while ((startPos = content.indexOf('<!--nextpage-->', startPos)) != -1) {
-                    // Insert image
-                    var contentAfter = content.substring(startPos + 15);
-                    content = content.substring(0, startPos);
-                    content += '<img src="' + (tinyMCE.getParam("theme_href") + "/images/spacer.gif") + '" ';
-                    content += ' width="100%" height="10px" ';
-                    content += 'alt="'+altPage+'" title="'+altPage+'" class="mce_plugin_wordpress_page" name="mce_plugin_wordpress_page" />';
-                    content += contentAfter;
-
-                    startPos++;
-                }
-
-                // Look for \n in <pre>, replace with <br>
-                var startPos = -1;
-                while ((startPos = content.indexOf('<pre', startPos+1)) != -1) {
-                    var endPos = content.indexOf('</pre>', startPos+1);
-                    var innerPos = content.indexOf('>', startPos+1);
-                    var chunkBefore = content.substring(0, innerPos);
-                    var chunkAfter = content.substring(endPos);
-                    
-                    var innards = content.substring(innerPos, endPos);
-                    innards = innards.replace(/\n/g, '<br />');
-                    content = chunkBefore + innards + chunkAfter;
-                }
-
-                break;
-
-            case "get_from_editor":
-                // Parse all img tags and replace them with <!--more-->
-                var startPos = -1;
-                while ((startPos = content.indexOf('<img', startPos+1)) != -1) {
-                    var endPos = content.indexOf('/>', startPos);
-                    var attribs = this._parseAttributes(content.substring(startPos + 4, endPos));
-
-                    if (attribs['class'] == "mce_plugin_wordpress_more" || attribs['name'] == "mce_plugin_wordpress_more") {
-                        endPos += 2;
-
-                        var moreText = attribs['moretext'] ? attribs['moretext'] : '';
-                        var embedHTML = '<!--more'+moreText+'-->';
-
-                        // Insert embed/object chunk
-                        chunkBefore = content.substring(0, startPos);
-                        chunkAfter = content.substring(endPos);
-                        content = chunkBefore + embedHTML + chunkAfter;
-                    }
-                    if (attribs['class'] == "mce_plugin_wordpress_page" || attribs['name'] == "mce_plugin_wordpress_page") {
-                        endPos += 2;
-
-                        var embedHTML = '<!--nextpage-->';
-
-                        // Insert embed/object chunk
-                        chunkBefore = content.substring(0, startPos);
-                        chunkAfter = content.substring(endPos);
-                        content = chunkBefore + embedHTML + chunkAfter;
+                    if (DOM.isHidden(id)) {
+                        cm.setActive('wp_adv', 1);
+                        DOM.show(id);
+                        t._resizeIframe(ed, tbId, -28);
+                    } else {
+                        cm.setActive('wp_adv', 0);
+                        DOM.hide(id);
+                        t._resizeIframe(ed, tbId, 28);
                     }
                 }
+            });
 
-                // Remove normal line breaks
-                content = content.replace(/\n|\r/g, ' ');
+            // Add listeners to handle more break
+            t._handleMoreBreak(ed, url);
+        },
 
-                // Look for <br> in <pre>, replace with \n
-                var startPos = -1;
-                while ((startPos = content.indexOf('<pre', startPos+1)) != -1) {
-                    var endPos = content.indexOf('</pre>', startPos+1);
-                    var innerPos = content.indexOf('>', startPos+1);
-                    var chunkBefore = content.substring(0, innerPos);
-                    var chunkAfter = content.substring(endPos);
-                    
-                    var innards = content.substring(innerPos, endPos);
-                    innards = innards.replace(new RegExp('<br\\s?/?>', 'g'), '\n');
-                    innards = innards.replace(new RegExp('\\s$', ''), '');
-                    content = chunkBefore + innards + chunkAfter;
+        getInfo : function() {
+            return {
+                longname : 'WordPress Plugin',
+                author : 'WordPress', // add Moxiecode?
+                authorurl : 'http://wordpress.org',
+                infourl : 'http://wordpress.org',
+                version : '1.0a1'
+            };
+        },
+
+        // Internal functions
+
+        // Resizes the iframe by a relative height value
+        _resizeIframe : function(ed, tb_id, dy) {
+            var ifr = ed.getContentAreaContainer().firstChild;
+
+            DOM.setStyle(ifr, 'height', ifr.clientHeight + dy); // Resize iframe
+            ed.theme.deltaHeight += dy; // For resize cookie
+        },
+
+        _handleMoreBreak : function(ed, url) {
+            var moreHTML = '<img src="' + url + '/img/trans.gif" alt="$1" class="mceWPmore mceItemNoResize" title="'+ed.getLang('wordpress.wp_more_alt')+'" />';
+            var nextpageHTML = '<img src="' + url + '/img/trans.gif" class="mceWPnextpage mceItemNoResize" title="'+ed.getLang('wordpress.wp_page_alt')+'" />';
+
+            // Load plugin specific CSS into editor
+            ed.onInit.add(function() {
+                ed.dom.loadCSS(url + '/css/content.css');
+            });
+
+            // Display morebreak instead if img in element path
+            ed.onPostRender.add(function() {
+                if (ed.theme.onResolveName) {
+                    ed.theme.onResolveName.add(function(th, o) {
+                        if (o.node.nodeName == 'IMG') {
+                            if ( ed.dom.hasClass(o.node, 'mceWPmore') )
+                                o.name = 'wpmore';
+                            if ( ed.dom.hasClass(o.node, 'mceWPnextpage') )
+                                o.name = 'wppage';
+                        }
+                            
+                    });
                 }
+            });
 
-                // Remove anonymous, empty paragraphs.
-                content = content.replace(new RegExp('<p>(\\s|&nbsp;)*</p>', 'mg'), '');
+            // Replace morebreak with images
+            ed.onBeforeSetContent.add(function(ed, o) {
+                o.content = o.content.replace(/<!--more(.*?)-->/g, moreHTML);
+                o.content = o.content.replace(/<!--nextpage-->/g, nextpageHTML);
+            });
 
-                // Handle table badness.
-                content = content.replace(new RegExp('<(table( [^>]*)?)>.*?<((tr|thead)( [^>]*)?)>', 'mg'), '<$1><$3>');
-                content = content.replace(new RegExp('<((?:tr|thead|tfoot)(?: [^>]*)?)>.*?<((td|th)( [^>]*)?)>', 'mg'), '<$1><$2>');
-                content = content.replace(new RegExp('</(td|th)>.*?<(td( [^>]*)?|th( [^>]*)?|/tr|/thead|/tfoot)>', 'mg'), '</$1><$2>');
-                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>');
+            // Replace images with morebreak
+            ed.onPostProcess.add(function(ed, o) {
+                if (o.get)
+                    o.content = o.content.replace(/<img[^>]+>/g, function(im) {
+                        if (im.indexOf('class="mceWPmore') !== -1) {
+                            var m;
+                            var moretext = (m = im.match(/alt="(.*?)"/)) ? m[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');
-                content = content.replace(new RegExp('\\s*<(('+blocklist+')[^>]*)>', 'mg'), '\n<$1>');
-                content = content.replace(new RegExp('<((li|/?tr|/?thead|/?tfoot)( [^>]*)?)>', 'g'), '\t<$1>');
-                content = content.replace(new RegExp('<((td|th)( [^>]*)?)>', 'g'), '\t\t<$1>');
-                content = content.replace(new RegExp('\\s*<br ?/?>\\s*', 'mg'), '<br />\n');
-                content = content.replace(new RegExp('^\\s*', ''), '');
-                content = content.replace(new RegExp('\\s*$', ''), '');
+                            im = '<!--more'+moretext+'-->';
+                        }
+                        if (im.indexOf('class="mceWPnextpage') !== -1)
+                            im = '<!--nextpage-->';
+                        
+                        return im;
+                    });
+            });
 
-                break;
+            // Set active buttons if user selected pagebreak or more break
+            ed.onNodeChange.add(function(ed, cm, n) {
+                cm.setActive('wp_page', n.nodeName === 'IMG' && ed.dom.hasClass(n, 'mceWPnextpage'));
+                cm.setActive('wp_more', n.nodeName === 'IMG' && ed.dom.hasClass(n, 'mceWPmore'));
+            });
         }
+    });
 
-        // Pass through to next handler in chain
-        return content;
-    },
-
-    handleNodeChange : function(editor_id, node, undo_index, undo_levels, visual_aid, any_selection) {
-
-        tinyMCE.switchClass(editor_id + '_wp_more', 'mceButtonNormal');
-        tinyMCE.switchClass(editor_id + '_wp_page', 'mceButtonNormal');
-
-        if (node == null)
-            return;
-
-        do {
-            if (node.nodeName.toLowerCase() == "img" && tinyMCE.getAttrib(node, 'class').indexOf('mce_plugin_wordpress_more') == 0)
-                tinyMCE.switchClass(editor_id + '_wp_more', 'mceButtonSelected');
-            if (node.nodeName.toLowerCase() == "img" && tinyMCE.getAttrib(node, 'class').indexOf('mce_plugin_wordpress_page') == 0)
-                tinyMCE.switchClass(editor_id + '_wp_page', 'mceButtonSelected');
-        } while ((node = node.parentNode));
-
-        return true;
-    },
-
-    saveCallback : function(el, content, body) {
-        // We have a TON of cleanup to do.
-
-        if ( tinyMCE.activeEditor.isHidden() ) {
-    //        return content;            
-        }
-    
-        // Mark </p> if it has any attributes.
-        content = content.replace(new RegExp('(<p[^>]+>.*?)</p>', 'mg'), '$1</p#>');
-
-        // Decode the ampersands of time.
-        // content = content.replace(new RegExp('&amp;', 'g'), '&');
-
-        // 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;
-
-    },
-
-    _parseAttributes : function(attribute_string) {
-        var attributeName = "";
-        var attributeValue = "";
-        var withInName;
-        var withInValue;
-        var attributes = new Array();
-        var whiteSpaceRegExp = new RegExp('^[ \n\r\t]+', 'g');
-        var titleText = tinyMCE.getLang('lang_wordpress_more');
-        var titleTextPage = tinyMCE.getLang('lang_wordpress_page');
-
-        if (attribute_string == null || attribute_string.length < 2)
-            return null;
-
-        withInName = withInValue = false;
-
-        for (var i=0; i<attribute_string.length; i++) {
-            var chr = attribute_string.charAt(i);
-
-            if ((chr == '"' || chr == "'") && !withInValue)
-                withInValue = true;
-            else if ((chr == '"' || chr == "'") && withInValue) {
-                withInValue = false;
-
-                var pos = attributeName.lastIndexOf(' ');
-                if (pos != -1)
-                    attributeName = attributeName.substring(pos+1);
-
-                attributes[attributeName.toLowerCase()] = attributeValue.substring(1);
-
-                attributeName = "";
-                attributeValue = "";
-            } else if (!whiteSpaceRegExp.test(chr) && !withInName && !withInValue)
-                withInName = true;
-
-            if (chr == '=' && withInName)
-                withInName = false;
-
-            if (withInName)
-                attributeName += chr;
-
-            if (withInValue)
-                attributeValue += chr;
-        }
-
-        return attributes;
-    }
-};
-
-//tinyMCE.addPlugin("wordpress", TinyMCE_wordpressPlugin);
-
-/* This little hack protects our More and Page placeholders from the removeformat command */
-tinyMCE.orgExecCommand = tinyMCE.execCommand;
-tinyMCE.execCommand = function (command, user_interface, value) {
-    re = this.orgExecCommand(command, user_interface, value);
-
-    if ( command == 'removeformat' ) {
-        var inst = tinyMCE.getInstanceById('mce_editor_0');
-        doc = inst.getDoc();
-        var imgs = doc.getElementsByTagName('img');
-        for (i=0;img=imgs[i];i++)
-            img.className = img.name;
-    }
-    return re;
-};
-wpInstTriggerSave = function (skip_cleanup, skip_callback) {
-    var e, nl = new Array(), i, s;
-
-    this.switchSettings();
-    s = tinyMCE.settings;
-
-    // Force hidden tabs visible while serializing
-    if (tinyMCE.isMSIE && !tinyMCE.isOpera) {
-        e = this.iframeElement;
-
-        do {
-            if (e.style && e.style.display == 'none') {
-                e.style.display = 'block';
-                nl[nl.length] = {elm : e, type : 'style'};
-            }
-
-            if (e.style && s.hidden_tab_class.length > 0 && e.className.indexOf(s.hidden_tab_class) != -1) {
-                e.className = s.display_tab_class;
-                nl[nl.length] = {elm : e, type : 'class'};
-            }
-        } while ((e = e.parentNode) != null)
-    }
-
-    tinyMCE.settings['preformatted'] = false;
-
-    // Default to false
-    if (typeof(skip_cleanup) == "undefined")
-        skip_cleanup = false;
-
-    // Default to false
-    if (typeof(skip_callback) == "undefined")
-        skip_callback = false;
-
-//  tinyMCE._setHTML(this.getDoc(), this.getBody().innerHTML);
-
-    // Remove visual aids when cleanup is disabled
-    if (this.settings['cleanup'] == false) {
-        tinyMCE.handleVisualAid(this.getBody(), true, false, this);
-        tinyMCE._setEventsEnabled(this.getBody(), true);
-    }
-
-    tinyMCE._customCleanup(this, "submit_content_dom", this.contentWindow.document.body);
-    tinyMCE.selectedInstance.getWin().oldfocus=tinyMCE.selectedInstance.getWin().focus;
-    tinyMCE.selectedInstance.getWin().focus=function() {};
-    var htm = tinyMCE._cleanupHTML(this, this.getDoc(), this.settings, this.getBody(), tinyMCE.visualAid, true, true);
-    tinyMCE.selectedInstance.getWin().focus=tinyMCE.selectedInstance.getWin().oldfocus;
-    htm = tinyMCE._customCleanup(this, "submit_content", htm);
-
-    if (!skip_callback && tinyMCE.settings['save_callback'] != "")
-        var content = eval(tinyMCE.settings['save_callback'] + "(this.formTargetElementId,htm,this.getBody());");
-
-    // Use callback content if available
-    if ((typeof(content) != "undefined") && content != null)
-        htm = content;
-
-    // Replace some weird entities (Bug: #1056343)
-    htm = tinyMCE.regexpReplace(htm, "&#40;", "(", "gi");
-    htm = tinyMCE.regexpReplace(htm, "&#41;", ")", "gi");
-    htm = tinyMCE.regexpReplace(htm, "&#59;", ";", "gi");
-    htm = tinyMCE.regexpReplace(htm, "&#34;", "&quot;", "gi");
-    htm = tinyMCE.regexpReplace(htm, "&#94;", "^", "gi");
-
-    if (this.formElement)
-        this.formElement.value = htm;
-
-    if (tinyMCE.isSafari && this.formElement)
-        this.formElement.innerText = htm;
-
-    // Hide them again (tabs in MSIE)
-    for (i=0; i<nl.length; i++) {
-        if (nl[i].type == 'style')
-            nl[i].elm.style.display = 'none';
-        else
-            nl[i].elm.className = s.hidden_tab_class;
-    }
-}
-tinyMCE.wpTriggerSave = function () {
-    var inst, n;
-    for (n in tinyMCE.instances) {
-        inst = tinyMCE.instances[n];
-        if (!tinyMCE.isInstance(inst))
-            continue;
-        inst.wpTriggerSave = wpInstTriggerSave;
-        inst.wpTriggerSave(false, false);
-    }
-}
-
-function switchEditors(id) {
-    var inst = tinyMCE.getInstanceById(id);
-    var qt = document.getElementById('quicktags');
-    var H = document.getElementById('edButtonHTML');
-    var P = document.getElementById('edButtonPreview');
-    var ta = document.getElementById(id);
-    var pdr = ta.parentNode;
-
-    if ( ! inst.isHidden(id) ) { 
-        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;
-
-        if ( tinymce.util.Cookie.get("TinyMCE_" + inst.editorId + "_height") == null ) {
-            var expires = new Date();
-            expires.setTime(expires.getTime() + 3600000 * 24 * 30);
-            var offset = tinyMCE.isMSIE ? 1 : 2;
-            tinymce.util.Cookie.set("TinyMCE_" + inst.editorId + "_height", "" + (table.offsetHeight - offset), expires);
-        }
-
-        // Unload the rich editor
-        // inst.triggerSave(false, false);
-        // inst.formElement.value;
-        inst.hide(); // 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 = '12px';
-
-        if ( tinyMCE.isMSIE && !tinyMCE.isOpera ) {
-        } else {
-            // Unlock the fieldset's height
-            pdr.style.height = 'auto';
-            pdr.style.overflow = 'display';
-        }
-        wpSetDefaultEditor( 'html' );
-    } 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 {
-            ta.value = wpautop(ta.value);
-            inst.show() // 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';
-        }
-        wpSetDefaultEditor( 'tinymce' );
-    }
-}
-
-function edToggle(A, B) {
-    A.className = 'active';
-    B.className = '';
-
-    B.onclick = A.onclick;
-    A.onclick = null;
-}
-
-function wpSetDefaultEditor( 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();
-}
-
-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('([\\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*(</?(?: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;
-}
+    // Register plugin
+    tinymce.PluginManager.add('wordpress', tinymce.plugins.WordPress);
+})();

trunk/wp-includes/js/tinymce/plugins/wordpress/langs/en.js

@@ -1 @@
-// EN lang variables
-
-if (navigator.userAgent.indexOf('Mac OS') != -1) {
-// Mac OS browsers use Ctrl to hit accesskeys
-    var metaKey = 'Ctrl';
-}
-else if (navigator.userAgent.indexOf('Firefox/2') != -1) {
-// Firefox 2.x uses Alt+Shift to hit accesskeys
-    var metaKey = 'Alt+Shift';
-}
-else {
-    var metaKey = 'Alt';
-}
-
-tinyMCE.addI18n('',{
-wordpress_more_button : 'Split post with More tag (' + metaKey + '+t)',
-wordpress_page_button : 'Split post with Page tag',
-wordpress_adv_button : 'Show/Hide Advanced Toolbar (' + metaKey + '+v)',
-wordpress_more_alt : 'More...',
-wordpress_page_alt : '...page...',
-help_button_title : 'Help (' + metaKey + '+h)',
-bold_desc : 'Bold (Ctrl+B)',
-italic_desc : 'Italic (Ctrl+I)',
-underline_desc : 'Underline (Ctrl+U)',
-link_desc : 'Insert/edit link (' + metaKey + '+a)',
-unlink_desc : 'Unlink (' + metaKey + '+s)',
-image_desc : 'Insert/edit image (' + metaKey + '+m)',
-striketrough_desc : 'Strikethrough (' + metaKey + '+k)',
-justifyleft_desc : 'Align left (' + metaKey + '+f)',
-justifycenter_desc : 'Align center (' + metaKey + '+c)',
-justifyright_desc : 'Align right (' + metaKey + '+r)',
-justifyfull_desc : 'Align full (' + metaKey + '+j)',
-bullist_desc : 'Unordered list (' + metaKey + '+l)',
-numlist_desc : 'Ordered list (' + metaKey + '+o)',
-outdent_desc : 'Outdent (' + metaKey + '+w)',
-indent_desc : 'Indent list/blockquote (' + metaKey + '+q)'
+tinyMCE.addI18n('en.wordpress',{
+wp_adv_desc : 'Show/Hide Advanced Toolbar',
+wp_more_desc : 'Split post with More tag',
+wp_page_desc : 'Split post with Page tag',
+wp_help_desc : 'Help',
+wp_more_alt : 'More...',
+wp_page_alt : 'Next page...'
 });

trunk/wp-includes/js/tinymce/themes/advanced/anchor.htm

@@ -3 +3 @@
 <head>
     <title>{#advanced_dlg.anchor_title}</title>
-    <script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+    <script type="text/javascript" src="../../tiny_mce_popup.js"></script>
     <script type="text/javascript" src="js/anchor.js"></script>
-    <base target="_self" />
+    <script type="text/javascript">tinyMCEPopup.onInit.add(function(){window.setTimeout(function(){document.getElementById('anchorName').focus();},500);});</script>
+    <base target="_self" />
 </head>
 <body style="display: none">
@@ -21 +22 @@
     <div class="mceActionPanel">
         <div style="float: left">
-            <input type="button" id="insert" name="insert" value="{#update}" onclick="AnchorDialog.update();" />
+            <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
         </div>
 
         <div style="float: right">
-            <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+            <input type="submit" id="insert" name="insert" value="{#update}" onclick="AnchorDialog.update();" />
         </div>
     </div>

trunk/wp-includes/js/tinymce/themes/advanced/charmap.htm

@@ -8 +8 @@
 </head>
 <body style="display: none">
-<table align="center" border="0" cellspacing="0" cellpadding="2">
+<table style="background:#fff;" align="center" border="0" cellspacing="0" cellpadding="2">
     <tr>
         <td colspan="2" class="title">{#advanced_dlg.charmap_title}</td>

trunk/wp-includes/js/tinymce/themes/advanced/editor_template.js

@@ -1 @@
-/**
- * $Id: editor_template_src.js 520 2008-01-07 16:30:32Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-    var DOM = tinymce.DOM, Event = tinymce.dom.Event, extend = tinymce.extend, each = tinymce.each, Cookie = tinymce.util.Cookie, lastExtID;
-
-    // Tell it to load theme specific language pack(s)
-    tinymce.ThemeManager.requireLangPack('advanced');
-
-    tinymce.create('tinymce.themes.AdvancedTheme', {
-        // Control name lookup, format: title, command
-        controls : {
-            bold : ['bold_desc', 'Bold'],
-            italic : ['italic_desc', 'Italic'],
-            underline : ['underline_desc', 'Underline'],
-            strikethrough : ['striketrough_desc', 'Strikethrough'],
-            justifyleft : ['justifyleft_desc', 'JustifyLeft'],
-            justifycenter : ['justifycenter_desc', 'JustifyCenter'],
-            justifyright : ['justifyright_desc', 'JustifyRight'],
-            justifyfull : ['justifyfull_desc', 'JustifyFull'],
-            bullist : ['bullist_desc', 'InsertUnorderedList'],
-            numlist : ['numlist_desc', 'InsertOrderedList'],
-            outdent : ['outdent_desc', 'Outdent'],
-            indent : ['indent_desc', 'Indent'],
-            cut : ['cut_desc', 'Cut'],
-            copy : ['copy_desc', 'Copy'],
-            paste : ['paste_desc', 'Paste'],
-            undo : ['undo_desc', 'Undo'],
-            redo : ['redo_desc', 'Redo'],
-            link : ['link_desc', 'mceLink'],
-            unlink : ['unlink_desc', 'unlink'],
-            image : ['image_desc', 'mceImage'],
-            cleanup : ['cleanup_desc', 'mceCleanup'],
-            help : ['help_desc', 'mceHelp'],
-            code : ['code_desc', 'mceCodeEditor'],
-            hr : ['hr_desc', 'InsertHorizontalRule'],
-            removeformat : ['removeformat_desc', 'RemoveFormat'],
-            sub : ['sub_desc', 'subscript'],
-            sup : ['sup_desc', 'superscript'],
-            forecolor : ['forecolor_desc', 'ForeColor'],
-            forecolorpicker : ['forecolor_desc', 'mceForeColor'],
-            backcolor : ['backcolor_desc', 'HiliteColor'],
-            backcolorpicker : ['backcolor_desc', 'mceBackColor'],
-            charmap : ['charmap_desc', 'mceCharMap'],
-            visualaid : ['visualaid_desc', 'mceToggleVisualAid'],
-            anchor : ['anchor_desc', 'mceInsertAnchor'],
-            newdocument : ['newdocument_desc', 'mceNewDocument'],
-            blockquote : ['blockquote_desc', 'mceBlockQuote']
-        },
-
-        stateControls : ['bold', 'italic', 'underline', 'strikethrough', 'bullist', 'numlist', 'justifyleft', 'justifycenter', 'justifyright', 'justifyfull', 'sub', 'sup', 'blockquote'],
-
-        init : function(ed, url) {
-            var t = this, s;
-
-            t.editor = ed;
-            t.url = url;
-            t.onResolveName = new tinymce.util.Dispatcher(this);
-
-            // Default settings
-            t.settings = s = extend({
-                theme_advanced_path : true,
-                theme_advanced_toolbar_location : 'bottom',
-                theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect",
-                theme_advanced_buttons2 : "bullist,numlist,|,outdent,indent,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code",
-                theme_advanced_buttons3 : "hr,removeformat,visualaid,|,sub,sup,|,charmap",
-                theme_advanced_blockformats : "p,address,pre,h1,h2,h3,h4,h5,h6",
-                theme_advanced_toolbar_align : "center",
-                theme_advanced_fonts : "Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats",
-                theme_advanced_font_sizes : "1,2,3,4,5,6,7",
-                theme_advanced_more_colors : 1,
-                theme_advanced_row_height : 23,
-                theme_advanced_resize_horizontal : 1,
-                theme_advanced_resizing_use_cookie : 1
-            }, ed.settings);
-
-            if (s.theme_advanced_statusbar_location == 'none')
-                s.theme_advanced_statusbar_location = 0;
-
-            // Init editor
-            ed.onInit.add(function() {
-                ed.onNodeChange.add(t._nodeChanged, t);
-                ed.dom.loadCSS(ed.baseURI.toAbsolute("themes/advanced/skins/" + ed.settings.skin + "/content.css"));
-            });
-
-            ed.onSetProgressState.add(function(ed, b, ti) {
-                var co, id = ed.id, tb;
-
-                if (b) {
-                    t.progressTimer = setTimeout(function() {
-                        co = ed.getContainer();
-                        co = co.insertBefore(DOM.create('DIV', {style : 'position:relative'}), co.firstChild);
-                        tb = DOM.get(ed.id + '_tbl');
-
-                        DOM.add(co, 'div', {id : id + '_blocker', 'class' : 'mceBlocker', style : {width : tb.clientWidth + 2, height : tb.clientHeight + 2}});
-                        DOM.add(co, 'div', {id : id + '_progress', 'class' : 'mceProgress', style : {left : tb.clientWidth / 2, top : tb.clientHeight / 2}});
-                    }, ti || 0);
-                } else {
-                    DOM.remove(id + '_blocker');
-                    DOM.remove(id + '_progress');
-                    clearTimeout(t.progressTimer);
-                }
-            });
-
-            DOM.loadCSS(ed.baseURI.toAbsolute(s.editor_css || "themes/advanced/skins/" + ed.settings.skin + "/ui.css"));
-        },
-
-        createControl : function(n, cf) {
-            var cd, c;
-
-            if (c = cf.createControl(n))
-                return c;
-
-            switch (n) {
-                case "styleselect":
-                    return this._createStyleSelect();
-
-                case "formatselect":
-                    return this._createBlockFormats();
-
-                case "fontselect":
-                    return this._createFontSelect();
-
-                case "fontsizeselect":
-                    return this._createFontSizeSelect();
-
-                case "forecolor":
-                    return this._createForeColorMenu();
-
-                case "backcolor":
-                    return this._createBackColorMenu();
-            }
-
-            if ((cd = this.controls[n]))
-                return cf.createButton(n, {title : "advanced." + cd[0], cmd : cd[1], ui : cd[2], value : cd[3]});
-        },
-
-        execCommand : function(cmd, ui, val) {
-            var f = this['_' + cmd];
-
-            if (f) {
-                f.call(this, ui, val);
-                return true;
-            }
-
-            return false;
-        },
-
-        _importClasses : function() {
-            var ed = this.editor, c = ed.controlManager.get('styleselect');
-
-            if (c.getLength() == 0) {
-                each(ed.dom.getClasses(), function(o) {
-                    c.add(o['class'], o['class']);
-                });
-            }
-        },
-
-        _createStyleSelect : function(n) {
-            var t = this, ed = t.editor, cf = ed.controlManager, c = cf.createListBox('styleselect', {
-                title : 'advanced.style_select',
-                onselect : function(v) {
-                    if (c.selectedValue === v) {
-                        ed.execCommand('mceSetStyleInfo', 0, {command : 'removeformat'});
-                        c.select();
-                        return false;
-                    } else
-                        ed.execCommand('mceSetCSSClass', 0, v);
-                }
-            });
-
-            each((t.settings.theme_advanced_styles || '').split(';'), function(v) {
-                var p = v.split('=');
-
-                if (v)
-                    c.add(t.editor.translate(p[0]), p[1]);
-            });
-
-            c.onPostRender.add(function(ed, n) {
-                Event.add(n, 'focus', t._importClasses, t);
-                Event.add(n, 'mousedown', t._importClasses, t);
-            });
-
-            return c;
-        },
-
-        _createFontSelect : function() {
-            var c, t = this;
-
-            c = t.editor.controlManager.createListBox('fontselect', {title : 'advanced.fontdefault', cmd : 'FontName'});
-
-            each(t.settings.theme_advanced_fonts.split(';'), function(v) {
-                var p = v.split('='), st;
-
-                if (p[1].indexOf('dings') == -1)
-                    st = 'font-family:' + p[1];
-
-                c.add(t.editor.translate(p[0]), p[1], {style : st});
-            });
-
-            return c;
-        },
-
-        _createFontSizeSelect : function() {
-            var c, t = this, lo = [
-                "1 (8 pt)",
-                "2 (10 pt)",
-                "3 (12 pt)",
-                "4 (14 pt)",
-                "5 (18 pt)",
-                "6 (24 pt)",
-                "7 (36 pt)"
-            ], fz = [8, 10, 12, 14, 18, 24, 36];
-
-            c = t.editor.controlManager.createListBox('fontsizeselect', {title : 'advanced.font_size', cmd : 'FontSize'});
-
-            each(t.settings.theme_advanced_font_sizes.split(','), function(v) {
-                c.add(lo[parseInt(v) - 1], v, {'style' : 'font-size:' + fz[v - 1] + 'pt', 'class' : 'fontSize' + v});
-            });
-
-            return c;
-        },
-
-        _createBlockFormats : function() {
-            var c, fmts = {
-                p : 'advanced.paragraph',
-                address : 'advanced.address',
-                pre : 'advanced.pre',
-                h1 : 'advanced.h1',
-                h2 : 'advanced.h2',
-                h3 : 'advanced.h3',
-                h4 : 'advanced.h4',
-                h5 : 'advanced.h5',
-                h6 : 'advanced.h6',
-                div : 'advanced.div',
-                blockquote : 'advanced.blockquote',
-                code : 'advanced.code',
-                dt : 'advanced.dt',
-                dd : 'advanced.dd',
-                samp : 'advanced.samp'
-            }, t = this;
-
-            c = t.editor.controlManager.createListBox('formatselect', {title : 'advanced.block', cmd : 'FormatBlock'});
-
-            each(t.settings.theme_advanced_blockformats.split(','), function(v) {
-                c.add(t.editor.translate(fmts[v]), v, {element : v, 'class' : v.indexOf('h') == 0 ? '' : 'preview'});
-            });
-
-            return c;
-        },
-
-        _createForeColorMenu : function() {
-            var c, t = this, s = t.settings, o = {}, v;
-
-            if (s.theme_advanced_more_colors) {
-                o.more_colors_func = function() {
-                    t._mceColorPicker(0, {
-                        color : c.value,
-                        func : function(co) {
-                            c.setColor(co);
-                        }
-                    });
-                };
-            }
-
-            if (v = s.theme_advanced_text_colors)
-                o.colors = v;
-
-            o.title = 'advanced.forecolor_desc';
-            o.cmd = 'ForeColor';
-            o.scope = this;
-
-            c = t.editor.controlManager.createColorSplitButton('forecolor', o);
-
-            return c;
-        },
-
-        _createBackColorMenu : function() {
-            var c, t = this, s = t.settings, o = {}, v;
-
-            if (s.theme_advanced_more_colors) {
-                o.more_colors_func = function() {
-                    t._mceColorPicker(0, {
-                        color : c.value,
-                        func : function(co) {
-                            c.setColor(co);
-                        }
-                    });
-                };
-            }
-
-            if (v = s.theme_advanced_background_colors)
-                o.colors = v;
-
-            o.title = 'advanced.backcolor_desc';
-            o.cmd = 'HiliteColor';
-            o.scope = this;
-
-            c = t.editor.controlManager.createColorSplitButton('backcolor', o);
-
-            return c;
-        },
-
-        renderUI : function(o) {
-            var n, ic, tb, t = this, ed = t.editor, s = t.settings, sc, p, nl;
-
-            n = p = DOM.create('div', {id : ed.id + '_parent', 'class' : 'mceEditor ' + ed.settings.skin + 'Skin'});
-
-            if (!DOM.boxModel)
-                n = DOM.add(n, 'div', {'class' : 'mceOldBoxModel'});
-
-            n = sc = DOM.add(n, 'table', {id : ed.id + '_tbl', 'class' : 'mceLayout', cellSpacing : 0, cellPadding : 0});
-            n = tb = DOM.add(n, 'tbody');
-
-            switch ((s.theme_advanced_layout_manager || '').toLowerCase()) {
-                case "rowlayout":
-                    ic = t._rowLayout(s, tb, o);
-                    break;
-
-                case "customlayout":
-                    ic = ed.execCallback("theme_advanced_custom_layout", s, tb, o, p);
-                    break;
-
-                default:
-                    ic = t._simpleLayout(s, tb, o, p);
-            }
-
-            n = o.targetNode;
-
-            // Add classes to first and last TRs
-            nl = sc.rows;
-            DOM.addClass(nl[0], 'first');
-            DOM.addClass(nl[nl.length - 1], 'last');
-
-            // Add classes to first and last TDs
-            each(DOM.select('tr', tb), function(n) {
-                DOM.addClass(n.firstChild, 'first');
-                DOM.addClass(n.childNodes[n.childNodes.length - 1], 'last');
-            });
-
-            if (DOM.get(s.theme_advanced_toolbar_container))
-                DOM.get(s.theme_advanced_toolbar_container).appendChild(p);
-            else
-                DOM.insertAfter(p, n);
-
-            Event.add(ed.id + '_path_row', 'click', function(e) {
-                e = e.target;
-
-                if (e.nodeName == 'A') {
-                    t._sel(e.href.replace(/^[^#]*#/, ''));
-
-                    return Event.cancel(e);
-                }
-            });
-/*
-            if (DOM.get(ed.id + '_path_row')) {
-                Event.add(ed.id + '_tbl', 'mouseover', function(e) {
-                    var re;
-    
-                    e = e.target;
-
-                    if (e.nodeName == 'SPAN' && DOM.hasClass(e.parentNode, 'mceButton')) {
-                        re = DOM.get(ed.id + '_path_row');
-                        t.lastPath = re.innerHTML;
-                        DOM.setHTML(re, e.parentNode.title);
-                    }
-                });
-
-                Event.add(ed.id + '_tbl', 'mouseout', function(e) {
-                    if (t.lastPath) {
-                        DOM.setHTML(ed.id + '_path_row', t.lastPath);
-                        t.lastPath = 0;
-                    }
-                });
-            }
-*/
-            if (s.theme_advanced_toolbar_location == 'external')
-                o.deltaHeight = 0;
-
-            t.deltaHeight = o.deltaHeight;
-            o.targetNode = null;
-
-            return {
-                iframeContainer : ic,
-                editorContainer : ed.id + '_parent',
-                sizeContainer : sc,
-                deltaHeight : o.deltaHeight
-            };
-        },
-
-        getInfo : function() {
-            return {
-                longname : 'Simple theme',
-                author : 'Moxiecode Systems AB',
-                authorurl : 'http://tinymce.moxiecode.com',
-                version : tinymce.majorVersion + "." + tinymce.minorVersion
-            }
-        },
-
-        _simpleLayout : function(s, tb, o, p) {
-            var t = this, ed = t.editor, lo = s.theme_advanced_toolbar_location, sl = s.theme_advanced_statusbar_location, n, ic, etb, c;
-
-            // Create toolbar container at top
-            if (lo == 'top')
-                t._addToolbars(tb, o);
-
-            // Create external toolbar
-            if (lo == 'external') {
-                n = c = DOM.create('div', {style : 'position:relative'});
-                n = DOM.add(n, 'div', {id : ed.id + '_external', 'class' : 'mceExternalToolbar'});
-                DOM.add(n, 'a', {id : ed.id + '_external_close', href : 'javascript:;', 'class' : 'mceExternalClose'});
-                n = DOM.add(n, 'table', {id : ed.id + '_tblext', cellSpacing : 0, cellPadding : 0});
-                etb = DOM.add(n, 'tbody');
-
-                if (p.firstChild.className == 'mceOldBoxModel')
-                    p.firstChild.appendChild(c);
-                else
-                    p.insertBefore(c, p.firstChild);
-
-                t._addToolbars(etb, o);
-
-                ed.onMouseUp.add(function() {
-                    var e = DOM.get(ed.id + '_external');
-                    DOM.show(e);
-
-                    DOM.hide(lastExtID);
-
-                    var f = Event.add(ed.id + '_external_close', 'click', function() {
-                        DOM.hide(ed.id + '_external');
-                        Event.remove(ed.id + '_external_close', 'click', f);
-                    });
-
-                    DOM.show(e);
-                    DOM.setStyle(e, 'top', 0 - DOM.getRect(ed.id + '_tblext').h - 1);
-
-                    // Fixes IE rendering bug
-                    DOM.hide(e);
-                    DOM.show(e);
-                    e.style.filter = '';
-
-                    lastExtID = ed.id + '_external';
-
-                    e = null;
-                });
-            }
-
-            if (sl == 'top')
-                t._addStatusBar(tb, o);
-
-            // Create iframe container
-            if (!s.theme_advanced_toolbar_container) {
-                n = DOM.add(tb, 'tr');
-                n = ic = DOM.add(n, 'td', {'class' : 'mceIframeContainer'});
-            }
-
-            // Create toolbar container at bottom
-            if (lo == 'bottom')
-                t._addToolbars(tb, o);
-
-            if (sl == 'bottom')
-                t._addStatusBar(tb, o);
-
-            return ic;
-        },
-
-        _rowLayout : function(s, tb, o) {
-            var t = this, ed = t.editor, dc, da, cf = ed.controlManager, n, ic, to;
-
-            dc = s.theme_advanced_containers_default_class || '';
-            da = s.theme_advanced_containers_default_align || 'center';
-
-            each((s.theme_advanced_containers || '').split(','), function(c, i) {
-                var v = s['theme_advanced_container_' + c].toLowerCase();
-
-                switch (v) {
-                    case 'mceeditor':
-                        n = DOM.add(tb, 'tr');
-                        n = ic = DOM.add(n, 'td', {'class' : 'mceIframeContainer'});
-                        break;
-
-                    case 'mceelementpath':
-                        t._addStatusBar(tb, o);
-                        break;
-
-                    default:
-                        n = DOM.add(DOM.add(tb, 'tr'), 'td', {
-                            'class' : 'mceToolbar ' + (s['theme_advanced_container_' + c + '_class'] || dc),
-                            align : s['theme_advanced_container_' + c + '_align'] || da
-                        });
-
-                        to = cf.createToolbar("toolbar" + i);
-                        t._addControls(v, to);
-                        DOM.setHTML(n, to.renderHTML());
-                        o.deltaHeight -= s.theme_advanced_row_height;
-                }
-            });
-
-            return ic;
-        },
-
-        _addControls : function(v, tb) {
-            var t = this, s = t.settings, di, cf = t.editor.controlManager;
-
-            if (s.theme_advanced_disable && !t._disabled) {
-                di = {};
-
-                each(s.theme_advanced_disable.split(','), function(v) {
-                    di[v] = 1;
-                });
-
-                t._disabled = di;
-            } else
-                di = t._disabled;
-
-            each(v.split(','), function(n) {
-                var c;
-
-                if (di && di[n])
-                    return;
-
-                // Compatiblity with 2.x
-                if (n == 'tablecontrols') {
-                    each(["table","|","row_props","cell_props","|","row_before","row_after","delete_row","|","col_before","col_after","delete_col","|","split_cells","merge_cells"], function(n) {
-                        n = t.createControl(n, cf);
-
-                        if (n)
-                            tb.add(n);
-                    });
-
-                    return;
-                }
-
-                c = t.createControl(n, cf);
-
-                if (c)
-                    tb.add(c);
-            });
-        },
-
-        _addToolbars : function(c, o) {
-            var t = this, i, tb, ed = t.editor, s = t.settings, v, cf = ed.controlManager, di, n, h = [];
-
-            n = DOM.add(DOM.add(c, 'tr'), 'td', {'class' : 'mceToolbar', align : s.theme_advanced_toolbar_align});
-
-            if (!ed.getParam('accessibility_focus') || ed.getParam('tab_focus'))
-                h.push(DOM.createHTML('a', {href : '#', onfocus : 'tinyMCE.get(\'' + ed.id + '\').focus();'}, '<!-- IE -->'));
-
-            h.push(DOM.createHTML('a', {href : '#', accesskey : 'q', title : ed.getLang("advanced.toolbar_focus")}, '<!-- IE -->'));
-
-            // Create toolbar and add the controls
-            for (i=1; (v = s['theme_advanced_buttons' + i]); i++) {
-                tb = cf.createToolbar("toolbar" + i, {'class' : 'mceToolbarRow' + i});
-
-                if (s['theme_advanced_buttons' + i + '_add'])
-                    v += ',' + s['theme_advanced_buttons' + i + '_add'];
-
-                if (s['theme_advanced_buttons' + i + '_add_before'])
-                    v = s['theme_advanced_buttons' + i + '_add_before'] + ',' + v;
-
-                t._addControls(v, tb, di);
-
-                //n.appendChild(n = tb.render());
-                h.push(tb.renderHTML());
-
-                o.deltaHeight -= s.theme_advanced_row_height;
-            }
-
-            h.push(DOM.createHTML('a', {href : '#', accesskey : 'z', title : ed.getLang("advanced.toolbar_focus"), onfocus : 'tinyMCE.getInstanceById(\'' + ed.id + '\').focus();'}, '<!-- IE -->'));
-            DOM.setHTML(n, h.join(''));
-        },
-
-        _addStatusBar : function(tb, o) {
-            var n, t = this, ed = t.editor, s = t.settings, r, mf, me, td;
-
-            n = DOM.add(tb, 'tr');
-            n = td = DOM.add(n, 'td', {'class' : 'mceStatusbar'});
-            n = DOM.add(n, 'div', {id : ed.id + '_path_row'}, s.theme_advanced_path ? ed.translate('advanced.path') + ': ' : '&nbsp;');
-            DOM.add(n, 'a', {href : '#', accesskey : 'x'});
-
-            if (s.theme_advanced_resizing && !tinymce.isOldWebKit) {
-                DOM.add(td, 'a', {id : ed.id + '_resize', href : 'javascript:;', onclick : "return false;", 'class' : 'resize'});
-
-                if (s.theme_advanced_resizing_use_cookie) {
-                    ed.onPostRender.add(function() {
-                        var o = Cookie.getHash("TinyMCE_" + ed.id + "_size"), c = DOM.get(ed.id + '_tbl');
-
-                        if (!o)
-                            return;
-
-                        if (s.theme_advanced_resize_horizontal)
-                            c.style.width = o.cw + 'px';
-
-                        c.style.height = o.ch + 'px';
-                        DOM.get(ed.id + '_ifr').style.height = (parseInt(o.ch) + t.deltaHeight) + 'px';
-                    });
-                }
-
-                ed.onPostRender.add(function() {
-                    Event.add(ed.id + '_resize', 'mousedown', function(e) {
-                        var c, p, w, h, n, pa;
-
-                        // Measure container
-                        c = DOM.get(ed.id + '_tbl');
-                        w = c.clientWidth;
-                        h = c.clientHeight;
-
-                        miw = s.theme_advanced_resizing_min_width || 100;
-                        mih = s.theme_advanced_resizing_min_height || 100;
-                        maw = s.theme_advanced_resizing_max_width || 0xFFFF;
-                        mah = s.theme_advanced_resizing_max_height || 0xFFFF;
-
-                        // Setup placeholder
-                        p = DOM.add(DOM.get(ed.id + '_parent'), 'div', {'class' : 'mcePlaceHolder'});
-                        DOM.setStyles(p, {width : w, height : h});
-
-                        // Replace with placeholder
-                        DOM.hide(c);
-                        DOM.show(p);
-
-                        // Create internal resize obj
-                        r = {
-                            x : e.screenX,
-                            y : e.screenY,
-                            w : w,
-                            h : h,
-                            dx : null,
-                            dy : null
-                        };
-
-                        // Start listening
-                        mf = Event.add(document, 'mousemove', function(e) {
-                            var w, h;
-
-                            // Calc delta values
-                            r.dx = e.screenX - r.x;
-                            r.dy = e.screenY - r.y;
-
-                            // Boundery fix box
-                            w = Math.max(miw, r.w + r.dx);
-                            h = Math.max(mih, r.h + r.dy);
-                            w = Math.min(maw, w);
-                            h = Math.min(mah, h);
-
-                            // Resize placeholder
-                            if (s.theme_advanced_resize_horizontal)
-                                p.style.width = w + 'px';
-
-                            p.style.height = h + 'px';
-
-                            return Event.cancel(e);
-                        });
-
-                        me = Event.add(document, 'mouseup', function(e) {
-                            var ifr;
-
-                            // Stop listening
-                            Event.remove(document, 'mousemove', mf);
-                            Event.remove(document, 'mouseup', me);
-
-                            c.style.display = '';
-                            DOM.remove(p);
-
-                            if (r.dx === null)
-                                return;
-
-                            ifr = DOM.get(ed.id + '_ifr');
-
-                            if (s.theme_advanced_resize_horizontal)
-                                c.style.width = (r.w + r.dx) + 'px';
-
-                            c.style.height = (r.h + r.dy) + 'px';
-                            ifr.style.height = (ifr.clientHeight + r.dy) + 'px';
-
-                            if (s.theme_advanced_resizing_use_cookie) {
-                                Cookie.setHash("TinyMCE_" + ed.id + "_size", {
-                                    cw : r.w + r.dx,
-                                    ch : r.h + r.dy
-                                });
-                            }
-                        });
-
-                        return Event.cancel(e);
-                    });
-                });
-            }
-
-            o.deltaHeight -= 21;
-            n = tb = null;
-        },
-
-        _nodeChanged : function(ed, cm, n, co) {
-            var t = this, p, de = 0, v, c, s = t.settings;
-
-            tinymce.each(t.stateControls, function(c) {
-                cm.setActive(c, ed.queryCommandState(t.controls[c][1]));
-            });
-
-            cm.setActive('visualaid', ed.hasVisual);
-            cm.setDisabled('undo', !ed.undoManager.hasUndo() && !ed.typing);
-            cm.setDisabled('redo', !ed.undoManager.hasRedo());
-            cm.setDisabled('outdent', !ed.queryCommandState('Outdent'));
-
-            p = DOM.getParent(n, 'A');
-            if (c = cm.get('link')) {
-                if (!p || !p.name) {
-                    c.setDisabled(!p && co);
-                    c.setActive(!!p);
-                }
-            }
-
-            if (c = cm.get('unlink')) {
-                c.setDisabled(!p && co);
-                c.setActive(!!p && !p.name);
-            }
-
-            if (c = cm.get('anchor')) {
-                c.setActive(!!p && p.name);
-
-                if (tinymce.isWebKit) {
-                    p = DOM.getParent(n, 'IMG');
-                    c.setActive(!!p && DOM.getAttrib(p, 'mce_name') == 'a');
-                }
-            }
-
-            p = DOM.getParent(n, 'IMG');
-            if (c = cm.get('image'))
-                c.setActive(!!p && n.className.indexOf('mceItem') == -1);
-
-            if (c = cm.get('styleselect')) {
-                if (n.className) {
-                    t._importClasses();
-                    c.select(n.className);
-                } else
-                    c.select();
-            }
-
-            if (c = cm.get('formatselect')) {
-                p = DOM.getParent(n, DOM.isBlock);
-
-                if (p)
-                    c.select(p.nodeName.toLowerCase());
-            }
-
-            if (c = cm.get('fontselect'))
-                c.select(ed.queryCommandValue('FontName'));
-
-            if (c = cm.get('fontsizeselect'))
-                c.select(ed.queryCommandValue('FontSize'));
-
-            if (s.theme_advanced_path && s.theme_advanced_statusbar_location) {
-                p = DOM.get(ed.id + '_path') || DOM.add(ed.id + '_path_row', 'span', {id : ed.id + '_path'});
-                DOM.setHTML(p, '');
-
-                ed.dom.getParent(n, function(n) {
-                    var na = n.nodeName.toLowerCase(), u, pi, ti = '';
-
-                    // Ignore non element and hidden elements
-                    if (n.nodeType != 1 || (DOM.hasClass(n, 'mceItemHidden') || DOM.hasClass(n, 'mceItemRemoved')))
-                        return;
-
-                    // Fake name
-                    if (v = DOM.getAttrib(n, 'mce_name'))
-                        na = v;
-    
-                    // Handle prefix
-                    if (tinymce.isIE && n.scopeName !== 'HTML')
-                        na = n.scopeName + ':' + na;
-
-                    // Remove internal prefix
-                    na = na.replace(/mce\:/g, '');
-
-                    // Handle node name
-                    switch (na) {
-                        case 'b':
-                            na = 'strong';
-                            break;
-
-                        case 'i':
-                            na = 'em';
-                            break;
-
-                        case 'img':
-                            if (v = DOM.getAttrib(n, 'src'))
-                                ti += 'src: ' + v + ' ';
-
-                            break;
-
-                        case 'a':
-                            if (v = DOM.getAttrib(n, 'name')) {
-                                ti += 'name: ' + v + ' ';
-                                na += '#' + v;
-                            }
-
-                            if (v = DOM.getAttrib(n, 'href'))
-                                ti += 'href: ' + v + ' ';
-
-                            break;
-
-                        case 'font':
-                            if (s.convert_fonts_to_spans)
-                                na = 'span';
-
-                            if (v = DOM.getAttrib(n, 'face'))
-                                ti += 'font: ' + v + ' ';
-
-                            if (v = DOM.getAttrib(n, 'size'))
-                                ti += 'size: ' + v + ' ';
-
-                            if (v = DOM.getAttrib(n, 'color'))
-                                ti += 'color: ' + v + ' ';
-
-                            break;
-
-                        case 'span':
-                            if (v = DOM.getAttrib(n, 'style'))
-                                ti += 'style: ' + v + ' ';
-
-                            break;
-                    }
-
-                    if (v = DOM.getAttrib(n, 'id'))
-                        ti += 'id: ' + v + ' ';
-
-                    if (v = n.className) {
-                        v = v.replace(/(webkit-[\w\-]+|Apple-[\w\-]+|mceItem\w+|mceVisualAid)/g, '');
-
-                        if (v && v.indexOf('mceItem') == -1) {
-                            ti += 'class: ' + v + ' ';
-
-                            if (DOM.isBlock(n) || na == 'img' || na == 'span')
-                                na += '.' + v;
-                        }
-                    }
-
-                    na = na.replace(/(html:)/g, '');
-                    na = {name : na, node : n, title : ti};
-                    t.onResolveName.dispatch(t, na);
-                    ti = na.title;
-                    na = na.name;
-
-                    //u = "javascript:tinymce.EditorManager.get('" + ed.id + "').theme._sel('" + (de++) + "');";
-                    pi = DOM.create('a', {'href' : "#" + (de++) + "", onmousedown : "return false;", title : ti}, na);
-
-                    if (p.hasChildNodes()) {
-                        p.insertBefore(document.createTextNode(' \u00bb '), p.firstChild);
-                        p.insertBefore(pi, p.firstChild);
-                    } else
-                        p.appendChild(pi);
-                }, ed.getBody());
-            }
-        },
-
-        // Commands gets called by execCommand
-
-        _sel : function(v) {
-            this.editor.execCommand('mceSelectNodeDepth', false, v);
-        },
-
-        _mceInsertAnchor : function(ui, v) {
-            var ed = this.editor;
-
-            ed.windowManager.open({
-                url : tinymce.baseURL + '/themes/advanced/anchor.htm',
-                width : 320 + parseInt(ed.getLang('advanced.anchor_delta_width', 0)),
-                height : 90 + parseInt(ed.getLang('advanced.anchor_delta_height', 0)),
-                inline : true
-            }, {
-                theme_url : this.url
-            });
-        },
-
-        _mceCharMap : function() {
-            var ed = this.editor;
-
-            ed.windowManager.open({
-                url : tinymce.baseURL + '/themes/advanced/charmap.htm',
-                width : 550 + parseInt(ed.getLang('advanced.charmap_delta_width', 0)),
-                height : 250 + parseInt(ed.getLang('advanced.charmap_delta_height', 0)),
-                inline : true
-            }, {
-                theme_url : this.url
-            });
-        },
-
-        _mceHelp : function() {
-            var ed = this.editor;
-
-            ed.windowManager.open({
-                url : tinymce.baseURL + '/themes/advanced/about.htm',
-                width : 480,
-                height : 380,
-                inline : true
-            }, {
-                theme_url : this.url
-            });
-        },
-
-        _mceColorPicker : function(u, v) {
-            var ed = this.editor;
-
-            v = v || {};
-
-            ed.windowManager.open({
-                url : tinymce.baseURL + '/themes/advanced/color_picker.htm',
-                width : 375 + parseInt(ed.getLang('advanced.colorpicker_delta_width', 0)),
-                height : 250 + parseInt(ed.getLang('advanced.colorpicker_delta_height', 0)),
-                close_previous : false,
-                inline : true
-            }, {
-                input_color : v.color,
-                func : v.func,
-                theme_url : this.url
-            });
-        },
-
-        _mceCodeEditor : function(ui, val) {
-            var ed = this.editor;
-
-            ed.windowManager.open({
-                url : tinymce.baseURL + '/themes/advanced/source_editor.htm',
-                width : parseInt(ed.getParam("theme_advanced_source_editor_width", 720)),
-                height : parseInt(ed.getParam("theme_advanced_source_editor_height", 580)),
-                inline : true,
-                resizable : true,
-                maximizable : true
-            }, {
-                theme_url : this.url
-            });
-        },
-
-        _mceImage : function(ui, val) {
-            var ed = this.editor;
-
-            ed.windowManager.open({
-                url : tinymce.baseURL + '/themes/advanced/image.htm',
-                width : 355 + parseInt(ed.getLang('advanced.image_delta_width', 0)),
-                height : 275 + parseInt(ed.getLang('advanced.image_delta_height', 0)),
-                inline : true
-            }, {
-                theme_url : this.url
-            });
-        },
-
-        _mceLink : function(ui, val) {
-            var ed = this.editor;
-
-            ed.windowManager.open({
-                url : tinymce.baseURL + '/themes/advanced/link.htm',
-                width : 310 + parseInt(ed.getLang('advanced.link_delta_width', 0)),
-                height : 200 + parseInt(ed.getLang('advanced.link_delta_height', 0)),
-                inline : true
-            }, {
-                theme_url : this.url
-            });
-        },
-
-        _mceNewDocument : function() {
-            var ed = this.editor;
-
-            ed.windowManager.confirm('advanced.newdocument', function(s) {
-                if (s)
-                    ed.execCommand('mceSetContent', false, '');
-            });
-        },
-
-        _mceForeColor : function() {
-            var t = this;
-
-            this._mceColorPicker(0, {
-                func : function(co) {
-                    t.editor.execCommand('ForeColor', false, co);
-                }
-            });
-        },
-
-        _mceBackColor : function() {
-            var t = this;
-
-            this._mceColorPicker(0, {
-                func : function(co) {
-                    t.editor.execCommand('HiliteColor', false, co);
-                }
-            });
-        }
-    });
-
-    tinymce.ThemeManager.add('advanced', tinymce.themes.AdvancedTheme);
-}());
+(function(){var DOM=tinymce.DOM,Event=tinymce.dom.Event,extend=tinymce.extend,each=tinymce.each,Cookie=tinymce.util.Cookie,lastExtID;tinymce.ThemeManager.requireLangPack('advanced');tinymce.create('tinymce.themes.AdvancedTheme',{controls:{bold:['bold_desc','Bold'],italic:['italic_desc','Italic'],underline:['underline_desc','Underline'],strikethrough:['striketrough_desc','Strikethrough'],justifyleft:['justifyleft_desc','JustifyLeft'],justifycenter:['justifycenter_desc','JustifyCenter'],justifyright:['justifyright_desc','JustifyRight'],justifyfull:['justifyfull_desc','JustifyFull'],bullist:['bullist_desc','InsertUnorderedList'],numlist:['numlist_desc','InsertOrderedList'],outdent:['outdent_desc','Outdent'],indent:['indent_desc','Indent'],cut:['cut_desc','Cut'],copy:['copy_desc','Copy'],paste:['paste_desc','Paste'],undo:['undo_desc','Undo'],redo:['redo_desc','Redo'],link:['link_desc','mceLink'],unlink:['unlink_desc','unlink'],image:['image_desc','mceImage'],cleanup:['cleanup_desc','mceCleanup'],help:['help_desc','mceHelp'],code:['code_desc','mceCodeEditor'],hr:['hr_desc','InsertHorizontalRule'],removeformat:['removeformat_desc','RemoveFormat'],sub:['sub_desc','subscript'],sup:['sup_desc','superscript'],forecolor:['forecolor_desc','ForeColor'],forecolorpicker:['forecolor_desc','mceForeColor'],backcolor:['backcolor_desc','HiliteColor'],backcolorpicker:['backcolor_desc','mceBackColor'],charmap:['charmap_desc','mceCharMap'],visualaid:['visualaid_desc','mceToggleVisualAid'],anchor:['anchor_desc','mceInsertAnchor'],newdocument:['newdocument_desc','mceNewDocument'],blockquote:['blockquote_desc','mceBlockQuote']},stateControls:['bold','italic','underline','strikethrough','bullist','numlist','justifyleft','justifycenter','justifyright','justifyfull','sub','sup','blockquote'],init:function(ed,url){var t=this,s;t.editor=ed;t.url=url;t.onResolveName=new tinymce.util.Dispatcher(this);t.settings=s=extend({theme_advanced_path:true,theme_advanced_toolbar_location:'bottom',theme_advanced_buttons1:"bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect",theme_advanced_buttons2:"bullist,numlist,|,outdent,indent,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code",theme_advanced_buttons3:"hr,removeformat,visualaid,|,sub,sup,|,charmap",theme_advanced_blockformats:"p,address,pre,h1,h2,h3,h4,h5,h6",theme_advanced_toolbar_align:"center",theme_advanced_fonts:"Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats",theme_advanced_font_sizes:"1,2,3,4,5,6,7",theme_advanced_more_colors:1,theme_advanced_row_height:23,theme_advanced_resize_horizontal:1,theme_advanced_resizing_use_cookie:1},ed.settings);if(s.theme_advanced_path_location)s.theme_advanced_statusbar_location=s.theme_advanced_path_location;if(s.theme_advanced_statusbar_location=='none')s.theme_advanced_statusbar_location=0;ed.onInit.add(function(){ed.onNodeChange.add(t._nodeChanged,t);ed.dom.loadCSS(ed.baseURI.toAbsolute("themes/advanced/skins/"+ed.settings.skin+"/content.css"));});ed.onSetProgressState.add(function(ed,b,ti){var co,id=ed.id,tb;if(b){t.progressTimer=setTimeout(function(){co=ed.getContainer();co=co.insertBefore(DOM.create('DIV',{style:'position:relative'}),co.firstChild);tb=DOM.get(ed.id+'_tbl');DOM.add(co,'div',{id:id+'_blocker','class':'mceBlocker',style:{width:tb.clientWidth+2,height:tb.clientHeight+2}});DOM.add(co,'div',{id:id+'_progress','class':'mceProgress',style:{left:tb.clientWidth/ 2, top : tb.clientHeight /2}});},ti||0);}else{DOM.remove(id+'_blocker');DOM.remove(id+'_progress');clearTimeout(t.progressTimer);}});DOM.loadCSS(ed.baseURI.toAbsolute(s.editor_css||"themes/advanced/skins/"+ed.settings.skin+"/ui.css"));},createControl:function(n,cf){var cd,c;if(c=cf.createControl(n))return c;switch(n){case"styleselect":return this._createStyleSelect();case"formatselect":return this._createBlockFormats();case"fontselect":return this._createFontSelect();case"fontsizeselect":return this._createFontSizeSelect();case"forecolor":return this._createForeColorMenu();case"backcolor":return this._createBackColorMenu();}if((cd=this.controls[n]))return cf.createButton(n,{title:"advanced."+cd[0],cmd:cd[1],ui:cd[2],value:cd[3]});},execCommand:function(cmd,ui,val){var f=this['_'+cmd];if(f){f.call(this,ui,val);return true;}return false;},_importClasses:function(){var ed=this.editor,c=ed.controlManager.get('styleselect');if(c.getLength()==0){each(ed.dom.getClasses(),function(o){c.add(o['class'],o['class']);});}},_createStyleSelect:function(n){var t=this,ed=t.editor,cf=ed.controlManager,c=cf.createListBox('styleselect',{title:'advanced.style_select',onselect:function(v){if(c.selectedValue===v){ed.execCommand('mceSetStyleInfo',0,{command:'removeformat'});c.select();return false;}else ed.execCommand('mceSetCSSClass',0,v);}});each((t.settings.theme_advanced_styles||'').split(';'),function(v){var p=v.split('=');if(v)c.add(t.editor.translate(p[0]),p[1]);});c.onPostRender.add(function(ed,n){Event.add(n,'focus',t._importClasses,t);Event.add(n,'mousedown',t._importClasses,t);});return c;},_createFontSelect:function(){var c,t=this;c=t.editor.controlManager.createListBox('fontselect',{title:'advanced.fontdefault',cmd:'FontName'});each(t.settings.theme_advanced_fonts.split(';'),function(v){var p=v.split('='),st;if(p[1].indexOf('dings')==-1)st='font-family:'+p[1];c.add(t.editor.translate(p[0]),p[1],{style:st});});return c;},_createFontSizeSelect:function(){var c,t=this,lo=["1 (8 pt)","2 (10 pt)","3 (12 pt)","4 (14 pt)","5 (18 pt)","6 (24 pt)","7 (36 pt)"],fz=[8,10,12,14,18,24,36];c=t.editor.controlManager.createListBox('fontsizeselect',{title:'advanced.font_size',cmd:'FontSize'});each(t.settings.theme_advanced_font_sizes.split(','),function(v){c.add(lo[parseInt(v)-1],v,{'style':'font-size:'+fz[v-1]+'pt','class':'fontSize'+v});});return c;},_createBlockFormats:function(){var c,fmts={p:'advanced.paragraph',address:'advanced.address',pre:'advanced.pre',h1:'advanced.h1',h2:'advanced.h2',h3:'advanced.h3',h4:'advanced.h4',h5:'advanced.h5',h6:'advanced.h6',div:'advanced.div',blockquote:'advanced.blockquote',code:'advanced.code',dt:'advanced.dt',dd:'advanced.dd',samp:'advanced.samp'},t=this;c=t.editor.controlManager.createListBox('formatselect',{title:'advanced.block',cmd:'FormatBlock'});each(t.settings.theme_advanced_blockformats.split(','),function(v){c.add(t.editor.translate(fmts[v]),v,{element:v,'class':v.indexOf('h')==0?'':'preview'});});return c;},_createForeColorMenu:function(){var c,t=this,s=t.settings,o={},v;if(s.theme_advanced_more_colors){o.more_colors_func=function(){t._mceColorPicker(0,{color:c.value,func:function(co){c.setColor(co);}});};}if(v=s.theme_advanced_text_colors)o.colors=v;o.title='advanced.forecolor_desc';o.cmd='ForeColor';o.scope=this;c=t.editor.controlManager.createColorSplitButton('forecolor',o);return c;},_createBackColorMenu:function(){var c,t=this,s=t.settings,o={},v;if(s.theme_advanced_more_colors){o.more_colors_func=function(){t._mceColorPicker(0,{color:c.value,func:function(co){c.setColor(co);}});};}if(v=s.theme_advanced_background_colors)o.colors=v;o.title='advanced.backcolor_desc';o.cmd='HiliteColor';o.scope=this;c=t.editor.controlManager.createColorSplitButton('backcolor',o);return c;},renderUI:function(o){var n,ic,tb,t=this,ed=t.editor,s=t.settings,sc,p,nl;n=p=DOM.create('div',{id:ed.id+'_parent','class':'mceEditor '+ed.settings.skin+'Skin'});if(!DOM.boxModel)n=DOM.add(n,'div',{'class':'mceOldBoxModel'});n=sc=DOM.add(n,'table',{id:ed.id+'_tbl','class':'mceLayout',cellSpacing:0,cellPadding:0});n=tb=DOM.add(n,'tbody');switch((s.theme_advanced_layout_manager||'').toLowerCase()){case"rowlayout":ic=t._rowLayout(s,tb,o);break;case"customlayout":ic=ed.execCallback("theme_advanced_custom_layout",s,tb,o,p);break;default:ic=t._simpleLayout(s,tb,o,p);}n=o.targetNode;nl=sc.rows;DOM.addClass(nl[0],'first');DOM.addClass(nl[nl.length-1],'last');each(DOM.select('tr',tb),function(n){DOM.addClass(n.firstChild,'first');DOM.addClass(n.childNodes[n.childNodes.length-1],'last');});if(DOM.get(s.theme_advanced_toolbar_container))DOM.get(s.theme_advanced_toolbar_container).appendChild(p);else DOM.insertAfter(p,n);Event.add(ed.id+'_path_row','click',function(e){e=e.target;if(e.nodeName=='A'){t._sel(e.href.replace(/^[^#]*#/,''));return Event.cancel(e);}});if(!ed.getParam('accessibility_focus')||ed.getParam('tab_focus'))Event.add(DOM.add(p,'a',{href:'#'},'<!-- IE -->'),'focus',function(){tinyMCE.get(ed.id).focus();});if(s.theme_advanced_toolbar_location=='external')o.deltaHeight=0;t.deltaHeight=o.deltaHeight;o.targetNode=null;return{iframeContainer:ic,editorContainer:ed.id+'_parent',sizeContainer:sc,deltaHeight:o.deltaHeight};},getInfo:function(){return{longname:'Simple theme',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',version:tinymce.majorVersion+"."+tinymce.minorVersion}},_simpleLayout:function(s,tb,o,p){var t=this,ed=t.editor,lo=s.theme_advanced_toolbar_location,sl=s.theme_advanced_statusbar_location,n,ic,etb,c;if(lo=='top')t._addToolbars(tb,o);if(lo=='external'){n=c=DOM.create('div',{style:'position:relative'});n=DOM.add(n,'div',{id:ed.id+'_external','class':'mceExternalToolbar'});DOM.add(n,'a',{id:ed.id+'_external_close',href:'javascript:;','class':'mceExternalClose'});n=DOM.add(n,'table',{id:ed.id+'_tblext',cellSpacing:0,cellPadding:0});etb=DOM.add(n,'tbody');if(p.firstChild.className=='mceOldBoxModel')p.firstChild.appendChild(c);else p.insertBefore(c,p.firstChild);t._addToolbars(etb,o);ed.onMouseUp.add(function(){var e=DOM.get(ed.id+'_external');DOM.show(e);DOM.hide(lastExtID);var f=Event.add(ed.id+'_external_close','click',function(){DOM.hide(ed.id+'_external');Event.remove(ed.id+'_external_close','click',f);});DOM.show(e);DOM.setStyle(e,'top',0-DOM.getRect(ed.id+'_tblext').h-1);DOM.hide(e);DOM.show(e);e.style.filter='';lastExtID=ed.id+'_external';e=null;});}if(sl=='top')t._addStatusBar(tb,o);if(!s.theme_advanced_toolbar_container){n=DOM.add(tb,'tr');n=ic=DOM.add(n,'td',{'class':'mceIframeContainer'});}if(lo=='bottom')t._addToolbars(tb,o);if(sl=='bottom')t._addStatusBar(tb,o);return ic;},_rowLayout:function(s,tb,o){var t=this,ed=t.editor,dc,da,cf=ed.controlManager,n,ic,to;dc=s.theme_advanced_containers_default_class||'';da=s.theme_advanced_containers_default_align||'center';each((s.theme_advanced_containers||'').split(','),function(c,i){var v=s['theme_advanced_container_'+c]||'';switch(c.toLowerCase()){case'mceeditor':n=DOM.add(tb,'tr');n=ic=DOM.add(n,'td',{'class':'mceIframeContainer'});break;case'mceelementpath':t._addStatusBar(tb,o);break;default:n=DOM.add(DOM.add(tb,'tr'),'td',{'class':'mceToolbar '+(s['theme_advanced_container_'+c+'_class']||dc),align:s['theme_advanced_container_'+c+'_align']||da});to=cf.createToolbar("toolbar"+i);t._addControls(v,to);DOM.setHTML(n,to.renderHTML());o.deltaHeight-=s.theme_advanced_row_height;}});return ic;},_addControls:function(v,tb){var t=this,s=t.settings,di,cf=t.editor.controlManager;if(s.theme_advanced_disable&&!t._disabled){di={};each(s.theme_advanced_disable.split(','),function(v){di[v]=1;});t._disabled=di;}else di=t._disabled;each(v.split(','),function(n){var c;if(di&&di[n])return;if(n=='tablecontrols'){each(["table","|","row_props","cell_props","|","row_before","row_after","delete_row","|","col_before","col_after","delete_col","|","split_cells","merge_cells"],function(n){n=t.createControl(n,cf);if(n)tb.add(n);});return;}c=t.createControl(n,cf);if(c)tb.add(c);});},_addToolbars:function(c,o){var t=this,i,tb,ed=t.editor,s=t.settings,v,cf=ed.controlManager,di,n,h=[];n=DOM.add(DOM.add(c,'tr'),'td',{'class':'mceToolbar',align:s.theme_advanced_toolbar_align});if(!ed.getParam('accessibility_focus')||ed.getParam('tab_focus'))h.push(DOM.createHTML('a',{href:'#',onfocus:'tinyMCE.get(\''+ed.id+'\').focus();'},'<!-- IE -->'));h.push(DOM.createHTML('a',{href:'#',accesskey:'q',title:ed.getLang("advanced.toolbar_focus")},'<!-- IE -->'));for(i=1;(v=s['theme_advanced_buttons'+i]);i++){tb=cf.createToolbar("toolbar"+i,{'class':'mceToolbarRow'+i});if(s['theme_advanced_buttons'+i+'_add'])v+=','+s['theme_advanced_buttons'+i+'_add'];if(s['theme_advanced_buttons'+i+'_add_before'])v=s['theme_advanced_buttons'+i+'_add_before']+','+v;t._addControls(v,tb);h.push(tb.renderHTML());o.deltaHeight-=s.theme_advanced_row_height;}h.push(DOM.createHTML('a',{href:'#',accesskey:'z',title:ed.getLang("advanced.toolbar_focus"),onfocus:'tinyMCE.getInstanceById(\''+ed.id+'\').focus();'},'<!-- IE -->'));DOM.setHTML(n,h.join(''));},_addStatusBar:function(tb,o){var n,t=this,ed=t.editor,s=t.settings,r,mf,me,td;n=DOM.add(tb,'tr');n=td=DOM.add(n,'td',{'class':'mceStatusbar'});n=DOM.add(n,'div',{id:ed.id+'_path_row'},s.theme_advanced_path?ed.translate('advanced.path')+': ':'&nbsp;');DOM.add(n,'a',{href:'#',accesskey:'x'});if(s.theme_advanced_resizing&&!tinymce.isOldWebKit){DOM.add(td,'a',{id:ed.id+'_resize',href:'javascript:;',onclick:"return false;",'class':'resize'});if(s.theme_advanced_resizing_use_cookie){ed.onPostRender.add(function(){var o=Cookie.getHash("TinyMCE_"+ed.id+"_size"),c=DOM.get(ed.id+'_tbl');if(!o)return;if(s.theme_advanced_resize_horizontal)c.style.width=o.cw+'px';c.style.height=o.ch+'px';DOM.get(ed.id+'_ifr').style.height=(parseInt(o.ch)+t.deltaHeight)+'px';});}ed.onPostRender.add(function(){Event.add(ed.id+'_resize','mousedown',function(e){var c,p,w,h,n,pa;c=DOM.get(ed.id+'_tbl');w=c.clientWidth;h=c.clientHeight;miw=s.theme_advanced_resizing_min_width||100;mih=s.theme_advanced_resizing_min_height||100;maw=s.theme_advanced_resizing_max_width||0xFFFF;mah=s.theme_advanced_resizing_max_height||0xFFFF;p=DOM.add(DOM.get(ed.id+'_parent'),'div',{'class':'mcePlaceHolder'});DOM.setStyles(p,{width:w,height:h});DOM.hide(c);DOM.show(p);r={x:e.screenX,y:e.screenY,w:w,h:h,dx:null,dy:null};mf=Event.add(document,'mousemove',function(e){var w,h;r.dx=e.screenX-r.x;r.dy=e.screenY-r.y;w=Math.max(miw,r.w+r.dx);h=Math.max(mih,r.h+r.dy);w=Math.min(maw,w);h=Math.min(mah,h);if(s.theme_advanced_resize_horizontal)p.style.width=w+'px';p.style.height=h+'px';return Event.cancel(e);});me=Event.add(document,'mouseup',function(e){var ifr;Event.remove(document,'mousemove',mf);Event.remove(document,'mouseup',me);c.style.display='';DOM.remove(p);if(r.dx===null)return;ifr=DOM.get(ed.id+'_ifr');if(s.theme_advanced_resize_horizontal)c.style.width=(r.w+r.dx)+'px';c.style.height=(r.h+r.dy)+'px';ifr.style.height=(ifr.clientHeight+r.dy)+'px';if(s.theme_advanced_resizing_use_cookie){Cookie.setHash("TinyMCE_"+ed.id+"_size",{cw:r.w+r.dx,ch:r.h+r.dy});}});return Event.cancel(e);});});}o.deltaHeight-=21;n=tb=null;},_nodeChanged:function(ed,cm,n,co){var t=this,p,de=0,v,c,s=t.settings;tinymce.each(t.stateControls,function(c){cm.setActive(c,ed.queryCommandState(t.controls[c][1]));});cm.setActive('visualaid',ed.hasVisual);cm.setDisabled('undo',!ed.undoManager.hasUndo()&&!ed.typing);cm.setDisabled('redo',!ed.undoManager.hasRedo());cm.setDisabled('outdent',!ed.queryCommandState('Outdent'));p=DOM.getParent(n,'A');if(c=cm.get('link')){if(!p||!p.name){c.setDisabled(!p&&co);c.setActive(!!p);}}if(c=cm.get('unlink')){c.setDisabled(!p&&co);c.setActive(!!p&&!p.name);}if(c=cm.get('anchor')){c.setActive(!!p&&p.name);if(tinymce.isWebKit){p=DOM.getParent(n,'IMG');c.setActive(!!p&&DOM.getAttrib(p,'mce_name')=='a');}}p=DOM.getParent(n,'IMG');if(c=cm.get('image'))c.setActive(!!p&&n.className.indexOf('mceItem')==-1);if(c=cm.get('styleselect')){if(n.className){t._importClasses();c.select(n.className);}else c.select();}if(c=cm.get('formatselect')){p=DOM.getParent(n,DOM.isBlock);if(p)c.select(p.nodeName.toLowerCase());}if(c=cm.get('fontselect'))c.select(ed.queryCommandValue('FontName'));if(c=cm.get('fontsizeselect'))c.select(ed.queryCommandValue('FontSize'));if(s.theme_advanced_path&&s.theme_advanced_statusbar_location){p=DOM.get(ed.id+'_path')||DOM.add(ed.id+'_path_row','span',{id:ed.id+'_path'});DOM.setHTML(p,'');ed.dom.getParent(n,function(n){var na=n.nodeName.toLowerCase(),u,pi,ti='';if(n.nodeType!=1||(DOM.hasClass(n,'mceItemHidden')||DOM.hasClass(n,'mceItemRemoved')))return;if(v=DOM.getAttrib(n,'mce_name'))na=v;if(tinymce.isIE&&n.scopeName!=='HTML')na=n.scopeName+':'+na;na=na.replace(/mce\:/g,'');switch(na){case'b':na='strong';break;case'i':na='em';break;case'img':if(v=DOM.getAttrib(n,'src'))ti+='src: '+v+' ';break;case'a':if(v=DOM.getAttrib(n,'name')){ti+='name: '+v+' ';na+='#'+v;}if(v=DOM.getAttrib(n,'href'))ti+='href: '+v+' ';break;case'font':if(s.convert_fonts_to_spans)na='span';if(v=DOM.getAttrib(n,'face'))ti+='font: '+v+' ';if(v=DOM.getAttrib(n,'size'))ti+='size: '+v+' ';if(v=DOM.getAttrib(n,'color'))ti+='color: '+v+' ';break;case'span':if(v=DOM.getAttrib(n,'style'))ti+='style: '+v+' ';break;}if(v=DOM.getAttrib(n,'id'))ti+='id: '+v+' ';if(v=n.className){v=v.replace(/(webkit-[\w\-]+|Apple-[\w\-]+|mceItem\w+|mceVisualAid)/g,'');if(v&&v.indexOf('mceItem')==-1){ti+='class: '+v+' ';if(DOM.isBlock(n)||na=='img'||na=='span')na+='.'+v;}}na=na.replace(/(html:)/g,'');na={name:na,node:n,title:ti};t.onResolveName.dispatch(t,na);ti=na.title;na=na.name;pi=DOM.create('a',{'href':"#"+(de++)+"",onmousedown:"return false;",title:ti},na);if(p.hasChildNodes()){p.insertBefore(document.createTextNode(' \u00bb '),p.firstChild);p.insertBefore(pi,p.firstChild);}else p.appendChild(pi);},ed.getBody());}},_sel:function(v){this.editor.execCommand('mceSelectNodeDepth',false,v);},_mceInsertAnchor:function(ui,v){var ed=this.editor;ed.windowManager.open({url:tinymce.baseURL+'/themes/advanced/anchor.htm',width:320+parseInt(ed.getLang('advanced.anchor_delta_width',0)),height:90+parseInt(ed.getLang('advanced.anchor_delta_height',0)),inline:true},{theme_url:this.url});},_mceCharMap:function(){var ed=this.editor;ed.windowManager.open({url:tinymce.baseURL+'/themes/advanced/charmap.htm',width:550+parseInt(ed.getLang('advanced.charmap_delta_width',0)),height:250+parseInt(ed.getLang('advanced.charmap_delta_height',0)),inline:true},{theme_url:this.url});},_mceHelp:function(){var ed=this.editor;ed.windowManager.open({url:tinymce.baseURL+'/themes/advanced/about.htm',width:480,height:380,inline:true},{theme_url:this.url});},_mceColorPicker:function(u,v){var ed=this.editor;v=v||{};ed.windowManager.open({url:tinymce.baseURL+'/themes/advanced/color_picker.htm',width:375+parseInt(ed.getLang('advanced.colorpicker_delta_width',0)),height:250+parseInt(ed.getLang('advanced.colorpicker_delta_height',0)),close_previous:false,inline:true},{input_color:v.color,func:v.func,theme_url:this.url});},_mceCodeEditor:function(ui,val){var ed=this.editor;ed.windowManager.open({url:tinymce.baseURL+'/themes/advanced/source_editor.htm',width:parseInt(ed.getParam("theme_advanced_source_editor_width",720)),height:parseInt(ed.getParam("theme_advanced_source_editor_height",580)),inline:true,resizable:true,maximizable:true},{theme_url:this.url});},_mceImage:function(ui,val){var ed=this.editor;ed.windowManager.open({url:tinymce.baseURL+'/themes/advanced/image.htm',width:355+parseInt(ed.getLang('advanced.image_delta_width',0)),height:275+parseInt(ed.getLang('advanced.image_delta_height',0)),inline:true},{theme_url:this.url});},_mceLink:function(ui,val){var ed=this.editor;ed.windowManager.open({url:tinymce.baseURL+'/themes/advanced/link.htm',width:310+parseInt(ed.getLang('advanced.link_delta_width',0)),height:200+parseInt(ed.getLang('advanced.link_delta_height',0)),inline:true},{theme_url:this.url});},_mceNewDocument:function(){var ed=this.editor;ed.windowManager.confirm('advanced.newdocument',function(s){if(s)ed.execCommand('mceSetContent',false,'');});},_mceForeColor:function(){var t=this;this._mceColorPicker(0,{func:function(co){t.editor.execCommand('ForeColor',false,co);}});},_mceBackColor:function(){var t=this;this._mceColorPicker(0,{func:function(co){t.editor.execCommand('HiliteColor',false,co);}});}});tinymce.ThemeManager.add('advanced',tinymce.themes.AdvancedTheme);}());

trunk/wp-includes/js/tinymce/themes/advanced/image.htm

@@ -3 +3 @@
 <head>
     <title>{#advanced_dlg.image_title}</title>
-    <script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+    <script type="text/javascript" src="../../tiny_mce_popup.js"></script>
     <script type="text/javascript" src="../../utils/mctabs.js"></script>
     <script type="text/javascript" src="../../utils/form_utils.js"></script>
     <script type="text/javascript" src="js/image.js"></script>
-    <base target="_self" />
+    <script type="text/javascript">tinyMCEPopup.onInit.add(function(){window.setTimeout(function(){document.getElementById('src').focus();},500);});</script>
+    <base target="_self" />
 </head>
 <body id="image" style="display: none">
@@ -75 +76 @@
     <div class="mceActionPanel">
         <div style="float: left">
-            <input type="button" id="insert" name="insert" value="{#insert}" onclick="ImageDialog.update();" />
+            <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
         </div>
-
+            
         <div style="float: right">
-            <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+            <input type="submit" id="insert" name="insert" value="{#insert}" onclick="ImageDialog.update();" />
         </div>
     </div>

trunk/wp-includes/js/tinymce/themes/advanced/js/charmap.js

@@ -307 +307 @@
         window.focus();
 
+    tinyMCEPopup.editor.focus();
     tinyMCEPopup.close();
 }

trunk/wp-includes/js/tinymce/themes/advanced/link.htm

@@ -3 +3 @@
 <head>
     <title>{#advanced_dlg.link_title}</title>
-    <script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+    <script type="text/javascript" src="../../tiny_mce_popup.js"></script>
     <script type="text/javascript" src="../../utils/mctabs.js"></script>
     <script type="text/javascript" src="../../utils/form_utils.js"></script>
     <script type="text/javascript" src="../../utils/validate.js"></script>
     <script type="text/javascript" src="js/link.js"></script>
-    <base target="_self" />
+    <script type="text/javascript">tinyMCEPopup.onInit.add(function(){window.setTimeout(function(){document.getElementById('href').focus();},500);});</script>
+    <base target="_self" />
 </head>
 <body id="link" style="display: none">
@@ -53 +54 @@
     <div class="mceActionPanel">
         <div style="float: left">
-            <input type="button" id="insert" name="insert" value="{#insert}" onclick="LinkDialog.update();" />
+            <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
         </div>
 
         <div style="float: right">
-            <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+            <input type="submit" id="insert" name="insert" value="{#insert}" onclick="LinkDialog.update();" />
         </div>
     </div>

trunk/wp-includes/js/tinymce/themes/advanced/skins/default/content.css

@@ -1 @@
-body, td, pre {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}
+body, td, pre {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px; margin:8px; }
 body {background:#FFF;}
 .mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceVisualAid {border: 1px dashed #BBB;}

trunk/wp-includes/js/tinymce/themes/advanced/skins/default/ui.css

@@ -1 +1 @@
 /* Reset */
-.defaultSkin table, .defaultSkin tbody, .defaultSkin a, .defaultSkin img, .defaultSkin tr, .defaultSkin div, .defaultSkin td, .defaultSkin iframe, .defaultSkin span, .defaultSkin * {border:0; margin:0; padding:0; background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000; vertical-align:baseline}
+.defaultSkin table, .defaultSkin tbody, .defaultSkin a, .defaultSkin img, .defaultSkin tr, .defaultSkin div, .defaultSkin td, .defaultSkin iframe, .defaultSkin span, .defaultSkin *, .defaultSkin .text {border:0; margin:0; padding:0; background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000; vertical-align:baseline; width:auto; border-collapse:separate}
 .defaultSkin a:hover, .defaultSkin a:link, .defaultSkin a:visited, .defaultSkin a:active {text-decoration:none; font-weight:normal; cursor:default; color:#000}
 .defaultSkin table td {vertical-align:middle}
@@ -24 +24 @@
 .defaultSkin .mceIframeContainer {border-top:1px solid #CCC; border-bottom:1px solid #CCC}
 .defaultSkin .mceStatusbar {position:relative; font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; padding:2px; color:#000; display:block}
-.defaultSkin .mceStatusbar a.resize {display:block; position:absolute; top:0; right:0; background:url(../../img/icons.gif) -800px 0; width:20px; height:20px}
+.defaultSkin .mceStatusbar a.resize {display:block; position:absolute; top:0; right:0; background:url(../../img/icons.gif) -800px 0; width:20px; height:20px; cursor:se-resize}
 .defaultSkin .mceStatusbar a:hover {text-decoration:underline}
 .defaultSkin table.mceToolbar {margin-left:3px}

trunk/wp-includes/js/tinymce/themes/advanced/skins/o2k7/content.css

@@ -1 @@
-body, td, pre {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}
+body, td, pre {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px; margin:8px;}
 body {background:#FFF;}
 .mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceVisualAid {border: 1px dashed #BBB;}

trunk/wp-includes/js/tinymce/themes/advanced/skins/o2k7/ui.css

@@ -1 +1 @@
 /* Reset */
-.o2k7Skin table, .o2k7Skin tbody, .o2k7Skin a, .o2k7Skin img, .o2k7Skin tr, .o2k7Skin div, .o2k7Skin td, .o2k7Skin iframe, .o2k7Skin span, .o2k7Skin * {border:0; margin:0; padding:0; background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000; vertical-align:baseline}
+.o2k7Skin table, .o2k7Skin tbody, .o2k7Skin a, .o2k7Skin img, .o2k7Skin tr, .o2k7Skin div, .o2k7Skin td, .o2k7Skin iframe, .o2k7Skin span, .o2k7Skin *, .o2k7Skin .text {border:0; margin:0; padding:0; background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000; vertical-align:baseline; width:auto; border-collapse:separate}
 .o2k7Skin a:hover, .o2k7Skin a:link, .o2k7Skin a:visited, .o2k7Skin a:active {text-decoration:none; font-weight:normal; cursor:default; color:#000}
 .o2k7Skin table td {vertical-align:middle}
@@ -22 +22 @@
 .o2k7Skin .mceStatusbar {display:block; font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; color:#000; height:20px;}
 .o2k7Skin .mceStatusbar div {float:left; padding:2px;}
-.o2k7Skin .mceStatusbar a.resize {display:block; float:right; background:url(../../img/icons.gif) -800px 0; width:20px; height:20px}
+.o2k7Skin .mceStatusbar a.resize {display:block; float:right; background:url(../../img/icons.gif) -800px 0; width:20px; height:20px; cursor:se-resize}
 .o2k7Skin .mceStatusbar a:hover {text-decoration:underline}
 .o2k7Skin table.mceToolbar {margin-left:3px}

trunk/wp-includes/js/tinymce/themes/advanced/source_editor.htm

@@ -3 +3 @@
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
     <title>{#advanced_dlg.code_title}</title>
-    <script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+    <script type="text/javascript" src="../../tiny_mce_popup.js"></script>
     <script type="text/javascript" src="js/source_editor.js"></script>
-    <base target="_self" />
+    <script type="text/javascript">tinyMCEPopup.onInit.add(function(){window.setTimeout(function(){document.getElementById('htmlSource').focus();},500);});</script>
+    <base target="_self" />
 </head>
 <body onresize="resizeInputs();" style="display:none; overflow:hidden;">
@@ -21 +22 @@
         <div class="mceActionPanel">
             <div style="float: left">
-                <input type="button" name="insert" value="{#update}" onclick="saveContent();" id="insert" />
+                <input type="button" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" id="cancel" />
             </div>
 
             <div style="float: right">
-                <input type="button" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" id="cancel" />
+                <input type="submit" name="insert" value="{#update}" onclick="saveContent();" id="insert" />
             </div>
         </div>

trunk/wp-includes/js/tinymce/tiny_mce.js

@@ -1 @@
-
-/* file:jscripts/tiny_mce/classes/tinymce.js */
-
-var tinymce = {
-    majorVersion : '3',
-    minorVersion : '0rc2',
-    releaseDate : '2008-01-xx',
-
-    _init : function() {
-        var t = this, ua = navigator.userAgent, i, nl, n, base;
-
-        // Browser checks
-        t.isOpera = window.opera && opera.buildNumber;
-        t.isWebKit = /WebKit/.test(ua);
-        t.isOldWebKit = t.isWebKit && !window.getSelection().getRangeAt;
-        t.isIE = !t.isWebKit && !t.isOpera && (/MSIE/gi).test(ua) && (/Explorer/gi).test(navigator.appName);
-        t.isIE6 = t.isIE && /MSIE [56]/.test(ua);
-        t.isGecko = !t.isWebKit && /Gecko/.test(ua);
-//      t.isGecko3 = t.isGecko && /(Firefox|Minefield)\/[3-9]/.test(ua);
-        t.isMac = ua.indexOf('Mac') != -1;
-
-        // TinyMCE .NET webcontrol might be setting the values for TinyMCE
-        if (window.tinyMCEPreInit) {
-            t.suffix = tinyMCEPreInit.suffix;
-            t.baseURL = tinyMCEPreInit.base;
-            return;
-        }
-
-        // Get suffix and base
-        t.suffix = '';
-
-        // If base element found, add that infront of baseURL
-        nl = document.getElementsByTagName('base');
-        for (i=0; i<nl.length; i++) {
-            if (nl[i].href)
-                base = nl[i].href;
-        }
-
-        function getBase(n) {
-            if (n.src && /tiny_mce(|_dev|_src|_gzip|_jquery|_prototype).js/.test(n.src)) {
-                if (/_(src|dev)\.js/g.test(n.src))
-                    t.suffix = '_src';
-
-                t.baseURL = n.src.substring(0, n.src.lastIndexOf('/'));
-
-                // If path to script is relative and a base href was found add that one infront
-                if (base && t.baseURL.indexOf('://') == -1)
-                    t.baseURL = base + t.baseURL;
-
-                return t.baseURL;
-            }
-
-            return null;
-        };
-
-        // Check document
-        nl = document.getElementsByTagName('script');
-        for (i=0; i<nl.length; i++) {
-            if (getBase(nl[i]))
-                return;
-        }
-
-        // Check head
-        n = document.getElementsByTagName('head')[0];
-        if (n) {
-            nl = n.getElementsByTagName('script');
-            for (i=0; i<nl.length; i++) {
-                if (getBase(nl[i]))
-                    return;
-            }
-        }
-
-        return;
-    },
-
-    is : function(o, t) {
-        var n = typeof(o);
-
-        if (!t)
-            return n != 'undefined';
-
-        if (t == 'array' && (o instanceof Array))
-            return true;
-
-        return n == t;
-    },
-
-    // #if !jquery
-
-    each : function(o, cb, s) {
-        var n, l;
-
-        if (!o)
-            return 0;
-
-        s = s || o;
-
-        if (typeof(o.length) != 'undefined') {
-            // Indexed arrays, needed for Safari
-            for (n=0, l = o.length; n<l; n++) {
-                if (cb.call(s, o[n], n, o) === false)
-                    return 0;
-            }
-        } else {
-            // Hashtables
-            for (n in o) {
-                if (o.hasOwnProperty(n)) {
-                    if (cb.call(s, o[n], n, o) === false)
-                        return 0;
-                }
-            }
-        }
-
-        return 1;
-    },
-
-    map : function(a, f) {
-        var o = [];
-
-        tinymce.each(a, function(v) {
-            o.push(f(v));
-        });
-
-        return o;
-    },
-
-    grep : function(a, f) {
-        var o = [];
-
-        tinymce.each(a, function(v) {
-            if (!f || f(v))<