From 5e11e936ef7ccbad5a9869850ae80a7e3461a792 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Tue, 27 Oct 2009 00:23:58 +0000 Subject: [PATCH] PressThis: fix TinyMCE config and IE6 css "hasLayout" git-svn-id: https://develop.svn.wordpress.org/trunk@12112 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/css/press-this.css | 2 +- wp-admin/css/press-this.dev.css | 6 +++++- wp-admin/press-this.php | 1 - .../plugins/wordpress/editor_plugin.dev.js | 16 +++++++++++----- .../plugins/wordpress/editor_plugin.js | 2 +- .../plugins/wpeditimage/editor_plugin.dev.js | 1 + .../plugins/wpeditimage/editor_plugin.js | 2 +- .../plugins/wpgallery/editor_plugin.dev.js | 1 + .../plugins/wpgallery/editor_plugin.js | 2 +- wp-includes/js/tinymce/wp-tinymce.js | 6 +++--- wp-includes/js/tinymce/wp-tinymce.js.gz | Bin 80083 -> 80101 bytes wp-includes/version.php | 2 +- 12 files changed, 26 insertions(+), 15 deletions(-) diff --git a/wp-admin/css/press-this.css b/wp-admin/css/press-this.css index e18d372507..46590f3cd3 100644 --- a/wp-admin/css/press-this.css +++ b/wp-admin/css/press-this.css @@ -1 +1 @@ -body{font:13px "Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;color:#333;margin:0;padding:0;min-width:675px;min-height:400px;}img{border:none;}#wphead{border-top:none;padding-top:4px;background:#444!important;}.tagchecklist span a{background:transparent url(../images/xit.gif) no-repeat 0 0;}#poststuff #edButtonPreview,#poststuff #edButtonHTML{-moz-border-radius:3px 3px 0 0;-webkit-border-top-right-radius:3px;-webkit-border-top-left-radius:3px;-khtml-border-top-right-radius:3px;-khtml-border-top-left-radius:3px;border-top-right-radius:3px;border-top-left-radius:3px;border-style:solid;border-width:1px;cursor:pointer;display:block;height:18px;margin:0 5px 0 0;padding:0 5px 0;font-size:10px;line-height:18px;float:left;}.howto{margin-top:2px;margin-bottom:3px;font-size:11px;font-style:italic;display:block;}input.text{outline-color:-moz-use-text-color;outline-style:none;outline-width:medium;width:100%;}#message{-moz-border-radius:6px;-khtml-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}div#poststuff{margin:10px;}div.zerosize{border:0 none;height:0;margin:0;overflow:hidden;padding:0;width:0;}#poststuff #edButtonPreview.active,#poststuff #edButtonHTML.active{display:none;}.posting{margin-right:212px;position:relative;}#side-info-column{float:right;width:200px;position:relative;right:0;}#side-info-column .sleeve{padding-top:5px;}#poststuff .inside{font-size:11px;margin:8px;}#poststuff h2,#poststuff h3{font-size:12px;font-weight:bold;line-height:1;margin:0;padding:7px 9px;}#tagsdiv-post_tag h3,#categorydiv h3{cursor:pointer;}h3.tb{text-shadow:0 1px 0 #fff;font-weight:bold;font-size:12px;margin-left:5px;}#TB_window{border:1px solid #333;-moz-border-radius:6px;-khtml-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}.postbox,.stuffbox{margin-bottom:10px;border-width:1px;border-style:solid;line-height:1;-moz-border-radius:6px;-khtml-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}.stuffbox:hover .handlediv{background:transparent url(../images/menu-bits-vs.gif) no-repeat scroll left -111px;}.handlediv{float:right;height:26px;width:23px;}#title,.tbtitle{-moz-border-radius:6px;-khtml-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;border-style:solid;border-width:1px;font-size:1.7em;outline:none;padding:3px 4px;border-color:#dfdfdf;}.tbtitle{font-size:12px;padding:3px;}#title{width:97%;}.editor-container{-moz-border-radius:6px;-khtml-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;border:1px solid #dfdfdf;background-color:#fff;}.postdivrich{padding-top:25px;position:relative;}.actions{float:right;margin:-19px 0 0;}#extra-fields .actions{margin:-15px -5px 0 0;}.actions li{float:left;list-style:none;margin-right:10px;}#extra-fields .button{margin-right:5px;padding:3px 6px;border-radius:10px;-webkit-border-radius:10px;-khtml-border-radius:10px;-moz-border-radius:10px;}.photolist{margin-top:-10px;}#photo_saving{margin:0 8px 8px;vertical-align:middle;}#img_container{background-color:#fff;}#img_container_container{overflow:auto;}#extra-fields{margin-top:10px;position:relative;}#waiting{margin-top:10px;}#extra-fields .postbox{margin-bottom:5px;}#extra-fields .titlewrap{padding:0;overflow:auto;height:100px;}#img_container a{display:block;float:left;overflow:hidden;vertical-align:center;}#img_container img,#img_container a{width:68px;height:68px;}#img_container img{border:none;background-color:#f4f4f4;cursor:pointer;}#img_container a,#img_container a:link,#img_container a:visited{border:1px solid #ccc;display:block;position:relative;}#img_container a:hover,#img_container a:active{border-color:#000;z-index:1000;border-width:2px;margin:-1px;}#embed-code{width:100%;height:98px;}#viewsite{padding:0;margin:0 0 20px 5px;font-size:10px;clear:both;}.wp-hidden-children .wp-hidden-child{display:none;}#category-adder{padding:4px 0;}#category-adder h4{margin:0 0 8px;}#category-add input{width:94%;font-family:Verdana,Arial,Helvetica,sans-serif;font-size:13px;margin:1px;padding:3px;}#category-add select{width:70%;-x-system-font:none;border-style:solid;border-width:1px;font-family:"Lucida Grande","Bitstream Vera Sans",Verdana,Arial,sans-serif;font-size:12px;height:2em;line-height:20px;padding:2px;margin:1px;vertical-align:top;}#category-add input,#category-add-sumbit{width:auto;}#categorydiv ul,#linkcategorydiv ul{list-style:none;padding:0;margin:0;}#categorydiv ul.categorychecklist ul{margin-left:18px;}#categorydiv div.tabs-panel{height:140px;overflow:auto;}ul.categorychecklist li{margin:0;padding:0;line-height:19px;}.screen-reader-text{display:none;}.tagsdiv .newtag{margin-right:5px;}.jaxtag{clear:both;margin:0;}.tagadd{margin-left:3px;}.tagchecklist{margin-top:3px;margin-bottom:1em;font-size:12px;overflow:auto;}.tagchecklist strong{position:absolute;font-size:.75em;}.tagchecklist span{margin-right:.5em;margin-left:10px;display:block;float:left;font-size:11px;line-height:1.8em;white-space:nowrap;cursor:default;}.tagchecklist span a{margin:6px 0 0 -9px;cursor:pointer;width:10px;height:10px;display:block;float:left;text-indent:-9999px;overflow:hidden;position:absolute;}#content{margin:5px 0;padding:0 5px;border:0 none;height:365px;width:97%!important;}#saving{display:inline;vertical-align:middle;}.submit input,.button,.button-primary,.button-secondary,.button-highlighted,#postcustomstuff .submit input{font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;text-decoration:none;font-size:11px!important;line-height:16px;padding:2px 8px;cursor:pointer;border-width:1px;border-style:solid;-moz-border-radius:11px;-khtml-border-radius:11px;-webkit-border-radius:11px;border-radius:11px;}.button-primary{background:#21759B url(../images/button-grad.png) repeat-x scroll left top;border-color:#21759B;color:#fff;}.ac_results{padding:0;margin:0;list-style:none;position:absolute;z-index:10000;display:none;border-width:1px;border-style:solid;}.ac_results li{padding:2px 5px;white-space:nowrap;text-align:left;}.ac_over{cursor:pointer;}.ac_match{text-decoration:underline;}#TB_ajaxContent #options{position:absolute;top:20px;right:25px;padding:5px;}#TB_ajaxContent h3{margin-bottom:.25em;}.updated{margin:10px 0;padding:0;border-width:1px;border-style:solid;width:99%;}.updated p,.error p{margin:.6em 0;padding:0 .6em;}.error a{text-decoration:underline;}.updated a{text-decoration:none;padding-bottom:2px;}#post_status{margin-left:10px;margin-bottom:1em;display:block;}#footer{height:65px;display:block;width:640px;padding:10px 0 0 60px;margin:0;position:absolute;bottom:0;font-size:12px;}#footer p{margin:0;padding:7px 0;}#footer p a{text-decoration:none;}#footer p a:hover{text-decoration:underline;}.centered{text-align:center;}.hidden{display:none;}.postbox input[type="text"],.postbox textarea,.stuffbox input[type="text"],.stuffbox textarea{border-width:1px;border-style:solid;}.taghint{color:#aaa;margin:-17px 0 0 7px;visibility:hidden;}input.newtag ~ div.taghint{visibility:visible;}input.newtag:focus ~ div.taghint{visibility:hidden;} \ No newline at end of file +body{font:13px "Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;color:#333;margin:0;padding:0;min-width:675px;min-height:400px;}img{border:none;}#wphead{border-top:none;padding-top:4px;background:#444!important;}.tagchecklist span a{background:transparent url(../images/xit.gif) no-repeat 0 0;}#poststuff #edButtonPreview,#poststuff #edButtonHTML{-moz-border-radius:3px 3px 0 0;-webkit-border-top-right-radius:3px;-webkit-border-top-left-radius:3px;-khtml-border-top-right-radius:3px;-khtml-border-top-left-radius:3px;border-top-right-radius:3px;border-top-left-radius:3px;border-style:solid;border-width:1px;cursor:pointer;display:block;height:18px;margin:0 5px 0 0;padding:0 5px 0;font-size:10px;line-height:18px;float:left;}.howto{margin-top:2px;margin-bottom:3px;font-size:11px;font-style:italic;display:block;}input.text{outline-color:-moz-use-text-color;outline-style:none;outline-width:medium;width:100%;}#message{-moz-border-radius:6px;-khtml-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}div#poststuff{margin:10px;}div.zerosize{border:0 none;height:0;margin:0;overflow:hidden;padding:0;width:0;}#poststuff #edButtonPreview.active,#poststuff #edButtonHTML.active{display:none;}.posting{margin-right:212px;position:relative;}#side-info-column{float:right;width:200px;position:relative;right:0;}#side-info-column .sleeve{padding-top:5px;}#poststuff .inside{font-size:11px;margin:8px;}#poststuff h2,#poststuff h3{font-size:12px;font-weight:bold;line-height:1;margin:0;padding:7px 9px;}#tagsdiv-post_tag h3,#categorydiv h3{cursor:pointer;}h3.tb{text-shadow:0 1px 0 #fff;font-weight:bold;font-size:12px;margin-left:5px;}#TB_window{border:1px solid #333;-moz-border-radius:6px;-khtml-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}.postbox,.stuffbox{margin-bottom:10px;border-width:1px;border-style:solid;line-height:1;-moz-border-radius:6px;-khtml-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}.stuffbox:hover .handlediv{background:transparent url(../images/menu-bits-vs.gif) no-repeat scroll left -111px;}.handlediv{float:right;height:26px;width:23px;}#title,.tbtitle{-moz-border-radius:6px;-khtml-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;border-style:solid;border-width:1px;font-size:1.7em;outline:none;padding:3px 4px;border-color:#dfdfdf;}.tbtitle{font-size:12px;padding:3px;}#title{width:97%;}.editor-container{-moz-border-radius:6px;-khtml-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;border:1px solid #dfdfdf;background-color:#fff;}.postdivrich{padding-top:25px;position:relative;}.actions{float:right;margin:-19px 0 0;}#extra-fields .actions{margin:-15px -5px 0 0;}.actions li{float:left;list-style:none;margin-right:10px;}#extra-fields .button{margin-right:5px;padding:3px 6px;border-radius:10px;-webkit-border-radius:10px;-khtml-border-radius:10px;-moz-border-radius:10px;}.photolist{margin-top:-10px;}#photo_saving{margin:0 8px 8px;vertical-align:middle;}#img_container{background-color:#fff;}#img_container_container{overflow:auto;}#extra-fields{margin-top:10px;position:relative;}#waiting{margin-top:10px;}#extra-fields .postbox{margin-bottom:5px;}#extra-fields .titlewrap{padding:0;overflow:auto;height:100px;}#img_container a{display:block;float:left;overflow:hidden;vertical-align:center;}#img_container img,#img_container a{width:68px;height:68px;}#img_container img{border:none;background-color:#f4f4f4;cursor:pointer;}#img_container a,#img_container a:link,#img_container a:visited{border:1px solid #ccc;display:block;position:relative;}#img_container a:hover,#img_container a:active{border-color:#000;z-index:1000;border-width:2px;margin:-1px;}#embed-code{width:100%;height:98px;}#viewsite{padding:0;margin:0 0 20px 5px;font-size:10px;clear:both;}.wp-hidden-children .wp-hidden-child{display:none;}#category-adder{padding:4px 0;}#category-adder h4{margin:0 0 8px;}#category-add input{width:94%;font-family:Verdana,Arial,Helvetica,sans-serif;font-size:13px;margin:1px;padding:3px;}#category-add select{width:70%;-x-system-font:none;border-style:solid;border-width:1px;font-family:"Lucida Grande","Bitstream Vera Sans",Verdana,Arial,sans-serif;font-size:12px;height:2em;line-height:20px;padding:2px;margin:1px;vertical-align:top;}#category-add input,#category-add-sumbit{width:auto;}#categorydiv ul,#linkcategorydiv ul{list-style:none;padding:0;margin:0;}#categorydiv ul.categorychecklist ul{margin-left:18px;}#categorydiv div.tabs-panel{height:140px;overflow:auto;}ul.categorychecklist li{margin:0;padding:0;line-height:19px;}.screen-reader-text{display:none;}.tagsdiv .newtag{margin-right:5px;}.jaxtag{clear:both;margin:0;}.tagadd{margin-left:3px;}.tagchecklist{margin-top:3px;margin-bottom:1em;font-size:12px;overflow:auto;}.tagchecklist strong{position:absolute;font-size:.75em;}.tagchecklist span{margin-right:.5em;margin-left:10px;display:block;float:left;font-size:11px;line-height:1.8em;white-space:nowrap;cursor:default;}.tagchecklist span a{margin:6px 0 0 -9px;cursor:pointer;width:10px;height:10px;display:block;float:left;text-indent:-9999px;overflow:hidden;position:absolute;}#content{margin:5px 0;padding:0 5px;border:0 none;height:365px;width:97%!important;}* html .postdivrich{zoom:1;}#saving{display:inline;vertical-align:middle;}.submit input,.button,.button-primary,.button-secondary,.button-highlighted,#postcustomstuff .submit input{font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;text-decoration:none;font-size:11px!important;line-height:16px;padding:2px 8px;cursor:pointer;border-width:1px;border-style:solid;-moz-border-radius:11px;-khtml-border-radius:11px;-webkit-border-radius:11px;border-radius:11px;}.button-primary{background:#21759B url(../images/button-grad.png) repeat-x scroll left top;border-color:#21759B;color:#fff;}.ac_results{padding:0;margin:0;list-style:none;position:absolute;z-index:10000;display:none;border-width:1px;border-style:solid;}.ac_results li{padding:2px 5px;white-space:nowrap;text-align:left;}.ac_over{cursor:pointer;}.ac_match{text-decoration:underline;}#TB_ajaxContent #options{position:absolute;top:20px;right:25px;padding:5px;}#TB_ajaxContent h3{margin-bottom:.25em;}.updated{margin:10px 0;padding:0;border-width:1px;border-style:solid;width:99%;}.updated p,.error p{margin:.6em 0;padding:0 .6em;}.error a{text-decoration:underline;}.updated a{text-decoration:none;padding-bottom:2px;}#post_status{margin-left:10px;margin-bottom:1em;display:block;}#footer{height:65px;display:block;width:640px;padding:10px 0 0 60px;margin:0;position:absolute;bottom:0;font-size:12px;}#footer p{margin:0;padding:7px 0;}#footer p a{text-decoration:none;}#footer p a:hover{text-decoration:underline;}.centered{text-align:center;}.hidden{display:none;}.postbox input[type="text"],.postbox textarea,.stuffbox input[type="text"],.stuffbox textarea{border-width:1px;border-style:solid;}.taghint{color:#aaa;margin:-17px 0 0 7px;visibility:hidden;}input.newtag ~ div.taghint{visibility:visible;}input.newtag:focus ~ div.taghint{visibility:hidden;} \ No newline at end of file diff --git a/wp-admin/css/press-this.dev.css b/wp-admin/css/press-this.dev.css index 7d27ce6173..4bb4d5c13e 100644 --- a/wp-admin/css/press-this.dev.css +++ b/wp-admin/css/press-this.dev.css @@ -176,7 +176,7 @@ h3.tb { } #title { -width: 97%; + width: 97%; } .editor-container { @@ -427,6 +427,10 @@ ul.categorychecklist li { width: 97% !important; } +* html .postdivrich { + zoom: 1; +} + /* Submit */ #saving { display: inline; diff --git a/wp-admin/press-this.php b/wp-admin/press-this.php index 6babd17811..7b4256b1e4 100644 --- a/wp-admin/press-this.php +++ b/wp-admin/press-this.php @@ -529,7 +529,6 @@ var photostorage = false;
-

