Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-09 09:57:38 +01:00
Code Issues Projects Releases Wiki Activity

TinyMCE 3.02 from azaozz. fixes #6012

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@7060 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-02-27 05:36:42 +00:00
parent 32b34b0be6
commit 77aa40f291
14 changed files with 424 additions and 369 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js
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=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;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.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);})();
(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.dom.Event.remove(window,'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(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=yes,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;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.render();tinyMCE.add(t.fullscreenEditor);t.fullscreenElement=new tinymce.dom.Element('mce_fullscreen_container');t.fullscreenElement.update();t.resizeFunc=tinymce.dom.Event.add(window,'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);})();

30
wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm
View File

@ -64,9 +64,6 @@
window.close();
}
// Add onunload
tinymce.dom.Event.add(window, "beforeunload", unloadHandler);
function doParentSubmit() {
moveContent();
@ -77,6 +74,27 @@
return false;
}
function render() {
var e = document.getElementById('fullscreenarea'), vp, ed, ow, oh, dom = tinymce.DOM;
e.value = window.opener.tinyMCE.activeEditor.getContent();
vp = dom.getViewPort();
settings.width = vp.w;
settings.height = vp.h - 15;
tinymce.dom.Event.add(window, 'resize', function() {
var vp = dom.getViewPort();
tinyMCE.activeEditor.theme.resizeTo(vp.w, vp.h);
});
tinyMCE.init(settings);
}
// Add onunload
tinymce.dom.Event.add(window, "beforeunload", unloadHandler);
</script>
<base target="_self" />
</head>
@ -86,11 +104,7 @@
</form>
<script type="text/javascript">
var e = document.getElementById('fullscreenarea');
e.value = window.opener.tinyMCE.activeEditor.getContent();
settings.width = window.innerWidth || document.body.clientWidth;
settings.height = (window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight) - 18;
tinyMCE.init(settings);
render();
</script>
</body>

2
wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js
View File

File diff suppressed because one or more lines are too long

136
wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css
View File

