TinyMCE 3.1.1 from azaozz. fixes #7191

git-svn-id: https://develop.svn.wordpress.org/trunk@8204 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren 2008-06-27 16:13:27 +00:00
parent 80c836b58a
commit d8d5181c77
24 changed files with 96 additions and 102 deletions

View File

@ -64,7 +64,7 @@ header( 'Content-Type: application/x-javascript; charset=UTF-8' );
?>
{
"betaManifestVersion" : 1,
"version" : "<?php echo $man_version; ?>_20080625",
"version" : "<?php echo $man_version; ?>_20080626",
"entries" : [
<?php echo $defaults; ?>
@ -112,50 +112,50 @@ header( 'Content-Type: application/x-javascript; charset=UTF-8' );
{ "url" : "../wp-includes/js/thickbox/tb-close.png" },
{ "url" : "../wp-includes/js/swfupload/swfupload_f9.swf" },
{ "url" : "../wp-includes/js/tinymce/tiny_mce_popup.js?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/utils/mctabs.js?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/utils/validate.js?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/utils/form_utils.js?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/utils/editable_selects.js?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/paste/js/pasteword.js?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/paste/js/pastetext.js?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/media/js/media.js?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/color_picker.js?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/charmap.js?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/image.js?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/link.js?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/source_editor.js?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/anchor.js?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=3102" },
{ "url" : "../wp-includes/js/tinymce/tiny_mce_popup.js?ver=311" },
{ "url" : "../wp-includes/js/tinymce/utils/mctabs.js?ver=311" },
{ "url" : "../wp-includes/js/tinymce/utils/validate.js?ver=311" },
{ "url" : "../wp-includes/js/tinymce/utils/form_utils.js?ver=311" },
{ "url" : "../wp-includes/js/tinymce/utils/editable_selects.js?ver=311" },
{ "url" : "../wp-includes/js/tinymce/plugins/paste/js/pasteword.js?ver=311" },
{ "url" : "../wp-includes/js/tinymce/plugins/paste/js/pastetext.js?ver=311" },
{ "url" : "../wp-includes/js/tinymce/plugins/media/js/media.js?ver=311" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/color_picker.js?ver=311" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/charmap.js?ver=311" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/image.js?ver=311" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/link.js?ver=311" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/source_editor.js?ver=311" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/anchor.js?ver=311" },
{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=311" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/source_editor.htm?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/anchor.htm?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/image.htm?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/link.htm?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/color_picker.htm?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/charmap.htm?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/media/media.htm?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/paste/pasteword.htm?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/paste/blank.htm?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/paste/pastetext.htm?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/wp-mce-help.php?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/source_editor.htm?ver=311" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/anchor.htm?ver=311" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/image.htm?ver=311" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/link.htm?ver=311" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/color_picker.htm?ver=311" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/charmap.htm?ver=311" },
{ "url" : "../wp-includes/js/tinymce/plugins/media/media.htm?ver=311" },
{ "url" : "../wp-includes/js/tinymce/plugins/paste/pasteword.htm?ver=311" },
{ "url" : "../wp-includes/js/tinymce/plugins/paste/blank.htm?ver=311" },
{ "url" : "../wp-includes/js/tinymce/plugins/paste/pastetext.htm?ver=311" },
{ "url" : "../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm?ver=311" },
{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm?ver=311" },
{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=311" },
{ "url" : "../wp-includes/js/tinymce/wp-mce-help.php?ver=311" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/dialog.css?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/spellchecker/css/content.css?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/css/content.css?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/media/css/content.css?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/media/css/media.css?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/pasteword.css?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/wordpress.css?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css?ver=311" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css?ver=311" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/dialog.css?ver=311" },
{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css?ver=311" },
{ "url" : "../wp-includes/js/tinymce/plugins/spellchecker/css/content.css?ver=311" },
{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/css/content.css?ver=311" },
{ "url" : "../wp-includes/js/tinymce/plugins/media/css/content.css?ver=311" },
{ "url" : "../wp-includes/js/tinymce/plugins/media/css/media.css?ver=311" },
{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/pasteword.css?ver=311" },
{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css?ver=311" },
{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=311" },
{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css?ver=311" },
{ "url" : "../wp-includes/js/tinymce/wordpress.css?ver=311" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/img/icons.gif" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/img/colorpicker.jpg" },

View File

@ -1 +1 @@
(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=DOM.doc.documentElement;if(ed.getParam('fullscreen_is_enabled')){if(ed.getParam('fullscreen_new_window'))closeFullscreen();else{DOM.win.setTimeout(function(){tinymce.dom.Event.remove(DOM.win,'resize',t.resizeFunc);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(DOM.doc.body,'overflow',ed.getParam('fullscreen_overflow'));DOM.win.scrollTo(ed.getParam('fullscreen_scrollx'),ed.getParam('fullscreen_scrolly'));tinyMCE.settings=tinyMCE.oldSettings;},10);}return;}if(ed.getParam('fullscreen_new_window')){win=DOM.win.open(url+"/fullscreen.htm","mceFullScreenPopup","fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width="+screen.availWidth+",height="+screen.availHeight);try{win.resizeTo(screen.availWidth,screen.availHeight);}catch(e){}}else{tinyMCE.oldSettings=tinyMCE.settings;s.fullscreen_overflow=DOM.getStyle(DOM.doc.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(DOM.doc.body,'overflow','hidden');de.style.overflow='hidden';vp=DOM.getViewPort();DOM.win.scrollTo(0,0);if(tinymce.isIE)vp.h-=1;n=DOM.add(DOM.doc.body,'div',{id:'mce_fullscreen_container',style:'position:absolute;top:0;left:0;width:'+vp.w+'px;height:'+vp.h+'px;z-index:200000;'});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;s.save_onsavecallback=function(){ed.setContent(tinyMCE.get(s.id).getContent({format:'raw'}),{format:'raw'});ed.execCommand('mceSave');};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());t.fullscreenEditor.focus();});t.fullscreenEditor.render();tinyMCE.add(t.fullscreenEditor);t.fullscreenElement=new tinymce.dom.Element('mce_fullscreen_container');t.fullscreenElement.update();t.resizeFunc=tinymce.dom.Event.add(DOM.win,'resize',function(){var vp=tinymce.DOM.getViewPort();t.fullscreenEditor.theme.resizeTo(vp.w,vp.h);});}});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);})();
(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=DOM.doc.documentElement;if(ed.getParam('fullscreen_is_enabled')){if(ed.getParam('fullscreen_new_window'))closeFullscreen();else{DOM.win.setTimeout(function(){tinymce.dom.Event.remove(DOM.win,'resize',t.resizeFunc);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(DOM.doc.body,'overflow',ed.getParam('fullscreen_overflow'));DOM.win.scrollTo(ed.getParam('fullscreen_scrollx'),ed.getParam('fullscreen_scrolly'));tinyMCE.settings=tinyMCE.oldSettings;},10);}return;}if(ed.getParam('fullscreen_new_window')){win=DOM.win.open(url+"/fullscreen.htm","mceFullScreenPopup","fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width="+screen.availWidth+",height="+screen.availHeight);try{win.resizeTo(screen.availWidth,screen.availHeight);}catch(e){}}else{tinyMCE.oldSettings=tinyMCE.settings;s.fullscreen_overflow=DOM.getStyle(DOM.doc.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(DOM.doc.body,'overflow','hidden');de.style.overflow='hidden';vp=DOM.getViewPort();DOM.win.scrollTo(0,0);if(tinymce.isIE)vp.h-=1;n=DOM.add(DOM.doc.body,'div',{id:'mce_fullscreen_container',style:'position:'+(tinymce.isIE6||(tinymce.isIE&&!DOM.boxModel)?'absolute':'fixed')+';top:0;left:0;width:'+vp.w+'px;height:'+vp.h+'px;z-index:200000;'});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;s.save_onsavecallback=function(){ed.setContent(tinyMCE.get(s.id).getContent({format:'raw'}),{format:'raw'});ed.execCommand('mceSave');};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());t.fullscreenEditor.focus();});t.fullscreenEditor.render();tinyMCE.add(t.fullscreenEditor);t.fullscreenElement=new tinymce.dom.Element('mce_fullscreen_container');t.fullscreenElement.update();t.resizeFunc=tinymce.dom.Event.add(DOM.win,'resize',function(){var vp=tinymce.DOM.getViewPort();t.fullscreenEditor.theme.resizeTo(vp.w,vp.h);});}});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);})();