diff --git a/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.dev.js b/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.dev.js index 2653112ca3..aece5f1ebf 100644 --- a/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.dev.js +++ b/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.dev.js @@ -6,6 +6,8 @@ var DOM = tinymce.DOM; tinymce.create('tinymce.plugins.WordPress', { + mceTout : 0, + init : function(ed, url) { var t = this, tbId = ed.getParam('wordpress_adv_toolbar', 'toolbar2'), last = 0, moreHTML, nextpageHTML; moreHTML = ''; @@ -259,7 +261,7 @@ }, _showButtons : function(n, id) { - var t = this, ed = tinyMCE.activeEditor, p1, p2, vp, DOM = tinymce.DOM, X, Y; + var ed = tinyMCE.activeEditor, p1, p2, vp, DOM = tinymce.DOM, X, Y; vp = ed.dom.getViewPort(ed.getWin()); p1 = DOM.getPos(ed.getContentAreaContainer()); @@ -274,14 +276,18 @@ 'display' : 'block' }); - t.tout = window.setTimeout( function(){ed.plugins.wordpress._hideButtons();}, 5000 ); + this.mceTout = setTimeout( function(){ed.plugins.wordpress._hideButtons();}, 5000 ); }, _hideButtons : function() { - tinymce.DOM.hide(['wp_editbtns', 'wp_gallerybtns']); + if ( document.getElementById('wp_editbtns') ) + tinymce.DOM.hide('wp_editbtns'); - if ( this.tout ) - window.clearTimeout(this.tout); + if ( document.getElementById('wp_gallerybtns') ) + tinymce.DOM.hide('wp_gallerybtns'); + + if ( this.mceTout ) + clearTimeout(this.mceTout); }, do_align : function(n, a) { diff --git a/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js b/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js index aa102c9f12..233a6fc2e5 100644 --- a/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js +++ b/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js @@ -1 +1 @@ -(function(){var a=tinymce.DOM;tinymce.create("tinymce.plugins.WordPress",{init:function(c,d){var e=this,h=c.getParam("wordpress_adv_toolbar","toolbar2"),g=0,f,b;f='';b='';if(getUserSetting("hidetb","0")=="1"){c.settings.wordpress_adv_hidden=0}c.onPostRender.add(function(){var i=c.controlManager.get(h);if(c.getParam("wordpress_adv_hidden",1)&&i){a.hide(i.id);e._resizeIframe(c,h,28)}});c.addCommand("WP_More",function(){c.execCommand("mceInsertContent",0,f)});c.addCommand("WP_Page",function(){c.execCommand("mceInsertContent",0,b)});c.addCommand("WP_Help",function(){c.windowManager.open({url:tinymce.baseURL+"/wp-mce-help.php",width:450,height:420,inline:1})});c.addCommand("WP_Adv",function(){var i=c.controlManager,j=i.get(h).id;if("undefined"==j){return}if(a.isHidden(j)){i.setActive("wp_adv",1);a.show(j);e._resizeIframe(c,h,-28);c.settings.wordpress_adv_hidden=0;setUserSetting("hidetb","1")}else{i.setActive("wp_adv",0);a.hide(j);e._resizeIframe(c,h,28);c.settings.wordpress_adv_hidden=1;setUserSetting("hidetb","0")}});c.addButton("wp_more",{title:"wordpress.wp_more_desc",image:d+"/img/more.gif",cmd:"WP_More"});c.addButton("wp_page",{title:"wordpress.wp_page_desc",image:d+"/img/page.gif",cmd:"WP_Page"});c.addButton("wp_help",{title:"wordpress.wp_help_desc",image:d+"/img/help.gif",cmd:"WP_Help"});c.addButton("wp_adv",{title:"wordpress.wp_adv_desc",image:d+"/img/toolbars.gif",cmd:"WP_Adv"});c.addButton("add_media",{title:"wordpress.add_media",image:d+"/img/media.gif",onclick:function(){tb_show("",tinymce.DOM.get("add_media").href);tinymce.DOM.setStyle(["TB_overlay","TB_window","TB_load"],"z-index","999999")}});c.addButton("add_image",{title:"wordpress.add_image",image:d+"/img/image.gif",onclick:function(){tb_show("",tinymce.DOM.get("add_image").href);tinymce.DOM.setStyle(["TB_overlay","TB_window","TB_load"],"z-index","999999")}});c.addButton("add_video",{title:"wordpress.add_video",image:d+"/img/video.gif",onclick:function(){tb_show("",tinymce.DOM.get("add_video").href);tinymce.DOM.setStyle(["TB_overlay","TB_window","TB_load"],"z-index","999999")}});c.addButton("add_audio",{title:"wordpress.add_audio",image:d+"/img/audio.gif",onclick:function(){tb_show("",tinymce.DOM.get("add_audio").href);tinymce.DOM.setStyle(["TB_overlay","TB_window","TB_load"],"z-index","999999")}});c.onBeforeExecCommand.add(function(i,l,k,m){var j=tinymce.DOM;if("mceFullScreen"!=l){return}if("mce_fullscreen"!=i.id&&j.get("add_audio")&&j.get("add_video")&&j.get("add_image")&&j.get("add_media")){i.settings.theme_advanced_buttons1+=",|,add_image,add_video,add_audio,add_media"}});c.addCommand("JustifyLeft",function(){var i=c.selection.getNode();if(i.nodeName!="IMG"){c.editorCommands.mceJustify("JustifyLeft","left")}else{c.plugins.wordpress.do_align(i,"alignleft")}});c.addCommand("JustifyRight",function(){var i=c.selection.getNode();if(i.nodeName!="IMG"){c.editorCommands.mceJustify("JustifyRight","right")}else{c.plugins.wordpress.do_align(i,"alignright")}});c.addCommand("JustifyCenter",function(){var k=c.selection.getNode(),j=c.dom.getParent(k,"p"),i=c.dom.getParent(k,"dl");if(k.nodeName=="IMG"&&(j||i)){c.plugins.wordpress.do_align(k,"aligncenter")}else{c.editorCommands.mceJustify("JustifyCenter","center")}});if("undefined"!=typeof wpWordCount){c.onKeyUp.add(function(i,j){if(j.keyCode==g){return}if(13==j.keyCode||8==g||46==g){wpWordCount.wc(i.getContent({format:"raw"}))}g=j.keyCode})}c.onSaveContent.add(function(i,j){if(typeof(switchEditors)=="object"){if(i.isHidden()){j.content=j.element.value}else{j.content=switchEditors.pre_wpautop(j.content)}}});c.onBeforeSetContent.add(function(i,j){j.content=e._setEmbed(j.content)});c.onPostProcess.add(function(i,j){if(j.get){j.content=e._getEmbed(j.content)}});e._handleMoreBreak(c,d);c.addShortcut("alt+shift+c",c.getLang("justifycenter_desc"),"JustifyCenter");c.addShortcut("alt+shift+r",c.getLang("justifyright_desc"),"JustifyRight");c.addShortcut("alt+shift+l",c.getLang("justifyleft_desc"),"JustifyLeft");c.addShortcut("alt+shift+j",c.getLang("justifyfull_desc"),"JustifyFull");c.addShortcut("alt+shift+q",c.getLang("blockquote_desc"),"mceBlockQuote");c.addShortcut("alt+shift+u",c.getLang("bullist_desc"),"InsertUnorderedList");c.addShortcut("alt+shift+o",c.getLang("numlist_desc"),"InsertOrderedList");c.addShortcut("alt+shift+d",c.getLang("striketrough_desc"),"Strikethrough");c.addShortcut("alt+shift+n",c.getLang("spellchecker.desc"),"mceSpellCheck");c.addShortcut("alt+shift+a",c.getLang("link_desc"),"mceLink");c.addShortcut("alt+shift+s",c.getLang("unlink_desc"),"unlink");c.addShortcut("alt+shift+m",c.getLang("image_desc"),"mceImage");c.addShortcut("alt+shift+g",c.getLang("fullscreen.desc"),"mceFullScreen");c.addShortcut("alt+shift+z",c.getLang("wp_adv_desc"),"WP_Adv");c.addShortcut("alt+shift+h",c.getLang("help_desc"),"WP_Help");c.addShortcut("alt+shift+t",c.getLang("wp_more_desc"),"WP_More");c.addShortcut("alt+shift+p",c.getLang("wp_page_desc"),"WP_Page");c.addShortcut("ctrl+s",c.getLang("save_desc"),function(){if("function"==typeof autosave){autosave()}});if(tinymce.isWebKit){c.addShortcut("alt+shift+b",c.getLang("bold_desc"),"Bold");c.addShortcut("alt+shift+i",c.getLang("italic_desc"),"Italic")}c.onInit.add(function(i){tinymce.dom.Event.add(i.getWin(),"scroll",function(j){i.plugins.wordpress._hideButtons()});tinymce.dom.Event.add(i.getBody(),"dragstart",function(j){i.plugins.wordpress._hideButtons()})});c.onBeforeExecCommand.add(function(i,k,j,l){i.plugins.wordpress._hideButtons()});c.onSaveContent.add(function(i,j){i.plugins.wordpress._hideButtons()})},getInfo:function(){return{longname:"WordPress Plugin",author:"WordPress",authorurl:"http://wordpress.org",infourl:"http://wordpress.org",version:"3.0"}},_setEmbed:function(b){return b.replace(/\[embed\]([\s\S]+?)\[\/embed\][\s\u00a0]*/g,function(d,c){return''+c+''})},_getEmbed:function(b){return b.replace(/]+>/g,function(c){if(c.indexOf('class="wp-oembed')!=-1){var d=c.match(/alt="([^\"]+)"/);if(d[1]){c="[embed]"+d[1]+"[/embed]"}}return c})},_showButtons:function(f,d){var k=this,g=tinyMCE.activeEditor,i,h,b,j=tinymce.DOM,e,c;b=g.dom.getViewPort(g.getWin());i=j.getPos(g.getContentAreaContainer());h=g.dom.getPos(f);e=Math.max(h.x-b.x,0)+i.x;c=Math.max(h.y-b.y,0)+i.y;j.setStyles(d,{top:c+5+"px",left:e+5+"px",display:"block"});k.tout=window.setTimeout(function(){g.plugins.wordpress._hideButtons()},5000)},_hideButtons:function(){tinymce.DOM.hide(["wp_editbtns","wp_gallerybtns"]);if(this.tout){window.clearTimeout(this.tout)}},do_align:function(j,d){var h,f,g,b,i,e=tinyMCE.activeEditor;if(/^(mceItemFlash|mceItemShockWave|mceItemWindowsMedia|mceItemQuickTime|mceItemRealMedia)$/.test(j.className)){return}h=e.dom.getParent(j,"p");f=e.dom.getParent(j,"dl");g=e.dom.getParent(j,"div");if(f&&g){b=e.dom.hasClass(f,d)?"alignnone":d;f.className=f.className.replace(/align[^ '"]+\s?/g,"");e.dom.addClass(f,b);i=(b=="aligncenter")?e.dom.addClass(g,"mceIEcenter"):e.dom.removeClass(g,"mceIEcenter")}else{if(h){b=e.dom.hasClass(j,d)?"alignnone":d;j.className=j.className.replace(/align[^ '"]+\s?/g,"");e.dom.addClass(j,b);if(b=="aligncenter"){e.dom.setStyle(h,"textAlign","center")}else{if(h.style&&h.style.textAlign=="center"){e.dom.setStyle(h,"textAlign","")}}}}e.execCommand("mceRepaint")},_resizeIframe:function(c,e,b){var d=c.getContentAreaContainer().firstChild;a.setStyle(d,"height",d.clientHeight+b);c.theme.deltaHeight+=b},_handleMoreBreak:function(c,d){var e,b;e='$1';b='';c.onInit.add(function(){c.dom.loadCSS(d+"/css/content.css")});c.onPostRender.add(function(){if(c.theme.onResolveName){c.theme.onResolveName.add(function(f,g){if(g.node.nodeName=="IMG"){if(c.dom.hasClass(g.node,"mceWPmore")){g.name="wpmore"}if(c.dom.hasClass(g.node,"mceWPnextpage")){g.name="wppage"}}})}});c.onBeforeSetContent.add(function(f,g){g.content=g.content.replace(//g,e);g.content=g.content.replace(//g,b)});c.onPostProcess.add(function(f,g){if(g.get){g.content=g.content.replace(/]+>/g,function(i){if(i.indexOf('class="mceWPmore')!==-1){var h,j=(h=i.match(/alt="(.*?)"/))?h[1]:"";i=""}if(i.indexOf('class="mceWPnextpage')!==-1){i=""}return i})}});c.onNodeChange.add(function(g,f,h){f.setActive("wp_page",h.nodeName==="IMG"&&g.dom.hasClass(h,"mceWPnextpage"));f.setActive("wp_more",h.nodeName==="IMG"&&g.dom.hasClass(h,"mceWPmore"))})}});tinymce.PluginManager.add("wordpress",tinymce.plugins.WordPress)})(); \ No newline at end of file +(function(){var a=tinymce.DOM;tinymce.create("tinymce.plugins.WordPress",{mceTout:0,init:function(c,d){var e=this,h=c.getParam("wordpress_adv_toolbar","toolbar2"),g=0,f,b;f='';b='';if(getUserSetting("hidetb","0")=="1"){c.settings.wordpress_adv_hidden=0}c.onPostRender.add(function(){var i=c.controlManager.get(h);if(c.getParam("wordpress_adv_hidden",1)&&i){a.hide(i.id);e._resizeIframe(c,h,28)}});c.addCommand("WP_More",function(){c.execCommand("mceInsertContent",0,f)});c.addCommand("WP_Page",function(){c.execCommand("mceInsertContent",0,b)});c.addCommand("WP_Help",function(){c.windowManager.open({url:tinymce.baseURL+"/wp-mce-help.php",width:450,height:420,inline:1})});c.addCommand("WP_Adv",function(){var i=c.controlManager,j=i.get(h).id;if("undefined"==j){return}if(a.isHidden(j)){i.setActive("wp_adv",1);a.show(j);e._resizeIframe(c,h,-28);c.settings.wordpress_adv_hidden=0;setUserSetting("hidetb","1")}else{i.setActive("wp_adv",0);a.hide(j);e._resizeIframe(c,h,28);c.settings.wordpress_adv_hidden=1;setUserSetting("hidetb","0")}});c.addButton("wp_more",{title:"wordpress.wp_more_desc",image:d+"/img/more.gif",cmd:"WP_More"});c.addButton("wp_page",{title:"wordpress.wp_page_desc",image:d+"/img/page.gif",cmd:"WP_Page"});c.addButton("wp_help",{title:"wordpress.wp_help_desc",image:d+"/img/help.gif",cmd:"WP_Help"});c.addButton("wp_adv",{title:"wordpress.wp_adv_desc",image:d+"/img/toolbars.gif",cmd:"WP_Adv"});c.addButton("add_media",{title:"wordpress.add_media",image:d+"/img/media.gif",onclick:function(){tb_show("",tinymce.DOM.get("add_media").href);tinymce.DOM.setStyle(["TB_overlay","TB_window","TB_load"],"z-index","999999")}});c.addButton("add_image",{title:"wordpress.add_image",image:d+"/img/image.gif",onclick:function(){tb_show("",tinymce.DOM.get("add_image").href);tinymce.DOM.setStyle(["TB_overlay","TB_window","TB_load"],"z-index","999999")}});c.addButton("add_video",{title:"wordpress.add_video",image:d+"/img/video.gif",onclick:function(){tb_show("",tinymce.DOM.get("add_video").href);tinymce.DOM.setStyle(["TB_overlay","TB_window","TB_load"],"z-index","999999")}});c.addButton("add_audio",{title:"wordpress.add_audio",image:d+"/img/audio.gif",onclick:function(){tb_show("",tinymce.DOM.get("add_audio").href);tinymce.DOM.setStyle(["TB_overlay","TB_window","TB_load"],"z-index","999999")}});c.onBeforeExecCommand.add(function(i,l,k,m){var j=tinymce.DOM;if("mceFullScreen"!=l){return}if("mce_fullscreen"!=i.id&&j.get("add_audio")&&j.get("add_video")&&j.get("add_image")&&j.get("add_media")){i.settings.theme_advanced_buttons1+=",|,add_image,add_video,add_audio,add_media"}});c.addCommand("JustifyLeft",function(){var i=c.selection.getNode();if(i.nodeName!="IMG"){c.editorCommands.mceJustify("JustifyLeft","left")}else{c.plugins.wordpress.do_align(i,"alignleft")}});c.addCommand("JustifyRight",function(){var i=c.selection.getNode();if(i.nodeName!="IMG"){c.editorCommands.mceJustify("JustifyRight","right")}else{c.plugins.wordpress.do_align(i,"alignright")}});c.addCommand("JustifyCenter",function(){var k=c.selection.getNode(),j=c.dom.getParent(k,"p"),i=c.dom.getParent(k,"dl");if(k.nodeName=="IMG"&&(j||i)){c.plugins.wordpress.do_align(k,"aligncenter")}else{c.editorCommands.mceJustify("JustifyCenter","center")}});if("undefined"!=typeof wpWordCount){c.onKeyUp.add(function(i,j){if(j.keyCode==g){return}if(13==j.keyCode||8==g||46==g){wpWordCount.wc(i.getContent({format:"raw"}))}g=j.keyCode})}c.onSaveContent.add(function(i,j){if(typeof(switchEditors)=="object"){if(i.isHidden()){j.content=j.element.value}else{j.content=switchEditors.pre_wpautop(j.content)}}});c.onBeforeSetContent.add(function(i,j){j.content=e._setEmbed(j.content)});c.onPostProcess.add(function(i,j){if(j.get){j.content=e._getEmbed(j.content)}});e._handleMoreBreak(c,d);c.addShortcut("alt+shift+c",c.getLang("justifycenter_desc"),"JustifyCenter");c.addShortcut("alt+shift+r",c.getLang("justifyright_desc"),"JustifyRight");c.addShortcut("alt+shift+l",c.getLang("justifyleft_desc"),"JustifyLeft");c.addShortcut("alt+shift+j",c.getLang("justifyfull_desc"),"JustifyFull");c.addShortcut("alt+shift+q",c.getLang("blockquote_desc"),"mceBlockQuote");c.addShortcut("alt+shift+u",c.getLang("bullist_desc"),"InsertUnorderedList");c.addShortcut("alt+shift+o",c.getLang("numlist_desc"),"InsertOrderedList");c.addShortcut("alt+shift+d",c.getLang("striketrough_desc"),"Strikethrough");c.addShortcut("alt+shift+n",c.getLang("spellchecker.desc"),"mceSpellCheck");c.addShortcut("alt+shift+a",c.getLang("link_desc"),"mceLink");c.addShortcut("alt+shift+s",c.getLang("unlink_desc"),"unlink");c.addShortcut("alt+shift+m",c.getLang("image_desc"),"mceImage");c.addShortcut("alt+shift+g",c.getLang("fullscreen.desc"),"mceFullScreen");c.addShortcut("alt+shift+z",c.getLang("wp_adv_desc"),"WP_Adv");c.addShortcut("alt+shift+h",c.getLang("help_desc"),"WP_Help");c.addShortcut("alt+shift+t",c.getLang("wp_more_desc"),"WP_More");c.addShortcut("alt+shift+p",c.getLang("wp_page_desc"),"WP_Page");c.addShortcut("ctrl+s",c.getLang("save_desc"),function(){if("function"==typeof autosave){autosave()}});if(tinymce.isWebKit){c.addShortcut("alt+shift+b",c.getLang("bold_desc"),"Bold");c.addShortcut("alt+shift+i",c.getLang("italic_desc"),"Italic")}c.onInit.add(function(i){tinymce.dom.Event.add(i.getWin(),"scroll",function(j){i.plugins.wordpress._hideButtons()});tinymce.dom.Event.add(i.getBody(),"dragstart",function(j){i.plugins.wordpress._hideButtons()})});c.onBeforeExecCommand.add(function(i,k,j,l){i.plugins.wordpress._hideButtons()});c.onSaveContent.add(function(i,j){i.plugins.wordpress._hideButtons()})},getInfo:function(){return{longname:"WordPress Plugin",author:"WordPress",authorurl:"http://wordpress.org",infourl:"http://wordpress.org",version:"3.0"}},_setEmbed:function(b){return b.replace(/\[embed\]([\s\S]+?)\[\/embed\][\s\u00a0]*/g,function(d,c){return''+c+''})},_getEmbed:function(b){return b.replace(/]+>/g,function(c){if(c.indexOf('class="wp-oembed')!=-1){var d=c.match(/alt="([^\"]+)"/);if(d[1]){c="[embed]"+d[1]+"[/embed]"}}return c})},_showButtons:function(f,d){var g=tinyMCE.activeEditor,i,h,b,j=tinymce.DOM,e,c;b=g.dom.getViewPort(g.getWin());i=j.getPos(g.getContentAreaContainer());h=g.dom.getPos(f);e=Math.max(h.x-b.x,0)+i.x;c=Math.max(h.y-b.y,0)+i.y;j.setStyles(d,{top:c+5+"px",left:e+5+"px",display:"block"});this.mceTout=setTimeout(function(){g.plugins.wordpress._hideButtons()},5000)},_hideButtons:function(){if(document.getElementById("wp_editbtns")){tinymce.DOM.hide("wp_editbtns")}if(document.getElementById("wp_gallerybtns")){tinymce.DOM.hide("wp_gallerybtns")}if(this.mceTout){clearTimeout(this.mceTout)}},do_align:function(j,d){var h,f,g,b,i,e=tinyMCE.activeEditor;if(/^(mceItemFlash|mceItemShockWave|mceItemWindowsMedia|mceItemQuickTime|mceItemRealMedia)$/.test(j.className)){return}h=e.dom.getParent(j,"p");f=e.dom.getParent(j,"dl");g=e.dom.getParent(j,"div");if(f&&g){b=e.dom.hasClass(f,d)?"alignnone":d;f.className=f.className.replace(/align[^ '"]+\s?/g,"");e.dom.addClass(f,b);i=(b=="aligncenter")?e.dom.addClass(g,"mceIEcenter"):e.dom.removeClass(g,"mceIEcenter")}else{if(h){b=e.dom.hasClass(j,d)?"alignnone":d;j.className=j.className.replace(/align[^ '"]+\s?/g,"");e.dom.addClass(j,b);if(b=="aligncenter"){e.dom.setStyle(h,"textAlign","center")}else{if(h.style&&h.style.textAlign=="center"){e.dom.setStyle(h,"textAlign","")}}}}e.execCommand("mceRepaint")},_resizeIframe:function(c,e,b){var d=c.getContentAreaContainer().firstChild;a.setStyle(d,"height",d.clientHeight+b);c.theme.deltaHeight+=b},_handleMoreBreak:function(c,d){var e,b;e='$1';b='';c.onInit.add(function(){c.dom.loadCSS(d+"/css/content.css")});c.onPostRender.add(function(){if(c.theme.onResolveName){c.theme.onResolveName.add(function(f,g){if(g.node.nodeName=="IMG"){if(c.dom.hasClass(g.node,"mceWPmore")){g.name="wpmore"}if(c.dom.hasClass(g.node,"mceWPnextpage")){g.name="wppage"}}})}});c.onBeforeSetContent.add(function(f,g){g.content=g.content.replace(//g,e);g.content=g.content.replace(//g,b)});c.onPostProcess.add(function(f,g){if(g.get){g.content=g.content.replace(/]+>/g,function(i){if(i.indexOf('class="mceWPmore')!==-1){var h,j=(h=i.match(/alt="(.*?)"/))?h[1]:"";i=""}if(i.indexOf('class="mceWPnextpage')!==-1){i=""}return i})}});c.onNodeChange.add(function(g,f,h){f.setActive("wp_page",h.nodeName==="IMG"&&g.dom.hasClass(h,"mceWPnextpage"));f.setActive("wp_more",h.nodeName==="IMG"&&g.dom.hasClass(h,"mceWPmore"))})}});tinymce.PluginManager.add("wordpress",tinymce.plugins.WordPress)})(); \ No newline at end of file diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.dev.js b/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.dev.js index b89a425346..2c92815f87 100644 --- a/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.dev.js +++ b/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.dev.js @@ -164,6 +164,7 @@ }); tinymce.dom.Event.add(editButton, 'mousedown', function(e) { + var ed = tinyMCE.activeEditor; ed.windowManager.bookmark = ed.selection.getBookmark('simple'); ed.execCommand("WP_EditImage"); }); diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js b/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js index 0e3bf63029..6cd00e94b1 100644 --- a/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js +++ b/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js @@ -1 +1 @@ -(function(){tinymce.create("tinymce.plugins.wpEditImage",{init:function(a,b){var c=this;c.url=b;c._createButtons();a.addCommand("WP_EditImage",function(){var h=a.selection.getNode(),f=tinymce.DOM.getViewPort(),g=f.h,d=(720
'+k+'
'+h+"
"})},_get_shcode:function(a){return a.replace(/
\s*]+)>\s*]+>([\s\S]+?)<\/dt>\s*]+>(.+?)<\/dd>\s*<\/dl>\s*<\/div>\s*/gi,function(g,d,j,h){var i,f,e;i=d.match(/id=['"]([^'"]+)/i);f=d.match(/class=['"]([^'"]+)/i);e=j.match(/width=['"]([0-9]+)/);i=(i&&i[1])?i[1]:"";f=(f&&f[1])?f[1]:"alignnone";e=(e&&e[1])?e[1]:"";if(!e||!h){return j}f=f.match(/align[^ '"]+/)||"alignnone";h=h.replace(/<\S[^<>]*>/gi,"").replace(/'/g,"'").replace(/"/g,""");return'[caption id="'+i+'" align="'+f+'" width="'+e+'" caption="'+h+'"]'+j+"[/caption]"})},_createButtons:function(){var b=this,a=tinyMCE.activeEditor,d=tinymce.DOM,e,c;d.remove("wp_editbtns");d.add(document.body,"div",{id:"wp_editbtns",style:"display:none;"});e=d.add("wp_editbtns","img",{src:b.url+"/img/image.png",id:"wp_editimgbtn",width:"24",height:"24",title:a.getLang("wpeditimage.edit_img")});tinymce.dom.Event.add(e,"mousedown",function(f){a.windowManager.bookmark=a.selection.getBookmark("simple");a.execCommand("WP_EditImage")});c=d.add("wp_editbtns","img",{src:b.url+"/img/delete.png",id:"wp_delimgbtn",width:"24",height:"24",title:a.getLang("wpeditimage.del_img")});tinymce.dom.Event.add(c,"mousedown",function(i){var f=tinyMCE.activeEditor,g=f.selection.getNode(),h;if(g.nodeName=="IMG"&&f.dom.getAttrib(g,"class").indexOf("mceItem")==-1){if((h=f.dom.getParent(g,"div"))&&f.dom.hasClass(h,"mceTemp")){f.dom.remove(h)}else{if((h=f.dom.getParent(g,"A"))&&h.childNodes.length==1){f.dom.remove(h)}else{f.dom.remove(g)}}f.execCommand("mceRepaint");return false}})},getInfo:function(){return{longname:"Edit Image",author:"WordPress",authorurl:"http://wordpress.org",infourl:"",version:"1.0"}}});tinymce.PluginManager.add("wpeditimage",tinymce.plugins.wpEditImage)})(); \ No newline at end of file +(function(){tinymce.create("tinymce.plugins.wpEditImage",{init:function(a,b){var c=this;c.url=b;c._createButtons();a.addCommand("WP_EditImage",function(){var h=a.selection.getNode(),f=tinymce.DOM.getViewPort(),g=f.h,d=(720
'+k+'
'+h+"
"})},_get_shcode:function(a){return a.replace(/
\s*]+)>\s*]+>([\s\S]+?)<\/dt>\s*]+>(.+?)<\/dd>\s*<\/dl>\s*<\/div>\s*/gi,function(g,d,j,h){var i,f,e;i=d.match(/id=['"]([^'"]+)/i);f=d.match(/class=['"]([^'"]+)/i);e=j.match(/width=['"]([0-9]+)/);i=(i&&i[1])?i[1]:"";f=(f&&f[1])?f[1]:"alignnone";e=(e&&e[1])?e[1]:"";if(!e||!h){return j}f=f.match(/align[^ '"]+/)||"alignnone";h=h.replace(/<\S[^<>]*>/gi,"").replace(/'/g,"'").replace(/"/g,""");return'[caption id="'+i+'" align="'+f+'" width="'+e+'" caption="'+h+'"]'+j+"[/caption]"})},_createButtons:function(){var b=this,a=tinyMCE.activeEditor,d=tinymce.DOM,e,c;d.remove("wp_editbtns");d.add(document.body,"div",{id:"wp_editbtns",style:"display:none;"});e=d.add("wp_editbtns","img",{src:b.url+"/img/image.png",id:"wp_editimgbtn",width:"24",height:"24",title:a.getLang("wpeditimage.edit_img")});tinymce.dom.Event.add(e,"mousedown",function(g){var f=tinyMCE.activeEditor;f.windowManager.bookmark=f.selection.getBookmark("simple");f.execCommand("WP_EditImage")});c=d.add("wp_editbtns","img",{src:b.url+"/img/delete.png",id:"wp_delimgbtn",width:"24",height:"24",title:a.getLang("wpeditimage.del_img")});tinymce.dom.Event.add(c,"mousedown",function(i){var f=tinyMCE.activeEditor,g=f.selection.getNode(),h;if(g.nodeName=="IMG"&&f.dom.getAttrib(g,"class").indexOf("mceItem")==-1){if((h=f.dom.getParent(g,"div"))&&f.dom.hasClass(h,"mceTemp")){f.dom.remove(h)}else{if((h=f.dom.getParent(g,"A"))&&h.childNodes.length==1){f.dom.remove(h)}else{f.dom.remove(g)}}f.execCommand("mceRepaint");return false}})},getInfo:function(){return{longname:"Edit Image",author:"WordPress",authorurl:"http://wordpress.org",infourl:"",version:"1.0"}}});tinymce.PluginManager.add("wpeditimage",tinymce.plugins.wpEditImage)})(); \ No newline at end of file diff --git a/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.dev.js b/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.dev.js index edfb1b2c74..58227704aa 100644 --- a/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.dev.js +++ b/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.dev.js @@ -82,6 +82,7 @@ }); tinymce.dom.Event.add(editButton, 'mousedown', function(e) { + var ed = tinyMCE.activeEditor; ed.windowManager.bookmark = ed.selection.getBookmark('simple'); ed.execCommand("WP_Gallery"); }); diff --git a/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js b/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js index 8c1d8dfc19..a42ef7887c 100644 --- a/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js +++ b/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js @@ -1 +1 @@ -(function(){tinymce.create("tinymce.plugins.wpGallery",{init:function(a,b){var c=this;c.url=b;c._createButtons();a.addCommand("WP_Gallery",function(){var h=a.selection.getNode(),f,e=tinymce.DOM.getViewPort(),g=e.h-80,d=(640'})},_get_gallery:function(b){function a(c,d){d=new RegExp(d+'="([^"]+)"',"g").exec(c);return d?tinymce.DOM.decode(d[1]):""}return b.replace(/(?:]*>)*(]+>)(?:<\/p>)*/g,function(e,d){var c=a(d,"class");if(c.indexOf("wpGallery")!=-1){return"

["+tinymce.trim(a(d,"title"))+"]

"}return e})},_createButtons:function(){var b=this,a=tinyMCE.activeEditor,d=tinymce.DOM,e,c;d.remove("wp_gallerybtns");d.add(document.body,"div",{id:"wp_gallerybtns",style:"display:none;"});e=d.add("wp_gallerybtns","img",{src:b.url+"/img/edit.png",id:"wp_editgallery",width:"24",height:"24",title:a.getLang("wordpress.editgallery")});tinymce.dom.Event.add(e,"mousedown",function(f){a.windowManager.bookmark=a.selection.getBookmark("simple");a.execCommand("WP_Gallery")});c=d.add("wp_gallerybtns","img",{src:b.url+"/img/delete.png",id:"wp_delgallery",width:"24",height:"24",title:a.getLang("wordpress.delgallery")});tinymce.dom.Event.add(c,"mousedown",function(h){var f=tinyMCE.activeEditor,g=f.selection.getNode();if(g.nodeName=="IMG"&&f.dom.hasClass(g,"wpGallery")){f.dom.remove(g);f.execCommand("mceRepaint");return false}})},getInfo:function(){return{longname:"Gallery Settings",author:"WordPress",authorurl:"http://wordpress.org",infourl:"",version:"1.0"}}});tinymce.PluginManager.add("wpgallery",tinymce.plugins.wpGallery)})(); \ No newline at end of file +(function(){tinymce.create("tinymce.plugins.wpGallery",{init:function(a,b){var c=this;c.url=b;c._createButtons();a.addCommand("WP_Gallery",function(){var h=a.selection.getNode(),f,e=tinymce.DOM.getViewPort(),g=e.h-80,d=(640'})},_get_gallery:function(b){function a(c,d){d=new RegExp(d+'="([^"]+)"',"g").exec(c);return d?tinymce.DOM.decode(d[1]):""}return b.replace(/(?:]*>)*(]+>)(?:<\/p>)*/g,function(e,d){var c=a(d,"class");if(c.indexOf("wpGallery")!=-1){return"

["+tinymce.trim(a(d,"title"))+"]

"}return e})},_createButtons:function(){var b=this,a=tinyMCE.activeEditor,d=tinymce.DOM,e,c;d.remove("wp_gallerybtns");d.add(document.body,"div",{id:"wp_gallerybtns",style:"display:none;"});e=d.add("wp_gallerybtns","img",{src:b.url+"/img/edit.png",id:"wp_editgallery",width:"24",height:"24",title:a.getLang("wordpress.editgallery")});tinymce.dom.Event.add(e,"mousedown",function(g){var f=tinyMCE.activeEditor;f.windowManager.bookmark=f.selection.getBookmark("simple");f.execCommand("WP_Gallery")});c=d.add("wp_gallerybtns","img",{src:b.url+"/img/delete.png",id:"wp_delgallery",width:"24",height:"24",title:a.getLang("wordpress.delgallery")});tinymce.dom.Event.add(c,"mousedown",function(h){var f=tinyMCE.activeEditor,g=f.selection.getNode();if(g.nodeName=="IMG"&&f.dom.hasClass(g,"wpGallery")){f.dom.remove(g);f.execCommand("mceRepaint");return false}})},getInfo:function(){return{longname:"Gallery Settings",author:"WordPress",authorurl:"http://wordpress.org",infourl:"",version:"1.0"}}});tinymce.PluginManager.add("wpgallery",tinymce.plugins.wpGallery)})(); \ No newline at end of file diff --git a/wp-includes/js/tinymce/wp-tinymce.js b/wp-includes/js/tinymce/wp-tinymce.js index a5b24da895..7e55c1b721 100644 --- a/wp-includes/js/tinymce/wp-tinymce.js +++ b/wp-includes/js/tinymce/wp-tinymce.js @@ -19,10 +19,10 @@ var tinymce={majorVersion:"3",minorVersion:"2.7",releaseDate:"2009-09-22",_init: // plugins/tabfocus (function(){var c=tinymce.DOM,a=tinymce.dom.Event,d=tinymce.each,b=tinymce.explode;tinymce.create("tinymce.plugins.TabFocusPlugin",{init:function(f,g){function e(i,j){if(j.keyCode===9){return a.cancel(j)}}function h(l,p){var j,m,o,n,k;function q(i){o=c.getParent(l.id,"form");n=o.elements;if(o){d(n,function(s,r){if(s.id==l.id){j=r;return false}});if(i>0){for(m=j+1;m=0;m--){if(n[m].type!="hidden"){return n[m]}}}}return null}if(p.keyCode===9){k=b(l.getParam("tab_focus",l.getParam("tabfocus_elements",":prev,:next")));if(k.length==1){k[1]=k[0];k[0]=":prev"}if(p.shiftKey){if(k[0]==":prev"){n=q(-1)}else{n=c.get(k[0])}}else{if(k[1]==":next"){n=q(1)}else{n=c.get(k[1])}}if(n){if(l=tinymce.EditorManager.get(n.id||n.name)){l.focus()}else{window.setTimeout(function(){window.focus();n.focus()},10)}return a.cancel(p)}}}f.onKeyUp.add(e);if(tinymce.isGecko){f.onKeyPress.add(h);f.onKeyDown.add(e)}else{f.onKeyDown.add(h)}f.onInit.add(function(){d(c.select("a:first,a:last",f.getContainer()),function(i){a.add(i,"focus",function(){f.focus()})})})},getInfo:function(){return{longname:"Tabfocus",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/tabfocus",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("tabfocus",tinymce.plugins.TabFocusPlugin)})(); // plugins/wordpress -(function(){var a=tinymce.DOM;tinymce.create("tinymce.plugins.WordPress",{init:function(c,d){var e=this,h=c.getParam("wordpress_adv_toolbar","toolbar2"),g=0,f,b;f='';b='';if(getUserSetting("hidetb","0")=="1"){c.settings.wordpress_adv_hidden=0}c.onPostRender.add(function(){var i=c.controlManager.get(h);if(c.getParam("wordpress_adv_hidden",1)&&i){a.hide(i.id);e._resizeIframe(c,h,28)}});c.addCommand("WP_More",function(){c.execCommand("mceInsertContent",0,f)});c.addCommand("WP_Page",function(){c.execCommand("mceInsertContent",0,b)});c.addCommand("WP_Help",function(){c.windowManager.open({url:tinymce.baseURL+"/wp-mce-help.php",width:450,height:420,inline:1})});c.addCommand("WP_Adv",function(){var i=c.controlManager,j=i.get(h).id;if("undefined"==j){return}if(a.isHidden(j)){i.setActive("wp_adv",1);a.show(j);e._resizeIframe(c,h,-28);c.settings.wordpress_adv_hidden=0;setUserSetting("hidetb","1")}else{i.setActive("wp_adv",0);a.hide(j);e._resizeIframe(c,h,28);c.settings.wordpress_adv_hidden=1;setUserSetting("hidetb","0")}});c.addButton("wp_more",{title:"wordpress.wp_more_desc",image:d+"/img/more.gif",cmd:"WP_More"});c.addButton("wp_page",{title:"wordpress.wp_page_desc",image:d+"/img/page.gif",cmd:"WP_Page"});c.addButton("wp_help",{title:"wordpress.wp_help_desc",image:d+"/img/help.gif",cmd:"WP_Help"});c.addButton("wp_adv",{title:"wordpress.wp_adv_desc",image:d+"/img/toolbars.gif",cmd:"WP_Adv"});c.addButton("add_media",{title:"wordpress.add_media",image:d+"/img/media.gif",onclick:function(){tb_show("",tinymce.DOM.get("add_media").href);tinymce.DOM.setStyle(["TB_overlay","TB_window","TB_load"],"z-index","999999")}});c.addButton("add_image",{title:"wordpress.add_image",image:d+"/img/image.gif",onclick:function(){tb_show("",tinymce.DOM.get("add_image").href);tinymce.DOM.setStyle(["TB_overlay","TB_window","TB_load"],"z-index","999999")}});c.addButton("add_video",{title:"wordpress.add_video",image:d+"/img/video.gif",onclick:function(){tb_show("",tinymce.DOM.get("add_video").href);tinymce.DOM.setStyle(["TB_overlay","TB_window","TB_load"],"z-index","999999")}});c.addButton("add_audio",{title:"wordpress.add_audio",image:d+"/img/audio.gif",onclick:function(){tb_show("",tinymce.DOM.get("add_audio").href);tinymce.DOM.setStyle(["TB_overlay","TB_window","TB_load"],"z-index","999999")}});c.onBeforeExecCommand.add(function(i,l,k,m){var j=tinymce.DOM;if("mceFullScreen"!=l){return}if("mce_fullscreen"!=i.id&&j.get("add_audio")&&j.get("add_video")&&j.get("add_image")&&j.get("add_media")){i.settings.theme_advanced_buttons1+=",|,add_image,add_video,add_audio,add_media"}});c.addCommand("JustifyLeft",function(){var i=c.selection.getNode();if(i.nodeName!="IMG"){c.editorCommands.mceJustify("JustifyLeft","left")}else{c.plugins.wordpress.do_align(i,"alignleft")}});c.addCommand("JustifyRight",function(){var i=c.selection.getNode();if(i.nodeName!="IMG"){c.editorCommands.mceJustify("JustifyRight","right")}else{c.plugins.wordpress.do_align(i,"alignright")}});c.addCommand("JustifyCenter",function(){var k=c.selection.getNode(),j=c.dom.getParent(k,"p"),i=c.dom.getParent(k,"dl");if(k.nodeName=="IMG"&&(j||i)){c.plugins.wordpress.do_align(k,"aligncenter")}else{c.editorCommands.mceJustify("JustifyCenter","center")}});if("undefined"!=typeof wpWordCount){c.onKeyUp.add(function(i,j){if(j.keyCode==g){return}if(13==j.keyCode||8==g||46==g){wpWordCount.wc(i.getContent({format:"raw"}))}g=j.keyCode})}c.onSaveContent.add(function(i,j){if(typeof(switchEditors)=="object"){if(i.isHidden()){j.content=j.element.value}else{j.content=switchEditors.pre_wpautop(j.content)}}});c.onBeforeSetContent.add(function(i,j){j.content=e._setEmbed(j.content)});c.onPostProcess.add(function(i,j){if(j.get){j.content=e._getEmbed(j.content)}});e._handleMoreBreak(c,d);c.addShortcut("alt+shift+c",c.getLang("justifycenter_desc"),"JustifyCenter");c.addShortcut("alt+shift+r",c.getLang("justifyright_desc"),"JustifyRight");c.addShortcut("alt+shift+l",c.getLang("justifyleft_desc"),"JustifyLeft");c.addShortcut("alt+shift+j",c.getLang("justifyfull_desc"),"JustifyFull");c.addShortcut("alt+shift+q",c.getLang("blockquote_desc"),"mceBlockQuote");c.addShortcut("alt+shift+u",c.getLang("bullist_desc"),"InsertUnorderedList");c.addShortcut("alt+shift+o",c.getLang("numlist_desc"),"InsertOrderedList");c.addShortcut("alt+shift+d",c.getLang("striketrough_desc"),"Strikethrough");c.addShortcut("alt+shift+n",c.getLang("spellchecker.desc"),"mceSpellCheck");c.addShortcut("alt+shift+a",c.getLang("link_desc"),"mceLink");c.addShortcut("alt+shift+s",c.getLang("unlink_desc"),"unlink");c.addShortcut("alt+shift+m",c.getLang("image_desc"),"mceImage");c.addShortcut("alt+shift+g",c.getLang("fullscreen.desc"),"mceFullScreen");c.addShortcut("alt+shift+z",c.getLang("wp_adv_desc"),"WP_Adv");c.addShortcut("alt+shift+h",c.getLang("help_desc"),"WP_Help");c.addShortcut("alt+shift+t",c.getLang("wp_more_desc"),"WP_More");c.addShortcut("alt+shift+p",c.getLang("wp_page_desc"),"WP_Page");c.addShortcut("ctrl+s",c.getLang("save_desc"),function(){if("function"==typeof autosave){autosave()}});if(tinymce.isWebKit){c.addShortcut("alt+shift+b",c.getLang("bold_desc"),"Bold");c.addShortcut("alt+shift+i",c.getLang("italic_desc"),"Italic")}c.onInit.add(function(i){tinymce.dom.Event.add(i.getWin(),"scroll",function(j){i.plugins.wordpress._hideButtons()});tinymce.dom.Event.add(i.getBody(),"dragstart",function(j){i.plugins.wordpress._hideButtons()})});c.onBeforeExecCommand.add(function(i,k,j,l){i.plugins.wordpress._hideButtons()});c.onSaveContent.add(function(i,j){i.plugins.wordpress._hideButtons()})},getInfo:function(){return{longname:"WordPress Plugin",author:"WordPress",authorurl:"http://wordpress.org",infourl:"http://wordpress.org",version:"3.0"}},_setEmbed:function(b){return b.replace(/\[embed\]([\s\S]+?)\[\/embed\][\s\u00a0]*/g,function(d,c){return''+c+''})},_getEmbed:function(b){return b.replace(/]+>/g,function(c){if(c.indexOf('class="wp-oembed')!=-1){var d=c.match(/alt="([^\"]+)"/);if(d[1]){c="[embed]"+d[1]+"[/embed]"}}return c})},_showButtons:function(f,d){var k=this,g=tinyMCE.activeEditor,i,h,b,j=tinymce.DOM,e,c;b=g.dom.getViewPort(g.getWin());i=j.getPos(g.getContentAreaContainer());h=g.dom.getPos(f);e=Math.max(h.x-b.x,0)+i.x;c=Math.max(h.y-b.y,0)+i.y;j.setStyles(d,{top:c+5+"px",left:e+5+"px",display:"block"});k.tout=window.setTimeout(function(){g.plugins.wordpress._hideButtons()},5000)},_hideButtons:function(){tinymce.DOM.hide(["wp_editbtns","wp_gallerybtns"]);if(this.tout){window.clearTimeout(this.tout)}},do_align:function(j,d){var h,f,g,b,i,e=tinyMCE.activeEditor;if(/^(mceItemFlash|mceItemShockWave|mceItemWindowsMedia|mceItemQuickTime|mceItemRealMedia)$/.test(j.className)){return}h=e.dom.getParent(j,"p");f=e.dom.getParent(j,"dl");g=e.dom.getParent(j,"div");if(f&&g){b=e.dom.hasClass(f,d)?"alignnone":d;f.className=f.className.replace(/align[^ '"]+\s?/g,"");e.dom.addClass(f,b);i=(b=="aligncenter")?e.dom.addClass(g,"mceIEcenter"):e.dom.removeClass(g,"mceIEcenter")}else{if(h){b=e.dom.hasClass(j,d)?"alignnone":d;j.className=j.className.replace(/align[^ '"]+\s?/g,"");e.dom.addClass(j,b);if(b=="aligncenter"){e.dom.setStyle(h,"textAlign","center")}else{if(h.style&&h.style.textAlign=="center"){e.dom.setStyle(h,"textAlign","")}}}}e.execCommand("mceRepaint")},_resizeIframe:function(c,e,b){var d=c.getContentAreaContainer().firstChild;a.setStyle(d,"height",d.clientHeight+b);c.theme.deltaHeight+=b},_handleMoreBreak:function(c,d){var e,b;e='$1';b='';c.onInit.add(function(){c.dom.loadCSS(d+"/css/content.css")});c.onPostRender.add(function(){if(c.theme.onResolveName){c.theme.onResolveName.add(function(f,g){if(g.node.nodeName=="IMG"){if(c.dom.hasClass(g.node,"mceWPmore")){g.name="wpmore"}if(c.dom.hasClass(g.node,"mceWPnextpage")){g.name="wppage"}}})}});c.onBeforeSetContent.add(function(f,g){g.content=g.content.replace(//g,e);g.content=g.content.replace(//g,b)});c.onPostProcess.add(function(f,g){if(g.get){g.content=g.content.replace(/]+>/g,function(i){if(i.indexOf('class="mceWPmore')!==-1){var h,j=(h=i.match(/alt="(.*?)"/))?h[1]:"";i=""}if(i.indexOf('class="mceWPnextpage')!==-1){i=""}return i})}});c.onNodeChange.add(function(g,f,h){f.setActive("wp_page",h.nodeName==="IMG"&&g.dom.hasClass(h,"mceWPnextpage"));f.setActive("wp_more",h.nodeName==="IMG"&&g.dom.hasClass(h,"mceWPmore"))})}});tinymce.PluginManager.add("wordpress",tinymce.plugins.WordPress)})(); +(function(){var a=tinymce.DOM;tinymce.create("tinymce.plugins.WordPress",{mceTout:0,init:function(c,d){var e=this,h=c.getParam("wordpress_adv_toolbar","toolbar2"),g=0,f,b;f='';b='';if(getUserSetting("hidetb","0")=="1"){c.settings.wordpress_adv_hidden=0}c.onPostRender.add(function(){var i=c.controlManager.get(h);if(c.getParam("wordpress_adv_hidden",1)&&i){a.hide(i.id);e._resizeIframe(c,h,28)}});c.addCommand("WP_More",function(){c.execCommand("mceInsertContent",0,f)});c.addCommand("WP_Page",function(){c.execCommand("mceInsertContent",0,b)});c.addCommand("WP_Help",function(){c.windowManager.open({url:tinymce.baseURL+"/wp-mce-help.php",width:450,height:420,inline:1})});c.addCommand("WP_Adv",function(){var i=c.controlManager,j=i.get(h).id;if("undefined"==j){return}if(a.isHidden(j)){i.setActive("wp_adv",1);a.show(j);e._resizeIframe(c,h,-28);c.settings.wordpress_adv_hidden=0;setUserSetting("hidetb","1")}else{i.setActive("wp_adv",0);a.hide(j);e._resizeIframe(c,h,28);c.settings.wordpress_adv_hidden=1;setUserSetting("hidetb","0")}});c.addButton("wp_more",{title:"wordpress.wp_more_desc",image:d+"/img/more.gif",cmd:"WP_More"});c.addButton("wp_page",{title:"wordpress.wp_page_desc",image:d+"/img/page.gif",cmd:"WP_Page"});c.addButton("wp_help",{title:"wordpress.wp_help_desc",image:d+"/img/help.gif",cmd:"WP_Help"});c.addButton("wp_adv",{title:"wordpress.wp_adv_desc",image:d+"/img/toolbars.gif",cmd:"WP_Adv"});c.addButton("add_media",{title:"wordpress.add_media",image:d+"/img/media.gif",onclick:function(){tb_show("",tinymce.DOM.get("add_media").href);tinymce.DOM.setStyle(["TB_overlay","TB_window","TB_load"],"z-index","999999")}});c.addButton("add_image",{title:"wordpress.add_image",image:d+"/img/image.gif",onclick:function(){tb_show("",tinymce.DOM.get("add_image").href);tinymce.DOM.setStyle(["TB_overlay","TB_window","TB_load"],"z-index","999999")}});c.addButton("add_video",{title:"wordpress.add_video",image:d+"/img/video.gif",onclick:function(){tb_show("",tinymce.DOM.get("add_video").href);tinymce.DOM.setStyle(["TB_overlay","TB_window","TB_load"],"z-index","999999")}});c.addButton("add_audio",{title:"wordpress.add_audio",image:d+"/img/audio.gif",onclick:function(){tb_show("",tinymce.DOM.get("add_audio").href);tinymce.DOM.setStyle(["TB_overlay","TB_window","TB_load"],"z-index","999999")}});c.onBeforeExecCommand.add(function(i,l,k,m){var j=tinymce.DOM;if("mceFullScreen"!=l){return}if("mce_fullscreen"!=i.id&&j.get("add_audio")&&j.get("add_video")&&j.get("add_image")&&j.get("add_media")){i.settings.theme_advanced_buttons1+=",|,add_image,add_video,add_audio,add_media"}});c.addCommand("JustifyLeft",function(){var i=c.selection.getNode();if(i.nodeName!="IMG"){c.editorCommands.mceJustify("JustifyLeft","left")}else{c.plugins.wordpress.do_align(i,"alignleft")}});c.addCommand("JustifyRight",function(){var i=c.selection.getNode();if(i.nodeName!="IMG"){c.editorCommands.mceJustify("JustifyRight","right")}else{c.plugins.wordpress.do_align(i,"alignright")}});c.addCommand("JustifyCenter",function(){var k=c.selection.getNode(),j=c.dom.getParent(k,"p"),i=c.dom.getParent(k,"dl");if(k.nodeName=="IMG"&&(j||i)){c.plugins.wordpress.do_align(k,"aligncenter")}else{c.editorCommands.mceJustify("JustifyCenter","center")}});if("undefined"!=typeof wpWordCount){c.onKeyUp.add(function(i,j){if(j.keyCode==g){return}if(13==j.keyCode||8==g||46==g){wpWordCount.wc(i.getContent({format:"raw"}))}g=j.keyCode})}c.onSaveContent.add(function(i,j){if(typeof(switchEditors)=="object"){if(i.isHidden()){j.content=j.element.value}else{j.content=switchEditors.pre_wpautop(j.content)}}});c.onBeforeSetContent.add(function(i,j){j.content=e._setEmbed(j.content)});c.onPostProcess.add(function(i,j){if(j.get){j.content=e._getEmbed(j.content)}});e._handleMoreBreak(c,d);c.addShortcut("alt+shift+c",c.getLang("justifycenter_desc"),"JustifyCenter");c.addShortcut("alt+shift+r",c.getLang("justifyright_desc"),"JustifyRight");c.addShortcut("alt+shift+l",c.getLang("justifyleft_desc"),"JustifyLeft");c.addShortcut("alt+shift+j",c.getLang("justifyfull_desc"),"JustifyFull");c.addShortcut("alt+shift+q",c.getLang("blockquote_desc"),"mceBlockQuote");c.addShortcut("alt+shift+u",c.getLang("bullist_desc"),"InsertUnorderedList");c.addShortcut("alt+shift+o",c.getLang("numlist_desc"),"InsertOrderedList");c.addShortcut("alt+shift+d",c.getLang("striketrough_desc"),"Strikethrough");c.addShortcut("alt+shift+n",c.getLang("spellchecker.desc"),"mceSpellCheck");c.addShortcut("alt+shift+a",c.getLang("link_desc"),"mceLink");c.addShortcut("alt+shift+s",c.getLang("unlink_desc"),"unlink");c.addShortcut("alt+shift+m",c.getLang("image_desc"),"mceImage");c.addShortcut("alt+shift+g",c.getLang("fullscreen.desc"),"mceFullScreen");c.addShortcut("alt+shift+z",c.getLang("wp_adv_desc"),"WP_Adv");c.addShortcut("alt+shift+h",c.getLang("help_desc"),"WP_Help");c.addShortcut("alt+shift+t",c.getLang("wp_more_desc"),"WP_More");c.addShortcut("alt+shift+p",c.getLang("wp_page_desc"),"WP_Page");c.addShortcut("ctrl+s",c.getLang("save_desc"),function(){if("function"==typeof autosave){autosave()}});if(tinymce.isWebKit){c.addShortcut("alt+shift+b",c.getLang("bold_desc"),"Bold");c.addShortcut("alt+shift+i",c.getLang("italic_desc"),"Italic")}c.onInit.add(function(i){tinymce.dom.Event.add(i.getWin(),"scroll",function(j){i.plugins.wordpress._hideButtons()});tinymce.dom.Event.add(i.getBody(),"dragstart",function(j){i.plugins.wordpress._hideButtons()})});c.onBeforeExecCommand.add(function(i,k,j,l){i.plugins.wordpress._hideButtons()});c.onSaveContent.add(function(i,j){i.plugins.wordpress._hideButtons()})},getInfo:function(){return{longname:"WordPress Plugin",author:"WordPress",authorurl:"http://wordpress.org",infourl:"http://wordpress.org",version:"3.0"}},_setEmbed:function(b){return b.replace(/\[embed\]([\s\S]+?)\[\/embed\][\s\u00a0]*/g,function(d,c){return''+c+''})},_getEmbed:function(b){return b.replace(/]+>/g,function(c){if(c.indexOf('class="wp-oembed')!=-1){var d=c.match(/alt="([^\"]+)"/);if(d[1]){c="[embed]"+d[1]+"[/embed]"}}return c})},_showButtons:function(f,d){var g=tinyMCE.activeEditor,i,h,b,j=tinymce.DOM,e,c;b=g.dom.getViewPort(g.getWin());i=j.getPos(g.getContentAreaContainer());h=g.dom.getPos(f);e=Math.max(h.x-b.x,0)+i.x;c=Math.max(h.y-b.y,0)+i.y;j.setStyles(d,{top:c+5+"px",left:e+5+"px",display:"block"});this.mceTout=setTimeout(function(){g.plugins.wordpress._hideButtons()},5000)},_hideButtons:function(){if(document.getElementById("wp_editbtns")){tinymce.DOM.hide("wp_editbtns")}if(document.getElementById("wp_gallerybtns")){tinymce.DOM.hide("wp_gallerybtns")}if(this.mceTout){clearTimeout(this.mceTout)}},do_align:function(j,d){var h,f,g,b,i,e=tinyMCE.activeEditor;if(/^(mceItemFlash|mceItemShockWave|mceItemWindowsMedia|mceItemQuickTime|mceItemRealMedia)$/.test(j.className)){return}h=e.dom.getParent(j,"p");f=e.dom.getParent(j,"dl");g=e.dom.getParent(j,"div");if(f&&g){b=e.dom.hasClass(f,d)?"alignnone":d;f.className=f.className.replace(/align[^ '"]+\s?/g,"");e.dom.addClass(f,b);i=(b=="aligncenter")?e.dom.addClass(g,"mceIEcenter"):e.dom.removeClass(g,"mceIEcenter")}else{if(h){b=e.dom.hasClass(j,d)?"alignnone":d;j.className=j.className.replace(/align[^ '"]+\s?/g,"");e.dom.addClass(j,b);if(b=="aligncenter"){e.dom.setStyle(h,"textAlign","center")}else{if(h.style&&h.style.textAlign=="center"){e.dom.setStyle(h,"textAlign","")}}}}e.execCommand("mceRepaint")},_resizeIframe:function(c,e,b){var d=c.getContentAreaContainer().firstChild;a.setStyle(d,"height",d.clientHeight+b);c.theme.deltaHeight+=b},_handleMoreBreak:function(c,d){var e,b;e='$1';b='';c.onInit.add(function(){c.dom.loadCSS(d+"/css/content.css")});c.onPostRender.add(function(){if(c.theme.onResolveName){c.theme.onResolveName.add(function(f,g){if(g.node.nodeName=="IMG"){if(c.dom.hasClass(g.node,"mceWPmore")){g.name="wpmore"}if(c.dom.hasClass(g.node,"mceWPnextpage")){g.name="wppage"}}})}});c.onBeforeSetContent.add(function(f,g){g.content=g.content.replace(//g,e);g.content=g.content.replace(//g,b)});c.onPostProcess.add(function(f,g){if(g.get){g.content=g.content.replace(/]+>/g,function(i){if(i.indexOf('class="mceWPmore')!==-1){var h,j=(h=i.match(/alt="(.*?)"/))?h[1]:"";i=""}if(i.indexOf('class="mceWPnextpage')!==-1){i=""}return i})}});c.onNodeChange.add(function(g,f,h){f.setActive("wp_page",h.nodeName==="IMG"&&g.dom.hasClass(h,"mceWPnextpage"));f.setActive("wp_more",h.nodeName==="IMG"&&g.dom.hasClass(h,"mceWPmore"))})}});tinymce.PluginManager.add("wordpress",tinymce.plugins.WordPress)})(); // plugins/wpeditimage -(function(){tinymce.create("tinymce.plugins.wpEditImage",{init:function(a,b){var c=this;c.url=b;c._createButtons();a.addCommand("WP_EditImage",function(){var h=a.selection.getNode(),f=tinymce.DOM.getViewPort(),g=f.h,d=(720
'+k+'
'+h+"
"})},_get_shcode:function(a){return a.replace(/
\s*]+)>\s*]+>([\s\S]+?)<\/dt>\s*]+>(.+?)<\/dd>\s*<\/dl>\s*<\/div>\s*/gi,function(g,d,j,h){var i,f,e;i=d.match(/id=['"]([^'"]+)/i);f=d.match(/class=['"]([^'"]+)/i);e=j.match(/width=['"]([0-9]+)/);i=(i&&i[1])?i[1]:"";f=(f&&f[1])?f[1]:"alignnone";e=(e&&e[1])?e[1]:"";if(!e||!h){return j}f=f.match(/align[^ '"]+/)||"alignnone";h=h.replace(/<\S[^<>]*>/gi,"").replace(/'/g,"'").replace(/"/g,""");return'[caption id="'+i+'" align="'+f+'" width="'+e+'" caption="'+h+'"]'+j+"[/caption]"})},_createButtons:function(){var b=this,a=tinyMCE.activeEditor,d=tinymce.DOM,e,c;d.remove("wp_editbtns");d.add(document.body,"div",{id:"wp_editbtns",style:"display:none;"});e=d.add("wp_editbtns","img",{src:b.url+"/img/image.png",id:"wp_editimgbtn",width:"24",height:"24",title:a.getLang("wpeditimage.edit_img")});tinymce.dom.Event.add(e,"mousedown",function(f){a.windowManager.bookmark=a.selection.getBookmark("simple");a.execCommand("WP_EditImage")});c=d.add("wp_editbtns","img",{src:b.url+"/img/delete.png",id:"wp_delimgbtn",width:"24",height:"24",title:a.getLang("wpeditimage.del_img")});tinymce.dom.Event.add(c,"mousedown",function(i){var f=tinyMCE.activeEditor,g=f.selection.getNode(),h;if(g.nodeName=="IMG"&&f.dom.getAttrib(g,"class").indexOf("mceItem")==-1){if((h=f.dom.getParent(g,"div"))&&f.dom.hasClass(h,"mceTemp")){f.dom.remove(h)}else{if((h=f.dom.getParent(g,"A"))&&h.childNodes.length==1){f.dom.remove(h)}else{f.dom.remove(g)}}f.execCommand("mceRepaint");return false}})},getInfo:function(){return{longname:"Edit Image",author:"WordPress",authorurl:"http://wordpress.org",infourl:"",version:"1.0"}}});tinymce.PluginManager.add("wpeditimage",tinymce.plugins.wpEditImage)})(); +(function(){tinymce.create("tinymce.plugins.wpEditImage",{init:function(a,b){var c=this;c.url=b;c._createButtons();a.addCommand("WP_EditImage",function(){var h=a.selection.getNode(),f=tinymce.DOM.getViewPort(),g=f.h,d=(720
'+k+'
'+h+"
"})},_get_shcode:function(a){return a.replace(/
\s*]+)>\s*]+>([\s\S]+?)<\/dt>\s*]+>(.+?)<\/dd>\s*<\/dl>\s*<\/div>\s*/gi,function(g,d,j,h){var i,f,e;i=d.match(/id=['"]([^'"]+)/i);f=d.match(/class=['"]([^'"]+)/i);e=j.match(/width=['"]([0-9]+)/);i=(i&&i[1])?i[1]:"";f=(f&&f[1])?f[1]:"alignnone";e=(e&&e[1])?e[1]:"";if(!e||!h){return j}f=f.match(/align[^ '"]+/)||"alignnone";h=h.replace(/<\S[^<>]*>/gi,"").replace(/'/g,"'").replace(/"/g,""");return'[caption id="'+i+'" align="'+f+'" width="'+e+'" caption="'+h+'"]'+j+"[/caption]"})},_createButtons:function(){var b=this,a=tinyMCE.activeEditor,d=tinymce.DOM,e,c;d.remove("wp_editbtns");d.add(document.body,"div",{id:"wp_editbtns",style:"display:none;"});e=d.add("wp_editbtns","img",{src:b.url+"/img/image.png",id:"wp_editimgbtn",width:"24",height:"24",title:a.getLang("wpeditimage.edit_img")});tinymce.dom.Event.add(e,"mousedown",function(g){var f=tinyMCE.activeEditor;f.windowManager.bookmark=f.selection.getBookmark("simple");f.execCommand("WP_EditImage")});c=d.add("wp_editbtns","img",{src:b.url+"/img/delete.png",id:"wp_delimgbtn",width:"24",height:"24",title:a.getLang("wpeditimage.del_img")});tinymce.dom.Event.add(c,"mousedown",function(i){var f=tinyMCE.activeEditor,g=f.selection.getNode(),h;if(g.nodeName=="IMG"&&f.dom.getAttrib(g,"class").indexOf("mceItem")==-1){if((h=f.dom.getParent(g,"div"))&&f.dom.hasClass(h,"mceTemp")){f.dom.remove(h)}else{if((h=f.dom.getParent(g,"A"))&&h.childNodes.length==1){f.dom.remove(h)}else{f.dom.remove(g)}}f.execCommand("mceRepaint");return false}})},getInfo:function(){return{longname:"Edit Image",author:"WordPress",authorurl:"http://wordpress.org",infourl:"",version:"1.0"}}});tinymce.PluginManager.add("wpeditimage",tinymce.plugins.wpEditImage)})(); // plugins/wpgallery -(function(){tinymce.create("tinymce.plugins.wpGallery",{init:function(a,b){var c=this;c.url=b;c._createButtons();a.addCommand("WP_Gallery",function(){var h=a.selection.getNode(),f,e=tinymce.DOM.getViewPort(),g=e.h-80,d=(640'})},_get_gallery:function(b){function a(c,d){d=new RegExp(d+'="([^"]+)"',"g").exec(c);return d?tinymce.DOM.decode(d[1]):""}return b.replace(/(?:]*>)*(]+>)(?:<\/p>)*/g,function(e,d){var c=a(d,"class");if(c.indexOf("wpGallery")!=-1){return"