@ -5,26 +5,26 @@
/* General */
.clearlooks2 div, .clearlooks2 span, .clearlooks2 a {position:absolute; border:0; padding:0; margin:0; background:transparent; font-family:Arial,Verdana; font-size:11px; color:#000; text-decoration:none; font-weight:normal; width:auto; height:auto; overflow:hidden; display:block;}
.clearlooks2 {position:absolute;}
.clearlooks2 .wrapper {position:static}
.clearlooks2 .mceWrapper {position:static}
.mceEventBlocker {position:absolute; left:0; top:0; background:url(img/horizontal.gif) no-repeat 0 -75px; width:100%; height:100%;}
.clearlooks2 .placeholder {border:1px solid #000; background:#888; top:0; left:0; opacity:0.5; filter:alpha(opacity=50);}
.clearlooks2 .mcePlaceHolder {border:1px solid #000; background:#888; top:0; left:0; opacity:0.5; filter:alpha(opacity=50);}
/* Top */
.clearlooks2 .top,
.clearlooks2 .top div {
.clearlooks2 .mceTop,
.clearlooks2 .mceTop div {
top:0;
width:100%;
height:23px
}
.clearlooks2 .top .left {
.clearlooks2 .mceTop .mceLeft {
width:55%;
background: #cee1ef;
border-left: 1px solid #c6d9e9;
border-top: 1px solid #c6d9e9;
}
.clearlooks2 .top .center {
.clearlooks2 .mceTop .mceCenter {
}
.clearlooks2 .top .right {
.clearlooks2 .mceTop .mceRight {
right:0;
width:55%;
height:23px;
@ -32,7 +32,7 @@ background: #cee1ef;
border-right: 1px solid #c6d9e9;
border-top: 1px solid #c6d9e9;
}
.clearlooks2 .top span {
.clearlooks2 .mceTop span {
width:100%;
font: 12px/20px bold "Lucida Grande","Lucida Sans Unicode",Tahoma,Verdana,sans-serif;
text-align:center;
@ -40,86 +40,86 @@ vertical-align:middle;
line-height:23px;
font-weight:bold;
}
.clearlooks2 .focus .top .left {
.clearlooks2 .mceFocus .mceTop .mceLeft {
background: #2683ae;
border-left: 1px solid #464646;
border-top: 1px solid #464646;
}
.clearlooks2 .focus .top .center {
.clearlooks2 .mceFocus .mceTop .mceCenter {
}
.clearlooks2 .focus .top .right {
.clearlooks2 .mceFocus .mceTop .mceRight {
background: #2683ae;
border-right: 1px solid #464646;
border-top: 1px solid #464646;
}
.clearlooks2 .focus .top span {
.clearlooks2 .mceFocus .mceTop 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:#eaf3fa;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:#eaf3fa;border-right:1px solid #c6d9e9;}
.clearlooks2 .mceMiddle, .clearlooks2 .mceMiddle div {top:0;}
.clearlooks2 .mceMiddle {width:100%; height:100%; clip:rect(23px auto auto auto);}
.clearlooks2 .mceMiddle .mceLeft {left:0; width:5px; height:100%; background:#eaf3fa;border-left:1px solid #c6d9e9;}
.clearlooks2 .mceMiddle span {top:23px; left:5px; width:100%; height:100%; background:#FFF;}
.clearlooks2 .mceMiddle .mceRight {right:0; width:5px; height:100%; background:#eaf3fa;border-right:1px solid #c6d9e9;}
/* Bottom */
.clearlooks2 .bottom, .clearlooks2 .bottom div {height:6px;}
.clearlooks2 .bottom {left:0; bottom:0; width:100%;background:#eaf3fa;border-bottom:1px solid #c6d9e9;}
.clearlooks2 .bottom div {top:0;}
.clearlooks2 .bottom .left {left:0; width:5px; background:#eaf3fa ;border-left:1px solid #c6d9e9;}
.clearlooks2 .bottom .center {left:5px; width:100%;}
.clearlooks2 .bottom .right {right:0; width:6px; background:#eaf3fa 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;}
.clearlooks2 .statusbar .bottom .left {background:url(img/corners.gif) -29px 0;}
.clearlooks2 .statusbar .bottom .center {background:url(img/horizontal.gif) 0 -52px;}
.clearlooks2 .statusbar .bottom .right {background:url(img/corners.gif) -24px 0;}
.clearlooks2 .statusbar .bottom span {display:block; left:7px; font-family:Arial, Verdana; font-size:11px; line-height:23px;}
.clearlooks2 .mceBottom, .clearlooks2 .mceBottom div {height:6px;}
.clearlooks2 .mceBottom {left:0; bottom:0; width:100%;background:#eaf3fa;border-bottom:1px solid #c6d9e9;}
.clearlooks2 .mceBottom div {top:0;}
.clearlooks2 .mceBottom .mceLeft {left:0; width:5px; background:#eaf3fa ;border-left:1px solid #c6d9e9;}
.clearlooks2 .mceBottom .mceCenter {left:5px; width:100%;}
.clearlooks2 .mceBottom .mceRight {right:0; width:6px; background:#eaf3fa url(img/drag.gif) no-repeat;border-right:1px solid #c6d9e9;}
.clearlooks2 .mceBottom span {display:none;}
.clearlooks2 .mceStatusbar .mceBottom, .clearlooks2 .mceStatusbar .mceBottom div {height:23px;}
.clearlooks2 .mceStatusbar .mceBottom .mceLeft {background:url(img/corners.gif) -29px 0;}
.clearlooks2 .mceStatusbar .mceBottom .mceCenter {background:url(img/horizontal.gif) 0 -52px;}
.clearlooks2 .mceStatusbar .mceBottom .mceRight {background:url(img/corners.gif) -24px 0;}
.clearlooks2 .mceStatusbar .mceBottom span {display:block; left:7px; font-family:Arial, Verdana; font-size:11px; line-height:23px;}
/* Actions */
.clearlooks2 a {width:29px; height:16px; top:3px;}
.clearlooks2 .close {right:6px; background:url(img/buttons.gif) -87px 0;}
.clearlooks2 .min {display:none; right:68px; background:url(img/buttons.gif) 0 0;}
.clearlooks2 .med {display:none; right:37px; background:url(img/buttons.gif) -29px 0;}
.clearlooks2 .max {display:none; right:37px; background:url(img/buttons.gif) -58px 0;}
.clearlooks2 .move {display:none;width:100%;cursor:move;background:url(img/corners.gif) no-repeat -100px -100px;}
.clearlooks2 .movable .move {display:block;}
.clearlooks2 .focus .close {right:6px; background:url(img/buttons.gif) -87px -16px;}
.clearlooks2 .focus .min {right:68px; background:url(img/buttons.gif) 0 -16px;}
.clearlooks2 .focus .med {right:37px; background:url(img/buttons.gif) -29px -16px;}
.clearlooks2 .focus .max {right:37px; background:url(img/buttons.gif) -58px -16px;}
.clearlooks2 .focus .close:hover {right:6px; background:url(img/buttons.gif) -87px -32px;}
.clearlooks2 .focus .close:hover {right:6px; background:url(img/buttons.gif) -87px -32px;}
.clearlooks2 .focus .min:hover {right:68px; background:url(img/buttons.gif) 0 -32px;}
.clearlooks2 .focus .med:hover {right:37px; background:url(img/buttons.gif) -29px -32px;}
.clearlooks2 .focus .max:hover {right:37px; background:url(img/buttons.gif) -58px -32px;}
.clearlooks2 .mceClose {right:6px; background:url(img/buttons.gif) -87px 0;}
.clearlooks2 .mceMin {display:none; right:68px; background:url(img/buttons.gif) 0 0;}
.clearlooks2 .mceMed {display:none; right:37px; background:url(img/buttons.gif) -29px 0;}
.clearlooks2 .mceMax {display:none; right:37px; background:url(img/buttons.gif) -58px 0;}
.clearlooks2 .mceMove {display:none;width:100%;cursor:move;background:url(img/corners.gif) no-repeat -100px -100px;}
.clearlooks2 .mceMovable .mceMove {display:block;}
.clearlooks2 .mceFocus .mceClose {right:6px; background:url(img/buttons.gif) -87px -16px;}
.clearlooks2 .mceFocus .mceMin {right:68px; background:url(img/buttons.gif) 0 -16px;}
.clearlooks2 .mceFocus .mceMed {right:37px; background:url(img/buttons.gif) -29px -16px;}
.clearlooks2 .mceFocus .mceMax {right:37px; background:url(img/buttons.gif) -58px -16px;}
.clearlooks2 .mceFocus .mceClose:hover {right:6px; background:url(img/buttons.gif) -87px -32px;}
.clearlooks2 .mceFocus .mceClose:hover {right:6px; background:url(img/buttons.gif) -87px -32px;}
.clearlooks2 .mceFocus .mceMin:hover {right:68px; background:url(img/buttons.gif) 0 -32px;}
.clearlooks2 .mceFocus .mceMed:hover {right:37px; background:url(img/buttons.gif) -29px -32px;}
.clearlooks2 .mceFocus .mceMax:hover {right:37px; background:url(img/buttons.gif) -58px -32px;}
/* Resize */
.clearlooks2 .resize {top:auto; left:auto; display:none; width:5px; height:5px; background:url(img/horizontal.gif) no-repeat 0 -75px;}
.clearlooks2 .resizable .resize {display:block;}
.clearlooks2 .resizable .min, .clearlooks2 .max {display:none;}
.clearlooks2 .minimizable .min {display:block;}
.clearlooks2 .maximizable .max {display:block;}
.clearlooks2 .maximized .med {display:block;}
.clearlooks2 .maximized .max {display:none;}
.clearlooks2 a.resize-n {top:0; left:0; width:100%; cursor:n-resize;}
.clearlooks2 a.resize-nw {top:0; left:0; cursor:nw-resize;}
.clearlooks2 a.resize-ne {top:0; right:0; cursor:ne-resize}
.clearlooks2 a.resize-w {top:0; left:0; height:100%; cursor:w-resize;}
.clearlooks2 a.resize-e {top:0; right:0; height:100%; cursor:e-resize;}
.clearlooks2 a.resize-s {bottom:0; left:0; width:100%; cursor:s-resize}
.clearlooks2 a.resize-sw {bottom:0; left:0; cursor:sw-resize;}
.clearlooks2 a.resize-se {bottom:0; right:0; cursor:se-resize;}
.clearlooks2 .mceResize {top:auto; left:auto; display:none; width:5px; height:5px; background:url(img/horizontal.gif) no-repeat 0 -75px;}
.clearlooks2 .mceResizable .mceResize {display:block;}
.clearlooks2 .mceResizable .mceMin, .clearlooks2 .mceMax {display:none;}
.clearlooks2 .mceMinimizable .mceMin {display:block;}
.clearlooks2 .mceMaximizable .mceMax {display:block;}
.clearlooks2 .mceMaximized .mceMed {display:block;}
.clearlooks2 .mceMaximized .mceMax {display:none;}
.clearlooks2 a.mceResizeN {top:0; left:0; width:100%; cursor:n-resize;}
.clearlooks2 a.mceResizeNW {top:0; left:0; cursor:nw-resize;}
.clearlooks2 a.mceResizeNE {top:0; right:0; cursor:ne-resize}
.clearlooks2 a.mceResizeW {top:0; left:0; height:100%; cursor:w-resize;}
.clearlooks2 a.mceResizeE {top:0; right:0; height:100%; cursor:e-resize;}
.clearlooks2 a.mceResizeS {bottom:0; left:0; width:100%; cursor:s-resize}
.clearlooks2 a.mceResizeSW {bottom:0; left:0; cursor:sw-resize;}
.clearlooks2 a.mceResizeSE {bottom:0; right:0; cursor:se-resize;}
/* Alert/Confirm */
.clearlooks2 .button {font-weight:bold; bottom:10px; width:80px; height:30px; background:url(img/button.gif); line-height:30px; vertical-align:middle; text-align:center; outline:0;}
.clearlooks2 .middle .icon {left:15px; top:35px; width:32px; height:32px;}
.clearlooks2 .alert .middle span, .clearlooks2 .confirm .middle span {background:transparent;left:60px; top:35px; width:320px; height:50px; font-weight:bold; overflow:auto; white-space:normal;}
.clearlooks2 .mceButton {font-weight:bold; bottom:10px; width:80px; height:30px; background:url(img/button.gif); line-height:30px; vertical-align:middle; text-align:center; outline:0;}
.clearlooks2 .mceMiddle .mceIcon {left:15px; top:35px; width:32px; height:32px;}
.clearlooks2 .mceAlert .mceMiddle span, .clearlooks2 .mceConfirm .mceMiddle span {background:transparent;left:60px; top:35px; width:320px; height:50px; font-weight:bold; overflow:auto; white-space:normal;}
.clearlooks2 a:hover {font-weight:bold;}
.clearlooks2 .alert .middle, .clearlooks2 .confirm .middle {background:#D6D7D5;}
.clearlooks2 .alert .ok {left:50%; top:auto; margin-left: -40px;}
.clearlooks2 .alert .icon {background:url(img/alert.gif);}
.clearlooks2 .confirm .ok {left:50%; top:auto; margin-left: -90px;}
.clearlooks2 .confirm .cancel {left:50%; top:auto;}
.clearlooks2 .confirm .icon {background:url(img/confirm.gif);}
.clearlooks2 .mceAlert .mceMiddle, .clearlooks2 .mceConfirm .mceMiddle {background:#D6D7D5;}
.clearlooks2 .mceAlert .mceOk {left:50%; top:auto; margin-left: -40px;}
.clearlooks2 .mceAlert .mceIcon {background:url(img/alert.gif);}
.clearlooks2 .mceConfirm .mceOk {left:50%; top:auto; margin-left: -90px;}
.clearlooks2 .mceConfirm .mceCancel {left:50%; top:auto;}
.clearlooks2 .mceConfirm .mceIcon {background:url(img/confirm.gif);}

470
wp-includes/js/tinymce/plugins/inlinepopups/template.htm
View File

@ -8,320 +8,320 @@
<div class="mceEditor">
<div class="clearlooks2" style="width:400px; height:100px; left:10px;">
<div class="wrapper">
<div class="top">
<div class="left"></div>
<div class="center"></div>
<div class="right"></div>
<div class="mceWrapper">
<div class="mceTop">
<div class="mceLeft"></div>
<div class="mceCenter"></div>
<div class="mceRight"></div>
<span>Blured</span>
</div>
<div class="middle">
<div class="left"></div>
<div class="mceMiddle">
<div class="mceLeft"></div>
<span>Content</span>
<div class="right"></div>
<div class="mceRight"></div>
</div>
<div class="bottom">
<div class="left"></div>
<div class="center"></div>
<div class="right"></div>
<div class="mceBottom">
<div class="mceLeft"></div>
<div class="mceCenter"></div>
<div class="mceRight"></div>
<span>Statusbar text.</span>
</div>
<a class="move" href="#"></a>
<a class="min" href="#"></a>
<a class="max" href="#"></a>
<a class="med" href="#"></a>
<a class="close" href="#"></a>
<a class="resize resize-n" href="#"></a>
<a class="resize resize-s" href="#"></a>
<a class="resize resize-w" href="#"></a>
<a class="resize resize-e" href="#"></a>
<a class="resize resize-nw" href="#"></a>
<a class="resize resize-ne" href="#"></a>
<a class="resize resize-sw" href="#"></a>
<a class="resize resize-se" href="#"></a>
<a class="mceMove" href="#"></a>
<a class="mceMin" href="#"></a>
<a class="mceMax" href="#"></a>
<a class="mceMed" href="#"></a>
<a class="mceClose" href="#"></a>
<a class="mceResize mceResizeN" href="#"></a>
<a class="mceResize mceResizeS" href="#"></a>
<a class="mceResize mceResizeW" href="#"></a>
<a class="mceResize mceResizeE" href="#"></a>
<a class="mceResize mceResizeNW" href="#"></a>
<a class="mceResize mceResizeNE" href="#"></a>
<a class="mceResize mceResizeSW" href="#"></a>
<a class="mceResize mceResizeSE" href="#"></a>
</div>
</div>
<div class="clearlooks2" style="width:400px; height:100px; left:420px;">
<div class="wrapper movable focus">
<div class="top">
<div class="left"></div>
<div class="center"></div>
<div class="right"></div>
<div class="mceWrapper mceMovable mceFocus">
<div class="mceTop">
<div class="mceLeft"></div>
<div class="mceCenter"></div>
<div class="mceRight"></div>
<span>Focused</span>
</div>
<div class="middle">
<div class="left"></div>
<div class="mceMiddle">
<div class="mceLeft"></div>
<span>Content</span>
<div class="right"></div>
<div class="mceRight"></div>
</div>
<div class="bottom">
<div class="left"></div>
<div class="center"></div>
<div class="right"></div>
<div class="mceBottom">
<div class="mceLeft"></div>
<div class="mceCenter"></div>
<div class="mceRight"></div>
<span>Statusbar text.</span>
</div>
<a class="move" href="#"></a>
<a class="min" href="#"></a>
<a class="max" href="#"></a>
<a class="med" href="#"></a>
<a class="close" href="#"></a>
<a class="resize resize-n" href="#"></a>
<a class="resize resize-s" href="#"></a>
<a class="resize resize-w" href="#"></a>
<a class="resize resize-e" href="#"></a>
<a class="resize resize-nw" href="#"></a>
<a class="resize resize-ne" href="#"></a>
<a class="resize resize-sw" href="#"></a>
<a class="resize resize-se" href="#"></a>
<a class="mceMove" href="#"></a>
<a class="mceMin" href="#"></a>
<a class="mceMax" href="#"></a>
<a class="mceMed" href="#"></a>
<a class="mceClose" href="#"></a>
<a class="mceResize mceResizeN" href="#"></a>
<a class="mceResize mceResizeS" href="#"></a>
<a class="mceResize mceResizeW" href="#"></a>
<a class="mceResize mceResizeE" href="#"></a>
<a class="mceResize mceResizeNW" href="#"></a>
<a class="mceResize mceResizeNE" href="#"></a>
<a class="mceResize mceResizeSW" href="#"></a>
<a class="mceResize mceResizeSE" href="#"></a>
</div>
</div>
<div class="clearlooks2" style="width:400px; height:100px; left:10px; top:120px;">
<div class="wrapper movable focus statusbar">
<div class="top">
<div class="left"></div>
<div class="center"></div>
<div class="right"></div>
<div class="mceWrapper mceMovable mceFocus mceStatusbar">
<div class="mceTop">
<div class="mceLeft"></div>
<div class="mceCenter"></div>
<div class="mceRight"></div>
<span>Statusbar</span>
</div>
<div class="middle">
<div class="left"></div>
<div class="mceMiddle">
<div class="mceLeft"></div>
<span>Content</span>
<div class="right"></div>
<div class="mceRight"></div>
</div>
<div class="bottom">
<div class="left"></div>
<div class="center"></div>
<div class="right"></div>
<div class="mceBottom">
<div class="mceLeft"></div>
<div class="mceCenter"></div>
<div class="mceRight"></div>
<span>Statusbar text.</span>
</div>
<a class="move" href="#"></a>
<a class="min" href="#"></a>
<a class="max" href="#"></a>
<a class="med" href="#"></a>
<a class="close" href="#"></a>
<a class="resize resize-n" href="#"></a>
<a class="resize resize-s" href="#"></a>
<a class="resize resize-w" href="#"></a>
<a class="resize resize-e" href="#"></a>
<a class="resize resize-nw" href="#"></a>
<a class="resize resize-ne" href="#"></a>
<a class="resize resize-sw" href="#"></a>
<a class="resize resize-se" href="#"></a>
<a class="mceMove" href="#"></a>
<a class="mceMin" href="#"></a>
<a class="mceMax" href="#"></a>
<a class="mceMed" href="#"></a>
<a class="mceClose" href="#"></a>
<a class="mceResize mceResizeN" href="#"></a>
<a class="mceResize mceResizeS" href="#"></a>
<a class="mceResize mceResizeW" href="#"></a>
<a class="mceResize mceResizeE" href="#"></a>
<a class="mceResize mceResizeNW" href="#"></a>
<a class="mceResize mceResizeNE" href="#"></a>
<a class="mceResize mceResizeSW" href="#"></a>
<a class="mceResize mceResizeSE" href="#"></a>
</div>
</div>
<div class="clearlooks2" style="width:400px; height:100px; left:420px; top:120px;">
<div class="wrapper movable focus statusbar resizable">
<div class="top">
<div class="left"></div>
<div class="center"></div>
<div class="right"></div>
<div class="mceWrapper mceMovable mceFocus mceStatusbar mceResizable">
<div class="mceTop">
<div class="mceLeft"></div>
<div class="mceCenter"></div>
<div class="mceRight"></div>
<span>Statusbar, Resizable</span>
</div>
<div class="middle">
<div class="left"></div>
<div class="mceMiddle">
<div class="mceLeft"></div>
<span>Content</span>
<div class="right"></div>
<div class="mceRight"></div>
</div>
<div class="bottom">
<div class="left"></div>
<div class="center"></div>
<div class="right"></div>
<div class="mceBottom">
<div class="mceLeft"></div>
<div class="mceCenter"></div>
<div class="mceRight"></div>
<span>Statusbar text.</span>
</div>
<a class="move" href="#"></a>
<a class="min" href="#"></a>
<a class="max" href="#"></a>
<a class="med" href="#"></a>
<a class="close" href="#"></a>
<a class="resize resize-n" href="#"></a>
<a class="resize resize-s" href="#"></a>
<a class="resize resize-w" href="#"></a>
<a class="resize resize-e" href="#"></a>
<a class="resize resize-nw" href="#"></a>
<a class="resize resize-ne" href="#"></a>
<a class="resize resize-sw" href="#"></a>
<a class="resize resize-se" href="#"></a>
<a class="mceMove" href="#"></a>
<a class="mceMin" href="#"></a>
<a class="mceMax" href="#"></a>
<a class="mceMed" href="#"></a>
<a class="mceClose" href="#"></a>
<a class="mceResize mceResizeN" href="#"></a>
<a class="mceResize mceResizeS" href="#"></a>
<a class="mceResize mceResizeW" href="#"></a>
<a class="mceResize mceResizeE" href="#"></a>
<a class="mceResize mceResizeNW" href="#"></a>
<a class="mceResize mceResizeNE" href="#"></a>
<a class="mceResize mceResizeSW" href="#"></a>
<a class="mceResize mceResizeSE" href="#"></a>
</div>
</div>
<div class="clearlooks2" style="width:400px; height:100px; left:10px; top:230px;">
<div class="wrapper movable focus resizable maximizable">
<div class="top">
<div class="left"></div>
<div class="center"></div>
<div class="right"></div>
<div class="mceWrapper mceMovable mceFocus mceResizable mceMaximizable">
<div class="mceTop">
<div class="mceLeft"></div>
<div class="mceCenter"></div>
<div class="mceRight"></div>
<span>Resizable, Maximizable</span>
</div>
<div class="middle">
<div class="left"></div>
<div class="mceMiddle">
<div class="mceLeft"></div>
<span>Content</span>
<div class="right"></div>
<div class="mceRight"></div>
</div>
<div class="bottom">
<div class="left"></div>
<div class="center"></div>
<div class="right"></div>
<div class="mceBottom">
<div class="mceLeft"></div>
<div class="mceCenter"></div>
<div class="mceRight"></div>
<span>Statusbar text.</span>
</div>
<a class="move" href="#"></a>
<a class="min" href="#"></a>
<a class="max" href="#"></a>
<a class="med" href="#"></a>
<a class="close" href="#"></a>
<a class="resize resize-n" href="#"></a>
<a class="resize resize-s" href="#"></a>
<a class="resize resize-w" href="#"></a>
<a class="resize resize-e" href="#"></a>
<a class="resize resize-nw" href="#"></a>
<a class="resize resize-ne" href="#"></a>
<a class="resize resize-sw" href="#"></a>
<a class="resize resize-se" href="#"></a>
<a class="mceMove" href="#"></a>
<a class="mceMin" href="#"></a>
<a class="mceMax" href="#"></a>
<a class="mceMed" href="#"></a>
<a class="mceClose" href="#"></a>
<a class="mceResize mceResizeN" href="#"></a>
<a class="mceResize mceResizeS" href="#"></a>
<a class="mceResize mceResizeW" href="#"></a>
<a class="mceResize mceResizeE" href="#"></a>
<a class="mceResize mceResizeNW" href="#"></a>
<a class="mceResize mceResizeNE" href="#"></a>
<a class="mceResize mceResizeSW" href="#"></a>
<a class="mceResize mceResizeSE" href="#"></a>
</div>
</div>
<div class="clearlooks2" style="width:400px; height:100px; left:420px; top:230px;">
<div class="wrapper movable statusbar resizable maximizable">
<div class="top">
<div class="left"></div>
<div class="center"></div>
<div class="right"></div>
<div class="mceWrapper mceMovable mceStatusbar mceResizable mceMaximizable">
<div class="mceTop">
<div class="mceLeft"></div>
<div class="mceCenter"></div>
<div class="mceRight"></div>
<span>Blurred, Maximizable, Statusbar, Resizable</span>
</div>
<div class="middle">
<div class="left"></div>
<div class="mceMiddle">
<div class="mceLeft"></div>
<span>Content</span>
<div class="right"></div>
<div class="mceRight"></div>
</div>
<div class="bottom">
<div class="left"></div>
<div class="center"></div>
<div class="right"></div>
<div class="mceBottom">
<div class="mceLeft"></div>
<div class="mceCenter"></div>
<div class="mceRight"></div>
<span>Statusbar text.</span>
</div>
<a class="move" href="#"></a>
<a class="min" href="#"></a>
<a class="max" href="#"></a>
<a class="med" href="#"></a>
<a class="close" href="#"></a>
<a class="resize resize-n" href="#"></a>
<a class="resize resize-s" href="#"></a>
<a class="resize resize-w" href="#"></a>
<a class="resize resize-e" href="#"></a>
<a class="resize resize-nw" href="#"></a>
<a class="resize resize-ne" href="#"></a>
<a class="resize resize-sw" href="#"></a>
<a class="resize resize-se" href="#"></a>
<a class="mceMove" href="#"></a>
<a class="mceMin" href="#"></a>
<a class="mceMax" href="#"></a>
<a class="mceMed" href="#"></a>
<a class="mceClose" href="#"></a>
<a class="mceResize mceResizeN" href="#"></a>
<a class="mceResize mceResizeS" href="#"></a>
<a class="mceResize mceResizeW" href="#"></a>
<a class="mceResize mceResizeE" href="#"></a>
<a class="mceResize mceResizeNW" href="#"></a>
<a class="mceResize mceResizeNE" href="#"></a>
<a class="mceResize mceResizeSW" href="#"></a>
<a class="mceResize mceResizeSE" href="#"></a>
</div>
</div>
<div class="clearlooks2" style="width:400px; height:100px; left:10px; top:340px;">
<div class="wrapper movable focus resizable maximized minimizable maximizable">
<div class="top">
<div class="left"></div>
<div class="center"></div>
<div class="right"></div>
<span>Maximized, Maximizable, Minimizable, Focused</span>
<div class="mceWrapper mceMovable mceFocus mceResizable mceMaximized mceMinimizable mceMaximizable">
<div class="mceTop">
<div class="mceLeft"></div>
<div class="mceCenter"></div>
<div class="mceRight"></div>
<span>Maximized, Maximizable, Minimizable</span>
</div>
<div class="middle">
<div class="left"></div>
<div class="mceMiddle">
<div class="mceLeft"></div>
<span>Content</span>
<div class="right"></div>
<div class="mceRight"></div>
</div>
<div class="bottom">
<div class="left"></div>
<div class="center"></div>
<div class="right"></div>
<div class="mceBottom">
<div class="mceLeft"></div>
<div class="mceCenter"></div>
<div class="mceRight"></div>
<span>Statusbar text.</span>
</div>
<a class="move" href="#"></a>
<a class="min" href="#"></a>
<a class="max" href="#"></a>
<a class="med" href="#"></a>
<a class="close" href="#"></a>
<a class="resize resize-n" href="#"></a>
<a class="resize resize-s" href="#"></a>
<a class="resize resize-w" href="#"></a>
<a class="resize resize-e" href="#"></a>
<a class="resize resize-nw" href="#"></a>
<a class="resize resize-ne" href="#"></a>
<a class="resize resize-sw" href="#"></a>
<a class="resize resize-se" href="#"></a>
<a class="mceMove" href="#"></a>
<a class="mceMin" href="#"></a>
<a class="mceMax" href="#"></a>
<a class="mceMed" href="#"></a>
<a class="mceClose" href="#"></a>
<a class="mceResize mceResizeN" href="#"></a>
<a class="mceResize mceResizeS" href="#"></a>
<a class="mceResize mceResizeW" href="#"></a>
<a class="mceResize mceResizeE" href="#"></a>
<a class="mceResize mceResizeNW" href="#"></a>
<a class="mceResize mceResizeNE" href="#"></a>
<a class="mceResize mceResizeSW" href="#"></a>
<a class="mceResize mceResizeSE" href="#"></a>
</div>
</div>
<div class="clearlooks2" style="width:400px; height:100px; left:420px; top:340px;">
<div class="wrapper movable statusbar resizable maximized minimizable maximizable">
<div class="top">
<div class="left"></div>
<div class="center"></div>
<div class="right"></div>
<span>Maximized, Maximizable, Minimizable</span>
<div class="mceWrapper mceMovable mceStatusbar mceResizable mceMaximized mceMinimizable mceMaximizable">
<div class="mceTop">
<div class="mceLeft"></div>
<div class="mceCenter"></div>
<div class="mceRight"></div>
<span>Blured</span>
</div>
<div class="middle">
<div class="left"></div>
<div class="mceMiddle">
<div class="mceLeft"></div>
<span>Content</span>
<div class="right"></div>
<div class="mceRight"></div>
</div>
<div class="bottom">
<div class="left"></div>
<div class="center"></div>
<div class="right"></div>
<div class="mceBottom">
<div class="mceLeft"></div>
<div class="mceCenter"></div>
<div class="mceRight"></div>
<span>Statusbar text.</span>
</div>
<a class="move" href="#"></a>
<a class="min" href="#"></a>
<a class="med" href="#"></a>
<a class="max" href="#"></a>
<a class="close" href="#"></a>
<a class="resize resize-n" href="#"></a>
<a class="resize resize-s" href="#"></a>
<a class="resize resize-w" href="#"></a>
<a class="resize resize-e" href="#"></a>
<a class="resize resize-nw" href="#"></a>
<a class="resize resize-ne" href="#"></a>
<a class="resize resize-sw" href="#"></a>
<a class="resize resize-se" href="#"></a>
<a class="mceMove" href="#"></a>
<a class="mceMin" href="#"></a>
<a class="mceMax" href="#"></a>
<a class="mceMed" href="#"></a>
<a class="mceClose" href="#"></a>
<a class="mceResize mceResizeN" href="#"></a>
<a class="mceResize mceResizeS" href="#"></a>
<a class="mceResize mceResizeW" href="#"></a>
<a class="mceResize mceResizeE" href="#"></a>
<a class="mceResize mceResizeNW" href="#"></a>
<a class="mceResize mceResizeNE" href="#"></a>
<a class="mceResize mceResizeSW" href="#"></a>
<a class="mceResize mceResizeSE" href="#"></a>
</div>
</div>
<div class="clearlooks2" style="width:400px; height:130px; left:10px; top:450px;">
<div class="wrapper movable focus modal alert">
<div class="top">
<div class="left"></div>
<div class="center"></div>
<div class="right"></div>
<div class="mceWrapper mceMovable mceFocus mceModal mceAlert">
<div class="mceTop">
<div class="mceLeft"></div>
<div class="mceCenter"></div>
<div class="mceRight"></div>
<span>Alert</span>
</div>
<div class="middle">
<div class="left"></div>
<div class="mceMiddle">
<div class="mceLeft"></div>
<span>
This is a very long error message. This is a very long error message.
This is a very long error message. This is a very long error message.
@ -330,33 +330,33 @@
This is a very long error message. This is a very long error message.
This is a very long error message. This is a very long error message.
</span>
<div class="right"></div>
<div class="icon"></div>
<div class="mceRight"></div>
<div class="mceIcon"></div>
</div>
<div class="bottom">
<div class="left"></div>
<div class="center"></div>
<div class="right"></div>
<div class="mceBottom">
<div class="mceLeft"></div>
<div class="mceCenter"></div>
<div class="mceRight"></div>
</div>
<a class="move" href="#"></a>
<a class="button ok" href="#">Ok</a>
<a class="close" href="#"></a>
<a class="mceMove" href="#"></a>
<a class="mceButton mceOk" href="#">Ok</a>
<a class="mceClose" href="#"></a>
</div>
</div>
<div class="clearlooks2" style="width:400px; height:130px; left:420px; top:450px;">
<div class="wrapper movable focus modal confirm">
<div class="top">
<div class="left"></div>
<div class="center"></div>
<div class="right"></div>
<div class="mceWrapper mceMovable mceFocus mceModal mceConfirm">
<div class="mceTop">
<div class="mceLeft"></div>
<div class="mceCenter"></div>
<div class="mceRight"></div>
<span>Confirm</span>
</div>
<div class="middle">
<div class="left"></div>
<div class="mceMiddle">
<div class="mceLeft"></div>
<span>
This is a very long error message. This is a very long error message.
This is a very long error message. This is a very long error message.
@ -365,20 +365,20 @@
This is a very long error message. This is a very long error message.
This is a very long error message. This is a very long error message.
</span>
<div class="right"></div>
<div class="icon"></div>
<div class="mceRight"></div>
<div class="mceIcon"></div>
</div>
<div class="bottom">
<div class="left"></div>
<div class="center"></div>
<div class="right"></div>
<div class="mceBottom">
<div class="mceLeft"></div>
<div class="mceCenter"></div>
<div class="mceRight"></div>
</div>
<a class="move" href="#"></a>
<a class="button ok" href="#">Ok</a>
<a class="button cancel" href="#">Cancel</a>
<a class="close" href="#"></a>
<a class="mceMove" href="#"></a>
<a class="mceButton mceOk" href="#">Ok</a>
<a class="mceButton mceCancel" href="#">Cancel</a>
<a class="mceClose" href="#"></a>
</div>
</div>
</div>

2
wp-includes/js/tinymce/plugins/paste/js/pasteword.js
View File

@ -16,7 +16,7 @@ function onLoadInit() {
tinyMCEPopup.resizeToInnerSize();
// Fix for endless reloading in FF
window.setTimeout('createIFrame();', 10);
window.setTimeout(createIFrame, 10);
}
function createIFrame() {

2
wp-includes/js/tinymce/plugins/safari/editor_plugin.js
View File

File diff suppressed because one or more lines are too long

87
wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js
View File

@ -21,41 +21,26 @@
t._resizeIframe(ed, tbId, 28);
}
});
// Register buttons
ed.addButton('wp_more', {
title : 'wordpress.wp_more_desc',
image : url + '/img/more.gif',
onclick : function() {
ed.execCommand('mceInsertContent', 0, moreHTML);
}
// Register commands
ed.addCommand('WP_More', function() {
ed.execCommand('mceInsertContent', 0, moreHTML);
});
ed.addButton('wp_page', {
title : 'wordpress.wp_page_desc',
image : url + '/img/page.gif',
onclick : function() {
ed.execCommand('mceInsertContent', 0, nextpageHTML);
}
ed.addCommand('WP_Page', function() {
ed.execCommand('mceInsertContent', 0, nextpageHTML);
});
ed.addButton('wp_help', {
title : 'wordpress.wp_help_desc',
image : url + '/img/help.gif',
onclick : function() {
ed.addCommand('WP_Help', function() {
ed.windowManager.open({
url : tinymce.baseURL + '/wp-mce-help.php',
width : 450,
height : 420,
inline : 1
});
}
});
ed.addButton('wp_adv', {
title : 'wordpress.wp_adv_desc',
image : url + '/img/toolbars.gif',
onclick : function() {
});
ed.addCommand('WP_Adv', function() {
var id = ed.controlManager.get(tbId).id, cm = ed.controlManager;
if (DOM.isHidden(id)) {
@ -69,7 +54,31 @@
t._resizeIframe(ed, tbId, 28);
ed.settings.wordpress_adv_hidden = 1;
}
}
});
// Register buttons
ed.addButton('wp_more', {
title : 'wordpress.wp_more_desc',
image : url + '/img/more.gif',
cmd : 'WP_More'
});
ed.addButton('wp_page', {
title : 'wordpress.wp_page_desc',
image : url + '/img/page.gif',
cmd : 'WP_Page'
});
ed.addButton('wp_help', {
title : 'wordpress.wp_help_desc',
image : url + '/img/help.gif',
cmd : 'WP_Help'
});
ed.addButton('wp_adv', {
title : 'wordpress.wp_adv_desc',
image : url + '/img/toolbars.gif',
cmd : 'WP_Adv'
});
// Add class "alignleft" or "alignright" when selecting align for images.
@ -92,6 +101,28 @@
// Add listeners to handle more break
t._handleMoreBreak(ed, url);
// Add custom shortcuts
ed.addShortcut('alt+c', ed.getLang('justifycenter_desc'), 'JustifyCenter');
ed.addShortcut('alt+r', ed.getLang('justifyright_desc'), 'JustifyRight');
ed.addShortcut('alt+l', ed.getLang('justifyleft_desc'), 'JustifyLeft');
ed.addShortcut('alt+j', ed.getLang('justifyfull_desc'), 'JustifyFull');
ed.addShortcut('alt+q', ed.getLang('blockquote_desc'), 'mceBlockQuote');
ed.addShortcut('alt+u', ed.getLang('bullist_desc'), 'InsertUnorderedList');
ed.addShortcut('alt+o', ed.getLang('numlist_desc'), 'InsertOrderedList');
ed.addShortcut('alt+k', ed.getLang('striketrough_desc'), 'Striketrough');
ed.addShortcut('alt+n', ed.getLang('spellchecker.desc'), 'mceSpellCheck');
ed.addShortcut('alt+s', ed.getLang('link_desc'), 'mceLink');
ed.addShortcut('alt+d', ed.getLang('unlink_desc'), 'unlink');
ed.addShortcut('alt+m', ed.getLang('image_desc'), 'mceImage');
ed.addShortcut('alt+g', ed.getLang('fullscreen.desc'), 'mceFullScreen');
ed.addShortcut('alt+z', ed.getLang('wp_adv_desc'), 'WP_Adv');
ed.addShortcut('alt+x', ed.getLang('help_desc'), 'WP_Help');
ed.addShortcut('alt+y', ed.getLang('wp_more_desc'), 'WP_More');
ed.addShortcut('alt+p', ed.getLang('wp_page_desc'), 'WP_Page');
},
getInfo : function() {

2
wp-includes/js/tinymce/themes/advanced/editor_template.js
View File

File diff suppressed because one or more lines are too long

BIN
wp-includes/js/tinymce/themes/advanced/skins/o2k7/img/button_bg_silver.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB

5
wp-includes/js/tinymce/themes/advanced/skins/o2k7/ui_silver.css Normal file
View File

@ -0,0 +1,5 @@
/* Silver */
.o2k7SkinSilver .mceToolbar .mceToolbarStart span, .o2k7SkinSilver .mceButton, .o2k7SkinSilver .mceSplitButton, .o2k7SkinSilver .mceSeparator, .o2k7SkinSilver .mceSplitButton span.mceOpen, .o2k7SkinSilver .mceListBox .mceOpen {background-image:url(img/button_bg_silver.png)}
.o2k7SkinSilver table, .o2k7SkinSilver .mceMenuItemTitle a {background:#eee}
.o2k7SkinSilver .mceListBox .mceText {background:#FFF}
.o2k7SkinSilver .mceExternalToolbar, .o2k7SkinSilver .mceListBox .mceText, .o2k7SkinSilver div.mceMenu, .o2k7SkinSilver table.mceLayout, .o2k7SkinSilver .mceMenuItemTitle a, .o2k7SkinSilver table.mceLayout tr.mceFirst td, .o2k7SkinSilver table.mceLayout, .o2k7SkinSilver .mceMenuItemTitle a, .o2k7SkinSilver table.mceLayout tr.mceLast td, .o2k7SkinSilver .mceIframeContainer {border-color: #bbb}

2
wp-includes/js/tinymce/tiny_mce.js vendored
View File

File diff suppressed because one or more lines are too long

51
wp-includes/js/tinymce/wp-mce-help.php
View File

@ -13,20 +13,20 @@ wp_admin_css();
?>
<style type="text/css">
body {
background-color: #eaf3ea;
background-color: #eaf3fa;
}
#wphead {
padding-top: 2px;
padding-left: 15px;
font-size: 80%;
border-top: 0;
background-color: #eaf3ea;
background-color: #eaf3fa;
}
#adminmenu {
padding-top: 2px;
padding-left: 15px;
font-size: 80%;
background-color: #eaf3ea;
background-color: #eaf3fa;
}
#user_info {
right: 5%;
@ -110,13 +110,6 @@ wp_admin_css();
</style>
<?php endif; ?>
<script type="text/javascript">
window.onkeydown = window.onkeypress = function (e) {
e = e ? e : window.event;
if ( e.keyCode == 27 && !e.shiftKey && !e.controlKey && !e.altKey ) {
window.close();
}
}
function d(id) { return document.getElementById(id); }
function flipTab(n) {
@ -160,9 +153,9 @@ wp_admin_css();
<div id="content1">
<h2><?php _e('Rich Editing Basics') ?></h2>
<p><?php _e('<em>Rich editing</em>, also called WYSIWYG for What You See Is What You Get, means your text is formatted as you type. The rich editor creates HTML code behind the scenes while you concentrate on writing. Font styles, links and images all appear approximately as they will on the internet.') ?></p>
<p><?php _e('WordPress includes a rich HTML editor that works well in most web browsers used today. It is powerful but it has limitations. Pasting text from other word processors may not give the results you expect. For best compatibility, use the "Paste as Plain Text" or "Paste from Word" buttons located on the extended (second) toolbar row.') ?></p>
<p><?php _e('While using the editor, most basic keyboard shortcuts work like in any other text editor. For example: Shift+Enter inserts line break, Ctrl+C = copy, Ctrl+X = cut, Ctrl+Z = undo, Ctrl+Y = redo, Ctrl+B = bold, Ctrl+I = italic, Ctrl+U = underline, etc. (on Mac use the Apple key instead of Ctrl).') ?></p>
<p><?php _e('If you do not like the way the rich editor works, you may turn it off in the Your Profile and Personal Options form, under Users in the admin menu.') ?></p>
<p><?php _e('WordPress includes a rich HTML editor that works well in all major web browsers used today. However editing HTML is not the same as typing text. Each web page has two major components: the structure, which is the actual HTML code and is produced by the editor as you type, and the display, that is applied to it by the currently selected WordPress theme and is defined in style.css. Furthermore WordPress is producing valid XHTML 1.0 which means that display cannot be controlled by structural elements. So inserting multiple line breaks (BR tags) after a paragraph would not produce white space on the web page. The BR tags will be stripped as invalid by the internal HTML correcting functions.') ?></p>
<p><?php _e('While using the editor, most basic keyboard shortcuts work like in any other text editor. For example: Shift+Enter inserts line break, Ctrl+C = copy, Ctrl+X = cut, Ctrl+Z = undo, Ctrl+Y = redo, Ctrl+B = bold, Ctrl+I = italic, Ctrl+U = underline, etc. (on Mac use the Apple key instead of Ctrl). See the Hotkeys tab for all available keyboard shortcuts.') ?></p>
<p><?php _e('If you do not like the way the rich editor works, you may turn it off from Your Profile submenu, under Users in the admin menu.') ?></p>
</div>
<div id="content2" class="hidden">
@ -176,18 +169,30 @@ wp_admin_css();
<div id="content3" class="hidden">
<h2><?php _e('Writing at Full Speed') ?></h2>
<p><?php _e('Rather than reaching for your mouse to click on the toolbar, use these access keys. Windows and Linux use Alt+&lt;letter>. Macintosh uses Ctrl+&lt;letter>.') ?></p>
<p><?php _e('Rather than reaching for your mouse to click on the toolbar, use these access keys. Windows and Linux use Ctrl + letter. Macintosh uses Apple + letter.') ?></p>
<table id="keys" width="100%" border="0">
<tr class="top"><th class="key center"><?php _e('Letter') ?></th><th class="left"><?php _e('Action') ?></th><th class="key center"><?php _e('Letter') ?></th><th class="left"><?php _e('Action') ?></th></tr>
<tr><th>n</th><td><?php _e('Check Spelling') ?></td><th>f</th><td class="align left"><?php _e('Align Left') ?></td></tr>
<tr><th>j</th><td><?php _e('Justify Text') ?></td><th>c</th><td class="align center"><?php _e('Align Center') ?></td></tr>
<tr><th>k</th><td><strike><?php _e('Strikethrough') ?></strike></td><th>r</th><td class="align right"><?php _e('Align Right') ?></td></tr>
<tr><th>l</th><td><b>&bull;</b> <?php _e('List') ?></td><th>a</th><td><?php _e('Insert <span class="anchor">Anchor</span>') ?></td></tr>
<tr><th>o</th><td>1. <?php _e('List') ?></td><th>s</th><td><?php _e('Unlink Anchor') ?></td></tr>
<tr><th>q</th><td>&rarr;<?php _e('Quote/Indent') ?></td><th>m</th><td><?php _e('Insert Image') ?></td></tr>
<tr><th>w</th><td>&larr;<?php _e('Unquote/Outdent') ?></td><th>t</th><td><?php _e('Insert "More" Tag') ?></td></tr>
<tr><th>u</th><td><?php _e('Undo') ?></td><th>e</th><td><?php _e('Edit HTML') ?></td></tr>
<tr><th>y</th><td><?php _e('Redo') ?></td><th>h</th><td><?php _e('Open Help') ?></td></tr>
<tr><th>c</th><td><?php _e('Copy') ?></td><th>v</th><td><?php _e('Paste') ?></td></tr>
<tr><th>a</th><td><?php _e('Select all') ?></td><th>x</th><td><?php _e('Cut') ?></td></tr>
<tr><th>z</th><td><?php _e('Undo') ?></td><th>y</th><td><?php _e('Redo') ?></td></tr>
<tr><th>b</th><td><?php _e('Bold') ?></td><th>i</th><td><?php _e('Italic') ?></td></tr>
<tr><th>u</th><td><?php _e('Underline') ?></td><th>1</th><td><?php _e('Header 1') ?></td></tr>
<tr><th>2</th><td><?php _e('Header 2') ?></td><th>3</th><td><?php _e('Header 3') ?></td></tr>
<tr><th>4</th><td><?php _e('Header 4') ?></td><th>5</th><td><?php _e('Header 5') ?></td></tr>
<tr><th>6</th><td><?php _e('Header 6') ?></td><th>9</th><td><?php _e('Address') ?></td></tr>
</table>
<p><?php _e('The following shortcuts use different access keys. Windows and Linux use Alt + letter. Macintosh uses Ctrl + letter.') ?></p>
<table id="keys" width="100%" border="0">
<tr class="top"><th class="key center"><?php _e('Letter') ?></th><th class="left"><?php _e('Action') ?></th><th class="key center"><?php _e('Letter') ?></th><th class="left"><?php _e('Action') ?></th></tr>
<tr><th>n</th><td><?php _e('Check Spelling') ?></td><th>l</th><td><?php _e('Align Left') ?></td></tr>
<tr><th>j</th><td><?php _e('Justify Text') ?></td><th>c</th><td><?php _e('Align Center') ?></td></tr>
<tr><th>k</th><td><strike><?php _e('Strikethrough') ?></strike></td><th>r</th><td><?php _e('Align Right') ?></td></tr>
<tr><th>u</th><td><b>&bull;</b> <?php _e('List') ?></td><th>s</th><td><?php _e('Insert link') ?></td></tr>
<tr><th>o</th><td>1. <?php _e('List') ?></td><th>d</th><td><?php _e('Remove link') ?></td></tr>
<tr><th>q</th><td><?php _e('Quote') ?></td><th>m</th><td><?php _e('Insert Image') ?></td></tr>
<tr><th>g</th><td><?php _e('Full Screen') ?></td><th>y</th><td><?php _e('Insert "More" Tag') ?></td></tr>
<tr><th>p</th><td><?php _e('Insert "Page break" tag') ?></td><th>x</th><td><?php _e('Help') ?></td></tr>
</table>
</div>

2
wp-includes/script-loader.php
View File

@ -36,7 +36,7 @@ class WP_Scripts {
$this->add( 'editor_functions', '/wp-admin/js/editor.js', false, '20080221' );
// Modify this version when tinyMCE plugins are changed.
$mce_version = apply_filters('tiny_mce_version', '20080221');
$mce_version = apply_filters('tiny_mce_version', '20080226');
$this->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_config.php', array('editor_functions'), $mce_version );
$this->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.6');