View File

@ -3,7 +3,7 @@
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<script type="text/javascript" src="../../tiny_mce.js?ver=3101"></script>
<script type="text/javascript" src="../../tiny_mce.js?ver=311"></script>
<script type="text/javascript">
function patchCallback(settings, key) {
if (settings[key])

File diff suppressed because one or more lines are too long

View File

@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Template for dialogs</title>
<link rel="stylesheet" type="text/css" href="skins/clearlooks2/window.css?ver=3101" />
<link rel="stylesheet" type="text/css" href="skins/clearlooks2/window.css?ver=311" />
</head>
<body>

File diff suppressed because one or more lines are too long

View File

@ -2,13 +2,13 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>{#media_dlg.title}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=3101"></script>
<script type="text/javascript" src="js/media.js?ver=3101"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=3101"></script>
<script type="text/javascript" src="../../utils/validate.js?ver=3101"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=3101"></script>
<script type="text/javascript" src="../../utils/editable_selects.js?ver=3101"></script>
<link href="css/media.css?ver=3101" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=311"></script>
<script type="text/javascript" src="js/media.js?ver=311"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=311"></script>
<script type="text/javascript" src="../../utils/validate.js?ver=311"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=311"></script>
<script type="text/javascript" src="../../utils/editable_selects.js?ver=311"></script>
<link href="css/media.css?ver=311" rel="stylesheet" type="text/css" />
<base target="_self" />
</head>
<body style="display: none">

View File

@ -2,7 +2,7 @@
<head>
<title>blank_page</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link href="css/blank.css?ver=3101" rel="stylesheet" type="text/css" />
<link href="css/blank.css?ver=311" rel="stylesheet" type="text/css" />
<base target="_self" />
<script type="text/javascript">
function init() {

View File

@ -2,8 +2,8 @@
<head>
<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?ver=3101"></script>
<script type="text/javascript" src="js/pastetext.js?ver=3101"></script>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=311"></script>
<script type="text/javascript" src="js/pastetext.js?ver=311"></script>
<base target="_self" />
</head>
<body onresize="resizeInputs();" style="display:none; overflow:hidden;">

View File

@ -2,9 +2,9 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<title>{#paste.paste_word_desc}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=3101"></script>
<script type="text/javascript" src="js/pasteword.js?ver=3101"></script>
<link href="css/pasteword.css?ver=3101" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=311"></script>
<script type="text/javascript" src="js/pasteword.js?ver=311"></script>
<link href="css/pasteword.css?ver=311" rel="stylesheet" type="text/css" />
<base target="_self" />
</head>
<body onresize="resizeInputs();" style="display:none; overflow:hidden;">

File diff suppressed because one or more lines are too long

View File

@ -4,14 +4,14 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title></title>
<script type="text/javascript" src="js/editimage.js?ver=3102"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=3101"></script>
<script type="text/javascript" src="js/editimage.js?ver=311"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=311"></script>
<link rel="stylesheet" href="css/editimage.css?ver=3101" type="text/css" media="all" />
<link rel="stylesheet" href="css/editimage.css?ver=311" type="text/css" media="all" />
<link rel="stylesheet" href="../../../../../wp-admin/css/media.css?ver=2.6-beta1" type="text/css" media="all" />
<script type="text/javascript">
if ( 'rtl' == tinyMCEPopup.editor.getParam('directionality','') )
document.write('<link rel="stylesheet" href="css/editimage-rtl.css?ver=3101" type="text/css" media="all" />');
document.write('<link rel="stylesheet" href="css/editimage-rtl.css?ver=311" type="text/css" media="all" />');
</script>
<base target="_self" />
</head>

View File

@ -342,14 +342,13 @@ var wpImage = {
A = ed.dom.getParent(el, 'A');
P = ed.dom.getParent(el, 'p');
tinyMCEPopup.execCommand("mceBeginUndoLevel");
/* if ( tinymce.isIE ) {
if ( f.img_classes.value.indexOf('aligncenter') != -1 )
ed.dom.addClass(P, 'mce_iecenter');
else ed.dom.removeClass(P, 'mce_iecenter');
}
*/
ed.dom.setAttribs(el, {
src : f.img_src.value,
title : f.img_title.value,
@ -362,15 +361,11 @@ var wpImage = {
if ( ! f.link_href.value ) {
if ( A ) {
tinyMCEPopup.execCommand("mceBeginUndoLevel");
b = ed.selection.getBookmark();
ed.dom.remove(pa, 1);
ed.dom.remove(A, 1);
ed.selection.moveToBookmark(b);
tinyMCEPopup.execCommand("mceEndUndoLevel");
}
} else {
tinyMCEPopup.execCommand("mceBeginUndoLevel");
// Create new anchor elements
if ( A == null ) {
@ -402,9 +397,8 @@ var wpImage = {
style : f.link_style.value
});
}
tinyMCEPopup.execCommand("mceEndUndoLevel");
}
ed.dom.setAttrib(el, 'class', f.img_classes.value);
if ( v.indexOf('aligncenter') != -1 ) {
@ -414,7 +408,7 @@ var wpImage = {
if ( P && P.style && P.style.textAlign == 'center' )
ed.dom.setStyle(P, 'textAlign', '');
}
tinyMCEPopup.execCommand("mceEndUndoLevel");
ed.execCommand('mceRepaint');
tinyMCEPopup.close();
},

View File

@ -2,9 +2,9 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>{#advanced_dlg.about_title}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=3101"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=3101"></script>
<script type="text/javascript" src="js/about.js?ver=3101"></script>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=311"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=311"></script>
<script type="text/javascript" src="js/about.js?ver=311"></script>
</head>
<body id="about" style="display: none">
<div class="tabs">

View File

@ -2,8 +2,8 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>{#advanced_dlg.anchor_title}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=3101"></script>
<script type="text/javascript" src="js/anchor.js?ver=3101"></script>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=311"></script>
<script type="text/javascript" src="js/anchor.js?ver=311"></script>
<base target="_self" />
</head>
<body style="display: none">

View File

@ -3,8 +3,8 @@
<head>
<title>{#advanced_dlg.charmap_title}</title>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=3101"></script>
<script type="text/javascript" src="js/charmap.js?ver=3101"></script>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=311"></script>
<script type="text/javascript" src="js/charmap.js?ver=311"></script>
<base target="_self" />
</head>
<body id="charmap" style="display:none">

View File

@ -2,9 +2,9 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>{#advanced_dlg.colorpicker_title}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=3101"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=3101"></script>
<script type="text/javascript" src="js/color_picker.js?ver=3101"></script>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=311"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=311"></script>
<script type="text/javascript" src="js/color_picker.js?ver=311"></script>
<base target="_self" />
</head>
<body id="colorpicker" style="display: none">

View File

@ -2,10 +2,10 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>{#advanced_dlg.image_title}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=3101"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=3101"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=3101"></script>
<script type="text/javascript" src="js/image.js?ver=3101"></script>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=311"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=311"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=311"></script>
<script type="text/javascript" src="js/image.js?ver=311"></script>
<base target="_self" />
</head>
<body id="image" style="display: none">

View File

@ -2,11 +2,11 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>{#advanced_dlg.link_title}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=3101"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=3101"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=3101"></script>
<script type="text/javascript" src="../../utils/validate.js?ver=3101"></script>
<script type="text/javascript" src="js/link.js?ver=3101"></script>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=311"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=311"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=311"></script>
<script type="text/javascript" src="../../utils/validate.js?ver=311"></script>
<script type="text/javascript" src="js/link.js?ver=311"></script>
<base target="_self" />
</head>
<body id="link" style="display: none">

View File

@ -2,8 +2,8 @@
<head>
<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?ver=3101"></script>
<script type="text/javascript" src="js/source_editor.js?ver=3101"></script>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=311"></script>
<script type="text/javascript" src="js/source_editor.js?ver=311"></script>
<base target="_self" />
</head>
<body onresize="resizeInputs();" style="display:none; overflow:hidden;">

File diff suppressed because one or more lines are too long

View File

@ -222,7 +222,7 @@ if ( $compress && isset($_SERVER['HTTP_ACCEPT_ENCODING']) ) {
// Setup cache info
if ( $disk_cache ) {
$cacheKey = apply_filters('tiny_mce_version', '20080622');
$cacheKey = apply_filters('tiny_mce_version', '20080626');
foreach ( $initArray as $v )
$cacheKey .= $v;
@ -269,7 +269,7 @@ if ( $mce_deprecated ) $mce_options .= $mce_deprecated;
$mce_options = rtrim( trim($mce_options), '\n\r,' );
$content = 'var tinyMCEPreInit = { settings : { themes : "' . $theme . '", plugins : "' . $initArray['plugins'] . '", languages : "' . $language . '", debug : false }, base : "' . $baseurl . '", suffix : "", query : "ver=3101" };';
$content = 'var tinyMCEPreInit = { settings : { themes : "' . $theme . '", plugins : "' . $initArray['plugins'] . '", languages : "' . $language . '", debug : false }, base : "' . $baseurl . '", suffix : "", query : "ver=311" };';
// Load patch
$content .= getFileContents( 'tiny_mce_ext.js' );

View File

@ -6,7 +6,7 @@ header('Content-Type: text/html; charset=' . get_bloginfo('charset'));
<head>
<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
<title><?php _e('Rich Editor Help') ?></title>
<script type="text/javascript" src="tiny_mce_popup.js?ver=3101"></script>
<script type="text/javascript" src="tiny_mce_popup.js?ver=311"></script>
<?php
wp_admin_css( 'global', true );
wp_admin_css( 'wp-admin', true );

View File

@ -37,7 +37,7 @@ function wp_default_scripts( &$scripts ) {
$scripts->add( 'editor_functions', '/wp-admin/js/editor.js', false, '20080325' );
// Modify this version when tinyMCE plugins are changed.
$mce_version = apply_filters('tiny_mce_version', '20080622');
$mce_version = apply_filters('tiny_mce_version', '20080626');
$scripts->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_config.php', array('editor_functions'), $mce_version );
$scripts->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.6');