["+tinymce.trim(a(d,"title"))+"]

"}return e})},_createButtons:function(){var b=this,a=tinyMCE.activeEditor,d=tinymce.DOM,e,c;d.remove("wp_gallerybtns");d.add(document.body,"div",{id:"wp_gallerybtns",style:"display:none;"});e=d.add("wp_gallerybtns","img",{src:b.url+"/img/edit.png",id:"wp_editgallery",width:"24",height:"24",title:a.getLang("wordpress.editgallery")});tinymce.dom.Event.add(e,"mousedown",function(f){a.windowManager.bookmark=a.selection.getBookmark("simple");a.execCommand("WP_Gallery")});c=d.add("wp_gallerybtns","img",{src:b.url+"/img/delete.png",id:"wp_delgallery",width:"24",height:"24",title:a.getLang("wordpress.delgallery")});tinymce.dom.Event.add(c,"mousedown",function(h){var f=tinyMCE.activeEditor,g=f.selection.getNode();if(g.nodeName=="IMG"&&f.dom.hasClass(g,"wpGallery")){f.dom.remove(g);f.execCommand("mceRepaint");return false}})},getInfo:function(){return{longname:"Gallery Settings",author:"WordPress",authorurl:"http://wordpress.org",infourl:"",version:"1.0"}}});tinymce.PluginManager.add("wpgallery",tinymce.plugins.wpGallery)})(); +(function(){tinymce.create("tinymce.plugins.wpGallery",{init:function(a,b){var c=this;c.url=b;c._createButtons();a.addCommand("WP_Gallery",function(){var h=a.selection.getNode(),f,e=tinymce.DOM.getViewPort(),g=e.h-80,d=(640'})},_get_gallery:function(b){function a(c,d){d=new RegExp(d+'="([^"]+)"',"g").exec(c);return d?tinymce.DOM.decode(d[1]):""}return b.replace(/(?:]*>)*(]+>)(?:<\/p>)*/g,function(e,d){var c=a(d,"class");if(c.indexOf("wpGallery")!=-1){return"

["+tinymce.trim(a(d,"title"))+"]

"}return e})},_createButtons:function(){var b=this,a=tinyMCE.activeEditor,d=tinymce.DOM,e,c;d.remove("wp_gallerybtns");d.add(document.body,"div",{id:"wp_gallerybtns",style:"display:none;"});e=d.add("wp_gallerybtns","img",{src:b.url+"/img/edit.png",id:"wp_editgallery",width:"24",height:"24",title:a.getLang("wordpress.editgallery")});tinymce.dom.Event.add(e,"mousedown",function(g){var f=tinyMCE.activeEditor;f.windowManager.bookmark=f.selection.getBookmark("simple");f.execCommand("WP_Gallery")});c=d.add("wp_gallerybtns","img",{src:b.url+"/img/delete.png",id:"wp_delgallery",width:"24",height:"24",title:a.getLang("wordpress.delgallery")});tinymce.dom.Event.add(c,"mousedown",function(h){var f=tinyMCE.activeEditor,g=f.selection.getNode();if(g.nodeName=="IMG"&&f.dom.hasClass(g,"wpGallery")){f.dom.remove(g);f.execCommand("mceRepaint");return false}})},getInfo:function(){return{longname:"Gallery Settings",author:"WordPress",authorurl:"http://wordpress.org",infourl:"",version:"1.0"}}});tinymce.PluginManager.add("wpgallery",tinymce.plugins.wpGallery)})(); // mark as loaded tinyMCEPreInit.go=function(){var b=this,a=tinymce.ScriptLoader,f=b.mceInit.language,e=b.mceInit.theme,c=b.mceInit.plugins,d=b.suffix;a.markDone(b.base+"/langs/"+f+".js");a.markDone(b.base+"/themes/"+e+"/editor_template"+d+".js");a.markDone(b.base+"/themes/"+e+"/langs/"+f+".js");a.markDone(b.base+"/themes/"+e+"/langs/"+f+"_dlg.js");tinymce.each(c.split(","),function(g){if(g&&g.charAt(0)!="-"){a.markDone(b.base+"/plugins/"+g+"/editor_plugin"+d+".js");a.markDone(b.base+"/plugins/"+g+"/langs/"+f+".js");a.markDone(b.base+"/plugins/"+g+"/langs/"+f+"_dlg.js")}})}; diff --git a/wp-includes/js/tinymce/wp-tinymce.js.gz b/wp-includes/js/tinymce/wp-tinymce.js.gz index 23721a1a4afc18c824d00d8a58dc639e42461acd..699d38dc91d9e29c8e9885ca5f3e6b0141cbd0be 100644 GIT binary patch delta 8889 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 HUkC&M#E2?U delta 8871 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 diff --git a/wp-includes/version.php b/wp-includes/version.php index 0baaf4eb5f..2b90d4c74c 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -22,7 +22,7 @@ $wp_db_version = 12060; * * @global string $tinymce_version */ -$tinymce_version = '327-1235b'; +$tinymce_version = '327-1235c'; /** * Holds the cache manifest version