From f5c253376e664c34d118bd116924ff8056d3f03a Mon Sep 17 00:00:00 2001 From: azaozz Date: Sat, 24 Oct 2009 11:43:42 +0000 Subject: [PATCH] When inserting the embed shortcode in TinyMCE replace it with a placeholder image, update the 'wordpress', 'wpeditimage' and 'wpgallery' TinyMCE plugins, fix the audio and video "From URL" tabs in the uploader popup to accept only URLs for embedding, see #10337 git-svn-id: http://svn.automattic.com/wordpress/trunk@12098 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/css/media.css | 2 +- wp-admin/css/media.dev.css | 30 +++-- wp-admin/includes/media.php | 104 ++++++++++-------- wp-admin/js/editor.dev.js | 38 +++++-- wp-admin/js/editor.js | 2 +- wp-admin/js/media-upload.dev.js | 5 +- wp-admin/js/media-upload.js | 2 +- wp-admin/press-this.php | 2 +- .../tinymce/plugins/wordpress/css/content.css | 16 ++- .../plugins/wordpress/editor_plugin.dev.js | 71 +++++++++++- .../plugins/wordpress/editor_plugin.js | 2 +- .../plugins/wordpress/img/embedded.png | Bin 0 -> 28741 bytes .../plugins/wpeditimage/editor_plugin.dev.js | 77 ++++--------- .../plugins/wpeditimage/editor_plugin.js | 2 +- .../plugins/wpgallery/editor_plugin.dev.js | 83 +++----------- .../plugins/wpgallery/editor_plugin.js | 2 +- .../advanced/skins/wp_theme/content.css | 7 -- wp-includes/js/tinymce/wp-tinymce.js | 6 +- wp-includes/js/tinymce/wp-tinymce.js.gz | Bin 79933 -> 80083 bytes wp-includes/version.php | 2 +- 20 files changed, 243 insertions(+), 210 deletions(-) create mode 100644 wp-includes/js/tinymce/plugins/wordpress/img/embedded.png diff --git a/wp-admin/css/media.css b/wp-admin/css/media.css index 2f64ed0af5..8034e004d8 100644 --- a/wp-admin/css/media.css +++ b/wp-admin/css/media.css @@ -1 +1 @@ -div#media-upload-header{margin:0;padding:0 5px;font-weight:bold;position:relative;border-bottom-width:1px;border-bottom-style:solid;height:2.5em;}body#media-upload ul#sidemenu{font-weight:normal;margin:0 5px;position:absolute;left:0;bottom:-1px;}div#media-upload-error{margin:1em;font-weight:bold;}form{margin:1em;}#search-filter{text-align:right;}th{position:relative;}.media-upload-form label.form-help,td.help{font-family:"Lucida Grande","Bitstream Vera Sans",Verdana,Arial,sans-serif;font-style:italic;font-weight:normal;}.media-upload-form p.help{margin:0;padding:0;}.media-upload-form fieldset{width:100%;border:none;text-align:justify;margin:0 0 1em 0;padding:0;}.image-align-none-label{background:url(../images/align-none.png) no-repeat center left;}.image-align-left-label{background:url(../images/align-left.png) no-repeat center left;}.image-align-center-label{background:url(../images/align-center.png) no-repeat center left;}.image-align-right-label{background:url(../images/align-right.png) no-repeat center left;}tr.image-size td{width:460px;}tr.image-size div.image-size-item{float:left;width:25%;margin:0;}#library-form .progress,#gallery-form .progress,#flash-upload-ui,.insert-gallery,.describe.startopen,.describe.startclosed{display:none;}.media-item .thumbnail{max-width:128px;max-height:128px;}thead.media-item-info tr{background-color:transparent;}thead.media-item-info th,thead.media-item-info td{border:none;margin:0;}.form-table thead.media-item-info{border:8px solid #fff;}abbr.required{text-decoration:none;border:none;}.describe label{display:inline;}.describe td{vertical-align:middle;padding:0 5px 8px 0;}.describe td.A1{width:132px;}.describe input[type="text"],.describe textarea{width:460px;border-width:1px;border-style:solid;}.describe-toggle-on,.describe-toggle-off{display:block;line-height:36px;float:right;margin-right:20px;}.describe-toggle-off{display:none;}.hidden{height:0;width:0;overflow:hidden;border:none;}#media-upload p.ml-submit{padding:1em 0;}#media-upload p.help,#media-upload label.help{font-family:"Lucida Grande","Bitstream Vera Sans",Verdana,Arial,sans-serif;font-style:italic;font-weight:normal;}#media-upload tr.image-size td.field{text-align:center;}#media-upload #media-items{border-width:1px;border-style:solid;border-bottom:none;width:623px;}#media-upload .media-item{border-bottom-width:1px;border-bottom-style:solid;min-height:36px;width:100%;}#media-upload .ui-sortable .media-item{cursor:move;}.filename{line-height:36px;padding:0 10px;overflow:hidden;}#media-upload .describe{padding:5px;width:100%;clear:both;cursor:default;}#media-upload .slidetoggle{border-top-width:1px;border-top-style:solid;}#media-upload .describe th.label{padding-top:.2em;text-align:left;min-width:120px;}#media-upload tr.align td.field{text-align:center;}#media-upload tr.image-size{margin-bottom:1em;height:3em;}#media-upload #filter{width:623px;}#media-upload #filter .subsubsub{margin:8px 0;}#filter .tablenav select{border-style:solid;border-width:1px;padding:2px;vertical-align:top;width:auto;}#media-upload .del-attachment{display:none;margin:5px 0;}.menu_order{float:right;font-size:11px;margin:10px 10px 0;}.menu_order_input{border:1px solid #ddd;font-size:10px;padding:1px;width:23px;}.ui-sortable-helper{background-color:#fff;border:1px solid #aaa;opacity:.6;filter:alpha(opacity=60);}#media-upload th.order-head{width:20%;text-align:center;}#media-upload th.actions-head{width:25%;text-align:center;}#media-upload a.wp-post-thumbnail{margin:0 20px;}#media-items a.delete{display:block;float:right;}#media-upload .widefat{width:626px;border-style:solid solid none;}.sorthelper{height:37px;width:623px;display:block;}#gallery-settings th.label{width:160px;}#gallery-settings #basic th.label{padding:5px 5px 5px 0;}#gallery-settings .title{clear:both;padding:0 0 3px;border-bottom-style:solid;border-bottom-width:1px;font-family:Georgia,"Times New Roman",Times,serif;font-size:1.6em;border-bottom-color:#DADADA;color:#5A5A5A;}h3.media-title{color:#5A5A5A;font-family:Georgia,"Times New Roman",Times,serif;font-size:1.6em;font-weight:normal;}#gallery-settings .describe td{vertical-align:middle;height:3.5em;}#gallery-settings .describe th.label{padding-top:.5em;text-align:left;}#gallery-settings .describe{padding:5px;width:615px;clear:both;cursor:default;}#gallery-settings .describe select{width:15em;border:1px solid #dfdfdf;}#gallery-settings label,#gallery-settings legend{font-size:13px;color:#464646;margin-right:15px;}#gallery-settings .align .field label{margin:0 1.5em 0 0;}#gallery-settings p.ml-submit{border-top:1px solid #dfdfdf;}#gallery-settings select#columns{width:6em;}#sort-buttons{font-size:.8em;margin:3px 25px -8px 0;text-align:right;max-width:625px;}#sort-buttons a{text-decoration:none;}#sort-buttons #asc,#sort-buttons #showall{padding-left:5px;}#sort-buttons span{margin-right:25px;} \ No newline at end of file +div#media-upload-header{margin:0;padding:0 5px;font-weight:bold;position:relative;border-bottom-width:1px;border-bottom-style:solid;height:2.5em;}body#media-upload ul#sidemenu{font-weight:normal;margin:0 5px;position:absolute;left:0;bottom:-1px;}div#media-upload-error{margin:1em;font-weight:bold;}form{margin:1em;}#search-filter{text-align:right;}th{position:relative;}.media-upload-form label.form-help,td.help{font-family:"Lucida Grande","Bitstream Vera Sans",Verdana,Arial,sans-serif;font-style:italic;font-weight:normal;}.media-upload-form p.help{margin:0;padding:0;}.media-upload-form fieldset{width:100%;border:none;text-align:justify;margin:0 0 1em 0;padding:0;}.image-align-none-label{background:url(../images/align-none.png) no-repeat center left;}.image-align-left-label{background:url(../images/align-left.png) no-repeat center left;}.image-align-center-label{background:url(../images/align-center.png) no-repeat center left;}.image-align-right-label{background:url(../images/align-right.png) no-repeat center left;}tr.image-size td{width:460px;}tr.image-size div.image-size-item{float:left;width:25%;margin:0;}#library-form .progress,#gallery-form .progress,#flash-upload-ui,.insert-gallery,.describe.startopen,.describe.startclosed{display:none;}.media-item .thumbnail{max-width:128px;max-height:128px;}thead.media-item-info tr{background-color:transparent;}thead.media-item-info th,thead.media-item-info td{border:none;margin:0;}.form-table thead.media-item-info{border:8px solid #fff;}abbr.required{text-decoration:none;border:none;}.describe label{display:inline;}.describe td{vertical-align:middle;padding:0 5px 8px 0;}.describe td.A1{width:132px;}.describe input[type="text"],.describe textarea{width:460px;border-width:1px;border-style:solid;}.describe-toggle-on,.describe-toggle-off{display:block;line-height:36px;float:right;margin-right:20px;}.describe-toggle-off{display:none;}.hidden{height:0;width:0;overflow:hidden;border:none;}#media-upload p.ml-submit{padding:1em 0;}#media-upload p.help,#media-upload label.help{font-family:"Lucida Grande","Bitstream Vera Sans",Verdana,Arial,sans-serif;font-style:italic;font-weight:normal;}#media-upload tr.image-size td.field{text-align:center;}#media-upload #media-items{border-width:1px;border-style:solid;border-bottom:none;width:623px;}#media-upload .media-item{border-bottom-width:1px;border-bottom-style:solid;min-height:36px;width:100%;}#media-upload .ui-sortable .media-item{cursor:move;}.filename{line-height:36px;padding:0 10px;overflow:hidden;}#media-upload .describe{padding:5px;width:100%;clear:both;cursor:default;}#media-upload .slidetoggle{border-top-width:1px;border-top-style:solid;}#media-upload .describe th.label{padding-top:.2em;text-align:left;min-width:120px;}#media-upload tr.align td.field{text-align:center;}#media-upload tr.image-size{margin-bottom:1em;height:3em;}#media-upload #filter{width:623px;}#media-upload #filter .subsubsub{margin:8px 0;}#filter .tablenav select{border-style:solid;border-width:1px;padding:2px;vertical-align:top;width:auto;}#media-upload .del-attachment{display:none;margin:5px 0;}.menu_order{float:right;font-size:11px;margin:10px 10px 0;}.menu_order_input{border:1px solid #ddd;font-size:10px;padding:1px;width:23px;}.ui-sortable-helper{background-color:#fff;border:1px solid #aaa;opacity:.6;filter:alpha(opacity=60);}#media-upload th.order-head{width:20%;text-align:center;}#media-upload th.actions-head{width:25%;text-align:center;}#media-upload a.wp-post-thumbnail{margin:0 20px;}#media-items a.delete{display:block;float:right;}#media-upload .widefat{width:626px;border-style:solid solid none;}.sorthelper{height:37px;width:623px;display:block;}#gallery-settings th.label{width:160px;}#gallery-settings #basic th.label{padding:5px 5px 5px 0;}#gallery-settings .title{clear:both;padding:0 0 3px;font-size:1.6em;border-bottom:1px solid #DADADA;}h3.media-title{font-size:1.6em;}h4.media-sub-title{border-bottom:1px solid #DADADA;font-size:1.3em;margin:12px;padding:0 0 3px;}#gallery-settings .title,h3.media-title,h4.media-sub-title{font-family:Georgia,"Times New Roman",Times,serif;font-weight:normal;color:#5A5A5A;}#gallery-settings .describe td{vertical-align:middle;height:3em;}#gallery-settings .describe th.label{padding-top:.5em;text-align:left;}#gallery-settings .describe{padding:5px;width:615px;clear:both;cursor:default;}#gallery-settings .describe select{width:15em;}#gallery-settings .describe select option,#gallery-settings .describe td{padding:0;}#gallery-settings label,#gallery-settings legend{font-size:13px;color:#464646;margin-right:15px;}#gallery-settings .align .field label{margin:0 1.5em 0 0;}#gallery-settings p.ml-submit{border-top:1px solid #dfdfdf;}#gallery-settings select#columns{width:6em;}#sort-buttons{font-size:.8em;margin:3px 25px -8px 0;text-align:right;max-width:625px;}#sort-buttons a{text-decoration:none;}#sort-buttons #asc,#sort-buttons #showall{padding-left:5px;}#sort-buttons span{margin-right:25px;} \ No newline at end of file diff --git a/wp-admin/css/media.dev.css b/wp-admin/css/media.dev.css index a5da2f3f17..f3c06aeb95 100644 --- a/wp-admin/css/media.dev.css +++ b/wp-admin/css/media.dev.css @@ -303,24 +303,32 @@ abbr.required { #gallery-settings .title { clear: both; padding: 0 0 3px; - border-bottom-style: solid; - border-bottom-width: 1px; - font-family: Georgia,"Times New Roman",Times,serif; font-size: 1.6em; - border-bottom-color: #DADADA; - color: #5A5A5A; + border-bottom: 1px solid #DADADA; } h3.media-title { - color: #5A5A5A; - font-family: Georgia,"Times New Roman",Times,serif; font-size: 1.6em; +} + +h4.media-sub-title { + border-bottom: 1px solid #DADADA; + font-size: 1.3em; + margin: 12px; + padding: 0 0 3px; +} + +#gallery-settings .title, +h3.media-title, +h4.media-sub-title { + font-family: Georgia,"Times New Roman",Times,serif; font-weight: normal; + color: #5A5A5A; } #gallery-settings .describe td { vertical-align: middle; - height: 3.5em; + height: 3em; } #gallery-settings .describe th.label { @@ -337,7 +345,11 @@ h3.media-title { #gallery-settings .describe select { width: 15em; - border: 1px solid #dfdfdf; +} + +#gallery-settings .describe select option, +#gallery-settings .describe td { + padding: 0; } #gallery-settings label, diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php index 281abedb3f..5d30088e30 100644 --- a/wp-admin/includes/media.php +++ b/wp-admin/includes/media.php @@ -166,7 +166,7 @@ var win = window.dialogArguments || opener || parent || top; win.send_to_editor(''); /* ]]> */ - "; } - if ( !empty($src) ) - $html = "$alt"; + $html = apply_filters('image_send_to_editor_url', $html, $src, $alt, $align); return media_send_to_editor($html); } @@ -586,12 +595,9 @@ function media_upload_audio() { $href = $_POST['insertonly']['href']; if ( !empty($href) && !strpos($href, '://') ) $href = "http://$href"; - $title = esc_attr($_POST['insertonly']['title']); - if ( empty($title) ) - $title = basename($href); - if ( !empty($title) && !empty($href) ) - $html = "$title"; - $html = apply_filters('audio_send_to_editor_url', $html, $href, $title); + + $html = '[embed]' . $href . '[/embed]'; + $html = apply_filters('audio_send_to_editor_url', $html, $href); return media_send_to_editor($html); } @@ -640,12 +646,9 @@ function media_upload_video() { $href = $_POST['insertonly']['href']; if ( !empty($href) && !strpos($href, '://') ) $href = "http://$href"; - $title = esc_attr($_POST['insertonly']['title']); - if ( empty($title) ) - $title = basename($href); - if ( !empty($title) && !empty($href) ) - $html = "$title"; - $html = apply_filters('video_send_to_editor_url', $html, $href, $title); + + $html = '[embed]' . $href . '[/embed]'; + $html = apply_filters('video_send_to_editor_url', $html, $href); return media_send_to_editor($html); } @@ -694,6 +697,7 @@ function media_upload_file() { $href = $_POST['insertonly']['href']; if ( !empty($href) && !strpos($href, '://') ) $href = "http://$href"; + $title = esc_attr($_POST['insertonly']['title']); if ( empty($title) ) $title = basename($href); @@ -1513,7 +1517,11 @@ var addExtImage = { insert : function() { var t = this, html, f = document.forms[0], cls, title = '', alt = '', caption = ''; - if ( '' == f.src.value || '' == t.width ) return false; + if ( '' != document.getElementById('embed-src').value ) + return true; + + if ( '' == f.src.value || '' == t.width ) + return false; if ( f.title.value ) { title = f.title.value.replace(/'/g, ''').replace(/"/g, '"').replace(//g, '>'); @@ -1540,6 +1548,7 @@ var addExtImage = { var win = window.dialogArguments || opener || parent || top; win.send_to_editor(html); + return false; }, resetImageData : function() { @@ -1548,8 +1557,8 @@ var addExtImage = { t.width = t.height = ''; document.getElementById('go_button').style.color = '#bbb'; if ( ! document.forms[0].src.value ) - document.getElementById('status_img').src = 'images/required.gif'; - else document.getElementById('status_img').src = 'images/no.png'; + document.getElementById('status_img').innerHTML = '*'; + else document.getElementById('status_img').innerHTML = ''; }, updateImageData : function() { @@ -1558,7 +1567,7 @@ var addExtImage = { t.width = t.preloadImg.width; t.height = t.preloadImg.height; document.getElementById('go_button').style.color = '#333'; - document.getElementById('status_img').src = 'images/yes.png'; + document.getElementById('status_img').innerHTML = ''; }, getImageData : function() { @@ -1568,7 +1577,7 @@ var addExtImage = { t.resetImageData(); return false; } - document.getElementById('status_img').src = 'images/wpspin_light.gif'; + document.getElementById('status_img').innerHTML = ''; t.preloadImg = new Image(); t.preloadImg.onload = t.updateImageData; t.preloadImg.onerror = t.resetImageData; @@ -1920,11 +1929,30 @@ function type_url_form_image() { $default_align = 'none'; return ' +

' . __('Embed a picture from a web site that supports oEmbed') . '

- + + + + + + + +
+ + + * +
+ +
+ +

' . __('Insert an image from another web site') . '

+ + + @@ -1998,14 +2026,7 @@ function type_url_form_audio() { - - - - - + - - - - - +
- required + *
- - * -
' . __('Link text, e.g. “Still Alive by Jonathan Coulton”') . '
@@ -2033,14 +2054,7 @@ function type_url_form_video() {
- - * -
' . __('Link text, e.g. “Lucy on YouTube”') . '
diff --git a/wp-admin/js/editor.dev.js b/wp-admin/js/editor.dev.js index fbdeae43c5..3e8620d47d 100644 --- a/wp-admin/js/editor.dev.js +++ b/wp-admin/js/editor.dev.js @@ -22,7 +22,7 @@ var switchEditors = { return document.getElementById(e); }, - pre_wpautop : function(content) { + _wp_Nop : function(content) { var blocklist1, blocklist2; // Protect pre|script tags @@ -79,7 +79,6 @@ var switchEditors = { content = content.replace(//g, '\n'); content = content.replace(/\s*/g, '

 

\n\n'); - // Hope. return content; }, @@ -104,14 +103,17 @@ var switchEditors = { edCloseAllTags(); // :-( qt.style.display = 'none'; + ta.style.color = '#FFF'; ta.value = this.wpautop(ta.value); - if ( ed ) { - ed.show(); - } else { - try{tinyMCE.execCommand("mceAddControl", false, id);} - catch(e){} - } + try { + if ( ed ) + ed.show(); + else + tinyMCE.execCommand("mceAddControl", false, id); + } catch(e) {} + + ta.style.color = '#000'; } else { setUserSetting( 'editor', 'html' ); ta.style.color = '#000'; @@ -129,7 +131,7 @@ var switchEditors = { return false; }, - wpautop : function(pee) { + _wp_Autop : function(pee) { var blocklist = 'table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|address|math|p|h[1-6]'; if ( pee.indexOf(']*>[\s\S]+?<\/\1>/g,function(d){d=d.replace(/
[\r\n]*/g,"");return d.replace(/<\/?p( [^>]*)?>[\r\n]*/g,"")});b=b.replace(/

[\s\u00a0]*<\/p>/g,"");c="blockquote|ul|ol|li|table|thead|tbody|tfoot|tr|th|td|div|h[1-6]|p";b=b.replace(new RegExp("\\s*\\s*","g"),"\n");b=b.replace(new RegExp("\\s*<(("+c+")[^>]*)>","g"),"\n<$1>");b=b.replace(/(

]+>.*?)<\/p>/g,"$1");b=b.replace(/]*)>\s*

/gi,"\n\n");b=b.replace(/\s*

/gi,"");b=b.replace(/\s*<\/p>\s*/gi,"\n\n");b=b.replace(/\n[\s\u00a0]+\n/g,"\n\n");b=b.replace(/\s*
\s*/gi,"\n");b=b.replace(/\s*

\s*/g,"
\n");b=b.replace(/\s*\[caption([^\[]+)\[\/caption\]\s*/gi,"\n\n[caption$1[/caption]\n\n");b=b.replace(/caption\]\n\n+\[caption/g,"caption]\n\n[caption");a="blockquote|ul|ol|li|table|thead|tfoot|tr|th|td|h[1-6]|pre";b=b.replace(new RegExp("\\s*<(("+a+") ?[^>]*)\\s*>","g"),"\n<$1>");b=b.replace(new RegExp("\\s*\\s*","g"),"\n");b=b.replace(/]*)>/g,"\t");if(b.indexOf("/g,function(d){return d.replace(/[\r\n]+/g,"")})}b=b.replace(/<\/p#>/g,"

\n");b=b.replace(/\s*(

]+>[\s\S]*?<\/p>)/g,"\n$1");b=b.replace(/^\s+/,"");b=b.replace(/[\s\u00a0]+$/,"");b=b.replace(//g,"\n");b=b.replace(/\s*/g,"

 

\n\n");return b},go:function(i,g){i=i||"content";g=g||this.mode||"";var b,h=this.I("quicktags"),c=this.I("edButtonHTML"),d=this.I("edButtonPreview"),a=this.I(i);try{b=tinyMCE.get(i)}catch(f){b=false}if("tinymce"==g){if(b&&!b.isHidden()){return false}setUserSetting("editor","tinymce");this.mode="html";d.className="active";c.className="";edCloseAllTags();h.style.display="none";a.value=this.wpautop(a.value);if(b){b.show()}else{try{tinyMCE.execCommand("mceAddControl",false,i)}catch(f){}}}else{setUserSetting("editor","html");a.style.color="#000";this.mode="tinymce";c.className="active";d.className="";if(b&&!b.isHidden()){a.style.height=b.getContentAreaContainer().offsetHeight+24+"px";b.hide()}h.style.display="block"}return false},wpautop:function(a){var b="table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|address|math|p|h[1-6]";if(a.indexOf("/g,function(c){return c.replace(/[\r\n]+/g,"")})}a=a.replace(/<[^<>]+>/g,function(c){return c.replace(/[\r\n]+/g," ")});a=a+"\n\n";a=a.replace(/
\s*
/gi,"\n\n");a=a.replace(new RegExp("(<(?:"+b+")[^>]*>)","gi"),"\n$1");a=a.replace(new RegExp("()","gi"),"$1\n\n");a=a.replace(/\r\n|\r/g,"\n");a=a.replace(/\n\s*\n+/g,"\n\n");a=a.replace(/([\s\S]+?)\n\n/g,"

$1

\n");a=a.replace(/

\s*?<\/p>/gi,"");a=a.replace(new RegExp("

\\s*(]*>)\\s*

","gi"),"$1");a=a.replace(/

(/gi,"$1");a=a.replace(/

\s*]*)>/gi,"

");a=a.replace(/<\/blockquote>\s*<\/p>/gi,"

");a=a.replace(new RegExp("

\\s*(]*>)","gi"),"$1");a=a.replace(new RegExp("(]*>)\\s*

","gi"),"$1");a=a.replace(/\s*\n/gi,"
\n");a=a.replace(new RegExp("(]*>)\\s*
","gi"),"$1");a=a.replace(/
(\s*<\/?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)>)/gi,"$1");a=a.replace(/(?:

|
)*\s*\[caption([^\[]+)\[\/caption\]\s*(?:<\/p>|
)*/gi,"[caption$1[/caption]");a=a.replace(/<(pre|script)[^>]*>[\s\S]+?<\/\1>/g,function(c){c=c.replace(/
[\r\n]*/g,"\n");return c.replace(/<\/?p( [^>]*)?>[\r\n]*/g,"\n")});return a}}; \ No newline at end of file +jQuery(document).ready(function(b){var a=wpCookies.getHash("TinyMCE_content_size");if(getUserSetting("editor")=="html"){if(a){b("#content").css("height",a.ch-15+"px")}}else{if(typeof tinyMCE!="object"){b("#content").css("color","#000")}else{b("#quicktags").hide()}}});var switchEditors={mode:"",I:function(a){return document.getElementById(a)},_wp_Nop:function(b){var c,a;b=b.replace(/<(pre|script)[^>]*>[\s\S]+?<\/\1>/g,function(d){d=d.replace(/
[\r\n]*/g,"");return d.replace(/<\/?p( [^>]*)?>[\r\n]*/g,"")});b=b.replace(/

[\s\u00a0]*<\/p>/g,"");c="blockquote|ul|ol|li|table|thead|tbody|tfoot|tr|th|td|div|h[1-6]|p";b=b.replace(new RegExp("\\s*\\s*","g"),"\n");b=b.replace(new RegExp("\\s*<(("+c+")[^>]*)>","g"),"\n<$1>");b=b.replace(/(

]+>.*?)<\/p>/g,"$1");b=b.replace(/]*)>\s*

/gi,"\n\n");b=b.replace(/\s*

/gi,"");b=b.replace(/\s*<\/p>\s*/gi,"\n\n");b=b.replace(/\n[\s\u00a0]+\n/g,"\n\n");b=b.replace(/\s*
\s*/gi,"\n");b=b.replace(/\s*

\s*/g,"
\n");b=b.replace(/\s*\[caption([^\[]+)\[\/caption\]\s*/gi,"\n\n[caption$1[/caption]\n\n");b=b.replace(/caption\]\n\n+\[caption/g,"caption]\n\n[caption");a="blockquote|ul|ol|li|table|thead|tfoot|tr|th|td|h[1-6]|pre";b=b.replace(new RegExp("\\s*<(("+a+") ?[^>]*)\\s*>","g"),"\n<$1>");b=b.replace(new RegExp("\\s*\\s*","g"),"\n");b=b.replace(/]*)>/g,"\t");if(b.indexOf("/g,function(d){return d.replace(/[\r\n]+/g,"")})}b=b.replace(/<\/p#>/g,"

\n");b=b.replace(/\s*(

]+>[\s\S]*?<\/p>)/g,"\n$1");b=b.replace(/^\s+/,"");b=b.replace(/[\s\u00a0]+$/,"");b=b.replace(//g,"\n");b=b.replace(/\s*/g,"

 

\n\n");return b},go:function(i,g){i=i||"content";g=g||this.mode||"";var b,h=this.I("quicktags"),c=this.I("edButtonHTML"),d=this.I("edButtonPreview"),a=this.I(i);try{b=tinyMCE.get(i)}catch(f){b=false}if("tinymce"==g){if(b&&!b.isHidden()){return false}setUserSetting("editor","tinymce");this.mode="html";d.className="active";c.className="";edCloseAllTags();h.style.display="none";a.style.color="#FFF";a.value=this.wpautop(a.value);try{if(b){b.show()}else{tinyMCE.execCommand("mceAddControl",false,i)}}catch(f){}a.style.color="#000"}else{setUserSetting("editor","html");a.style.color="#000";this.mode="tinymce";c.className="active";d.className="";if(b&&!b.isHidden()){a.style.height=b.getContentAreaContainer().offsetHeight+24+"px";b.hide()}h.style.display="block"}return false},_wp_Autop:function(a){var b="table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|address|math|p|h[1-6]";if(a.indexOf("/g,function(c){return c.replace(/[\r\n]+/g,"")})}a=a.replace(/<[^<>]+>/g,function(c){return c.replace(/[\r\n]+/g," ")});a=a+"\n\n";a=a.replace(/
\s*
/gi,"\n\n");a=a.replace(new RegExp("(<(?:"+b+")[^>]*>)","gi"),"\n$1");a=a.replace(new RegExp("()","gi"),"$1\n\n");a=a.replace(/\r\n|\r/g,"\n");a=a.replace(/\n\s*\n+/g,"\n\n");a=a.replace(/([\s\S]+?)\n\n/g,"

$1

\n");a=a.replace(/

\s*?<\/p>/gi,"");a=a.replace(new RegExp("

\\s*(]*>)\\s*

","gi"),"$1");a=a.replace(/

(/gi,"$1");a=a.replace(/

\s*]*)>/gi,"

");a=a.replace(/<\/blockquote>\s*<\/p>/gi,"

");a=a.replace(new RegExp("

\\s*(]*>)","gi"),"$1");a=a.replace(new RegExp("(]*>)\\s*

","gi"),"$1");a=a.replace(/\s*\n/gi,"
\n");a=a.replace(new RegExp("(]*>)\\s*
","gi"),"$1");a=a.replace(/
(\s*<\/?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)>)/gi,"$1");a=a.replace(/(?:

|
)*\s*\[caption([^\[]+)\[\/caption\]\s*(?:<\/p>|
)*/gi,"[caption$1[/caption]");a=a.replace(/<(pre|script)[^>]*>[\s\S]+?<\/\1>/g,function(c){c=c.replace(/
[\r\n]*/g,"\n");return c.replace(/<\/?p( [^>]*)?>[\r\n]*/g,"\n")});return a},pre_wpautop:function(b){var a=this,c={o:a,data:b,unfiltered:b};jQuery("body").trigger("beforePreWpautop",[c]);c.data=a._wp_Nop(c.data);jQuery("body").trigger("afterPreWpautop",[c]);return c.data},wpautop:function(b){var a=this,c={o:a,data:b,unfiltered:b};jQuery("body").trigger("beforeWpautop",[c]);c.data=a._wp_Autop(c.data);jQuery("body").trigger("afterWpautop",[c]);return c.data}}; \ No newline at end of file diff --git a/wp-admin/js/media-upload.dev.js b/wp-admin/js/media-upload.dev.js index e2c00ae229..599ebbdce4 100644 --- a/wp-admin/js/media-upload.dev.js +++ b/wp-admin/js/media-upload.dev.js @@ -4,7 +4,7 @@ function send_to_editor(h) { if ( typeof tinyMCE != 'undefined' && ( ed = tinyMCE.activeEditor ) && !ed.isHidden() ) { ed.focus(); - if (tinymce.isIE) + if ( tinymce.isIE ) ed.selection.moveToBookmark(tinymce.EditorManager.activeEditor.windowManager.bookmark); if ( h.indexOf('[caption') === 0 ) { @@ -13,6 +13,9 @@ function send_to_editor(h) { } else if ( h.indexOf('[gallery') === 0 ) { if ( ed.plugins.wpgallery ) h = ed.plugins.wpgallery._do_gallery(h); + } else if ( h.indexOf('[embed') === 0 ) { + if ( ed.plugins.wordpress ) + h = ed.plugins.wordpress._setEmbed(h); } ed.execCommand('mceInsertContent', false, h); diff --git a/wp-admin/js/media-upload.js b/wp-admin/js/media-upload.js index 741220312a..28a2ba03cb 100644 --- a/wp-admin/js/media-upload.js +++ b/wp-admin/js/media-upload.js @@ -1 +1 @@ -function send_to_editor(b){var a;if(typeof tinyMCE!="undefined"&&(a=tinyMCE.activeEditor)&&!a.isHidden()){a.focus();if(tinymce.isIE){a.selection.moveToBookmark(tinymce.EditorManager.activeEditor.windowManager.bookmark)}if(b.indexOf("[caption")===0){if(a.plugins.wpeditimage){b=a.plugins.wpeditimage._do_shcode(b)}}else{if(b.indexOf("[gallery")===0){if(a.plugins.wpgallery){b=a.plugins.wpgallery._do_gallery(b)}}}a.execCommand("mceInsertContent",false,b)}else{if(typeof edInsertContent=="function"){edInsertContent(edCanvas,b)}else{jQuery(edCanvas).val(jQuery(edCanvas).val()+b)}}tb_remove()}var tb_position;(function(a){tb_position=function(){var e=a("#TB_window"),d=a(window).width(),c=a(window).height(),b=(720'; + }); + }, + + _getEmbed : function(c) { + return c.replace(/]+>/g, function(a) { + if ( a.indexOf('class="wp-oembed') != -1 ) { + var u = a.match(/alt="([^\"]+)"/); + if ( u[1] ) + a = '[embed]' + u[1] + '[/embed]'; + } + return a; + }); + }, + + _showButtons : function(n, id) { + var t = this, ed = tinyMCE.activeEditor, p1, p2, vp, DOM = tinymce.DOM, X, Y; + + vp = ed.dom.getViewPort(ed.getWin()); + p1 = DOM.getPos(ed.getContentAreaContainer()); + p2 = ed.dom.getPos(n); + + X = Math.max(p2.x - vp.x, 0) + p1.x; + Y = Math.max(p2.y - vp.y, 0) + p1.y; + + DOM.setStyles(id, { + 'top' : Y+5+'px', + 'left' : X+5+'px', + 'display' : 'block' + }); + + t.tout = window.setTimeout( function(){ed.plugins.wordpress._hideButtons();}, 5000 ); + }, + + _hideButtons : function() { + tinymce.DOM.hide(['wp_editbtns', 'wp_gallerybtns']); + + if ( this.tout ) + window.clearTimeout(this.tout); + }, + do_align : function(n, a) { var P, DL, DIV, cls, c, ed = tinyMCE.activeEditor; @@ -253,7 +322,7 @@ _handleMoreBreak : function(ed, url) { var moreHTML, nextpageHTML; - + moreHTML = '$1'; nextpageHTML = ''; diff --git a/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js b/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js index 79bb2bd91f..aa102c9f12 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)}}});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")}},getInfo:function(){return{longname:"WordPress Plugin",author:"WordPress",authorurl:"http://wordpress.org",infourl:"http://wordpress.org",version:"3.0"}},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",{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 diff --git a/wp-includes/js/tinymce/plugins/wordpress/img/embedded.png b/wp-includes/js/tinymce/plugins/wordpress/img/embedded.png new file mode 100644 index 0000000000000000000000000000000000000000..173401ba5f118eab4be853d9fffc15c5bf88e677 GIT binary patch literal 28741 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

7@i^K4g+01b^9J7CLiXoDX*1AHubX|E_ z$kBnf}(Vu_efAZE3&Ch@OGZO?L zL4X#HH^1|J);d@H`|tim4v)G_hsQD<^dvhQi&KmD4&#KV5?~82NgR<>DpZnCLlYY> zB_yh4pW5L?MOBD~Ni#f)C zbB;<{rCzVlJ?gRdai1iKNs}ddXA>%ENLo$){c@5x5Um)`X@4f6QMOu6-aG1PHk%Vg zp>(c&l~-@wQWK9=#cL2mh%sb-%4TPqAH4M=zk9FG?!hsq{Q>jYoGi=bVDG-ZaIL{f zw`+d=n_sckT4g#I$jQ+G!_i1)v#BrgLe#j0U8f-GC5a75UONp9_ zSM@52imHgWc41X6m=GVC*pwo*CE)=h>aCMdjFx?OR~pe;uNuH~oJp2vj7B+mVG%Lq zz=H(3wzeu)pTB}nH+`74>1?dC(pn-&YI@Qybe7BGquL8b;y9&RYig235=W)?g)xs~ z*Z;M{m4)yos8@o;oYg0PH5d=D-f`#dJ(|m_RMSwc^W43E7tspKOEtQOC%p5=At%$2 zufOpUR~sS29IS^lESnXDRW59$ELVlwA0CUfWxqyT!Tu3)xSDAokF~_gZk7?xbgZ28 z&uA=H2&75(Xv~G}wr+RYT;EwIFy42rUE;NuZ|QQaLK;U*W>XQb>>uni?RTYrbR>tz zUHSXpce%GW#O4EBK4m(akc~&2ji+SJ3EmNiLp1>JuYUwG~<$>zv=d%*xs-=hn~BY}I-3g`3nHHJYs!f4GO$l5^CzWJRdnTzXzy%_NR?VOrJ7dQ+&D*jZJY6AO82;n1grexc9+Yywz++{=zAL^w@z1^2`f#( z`*0DrDlE7RMFHb!@kH>q46_Y~Cucm|Khpz-R$J!&M|;{{tMj$jzXEnfKJFtytbf~`@Voa;S&j-en=zTSbh~GCk0w~n zm`_Gp%x5y_9m`qofQOHEN%DuZma8}~crCbmV~1N`{wAZdA&(ADpzzd|tAHRuLSU4a zZa$9*4R;=X$oJm-4$WpAL&Uqc-{t)I4i`2%G^!P*bBFVe+Ol$WXIrdTos_5aEPpW%S<-@QjwmBDa~^Gab0?(E*-!sa&3r3Od6V@`T~ zjHVKXslI>bJ=wW-O~3Z)O#&0*)bRNipQC$JkvM7aV1J}{k1faJkf4-zrYKax0BQ;B z7gn>WMGUBQpem?ioXty3jVGf0kVFA#8l%>7{c49+y+*5*s`ojSIASNg!tD?D=^l1z zwHg?c@WGv3j=MP*+e-ixML};^U_#4rf5JS^35tSQ#gyTc1P~hBJS42N#6)%0D=XT$ zc!Qw&S0)bzq^UtM*i5s6AqBa*hS9tEyHr9HWIO0S|AN81@Wh9|UVPUnAuv|+}Jl0tPb$IoQihHT8 zR|+G`Q%vG#0{$3ik#cNEC7OObXGfDY+oXY6Ra)d`js^rOAQez zDJ6rkWvhLT>sQ*G4s#~+uDpM{hcs6;iA-4oHRW*<2n@$wEDm{+3YX8>v?v)dL0B?6 zz0zz{xq7JuURhnK5`{r&FGa*O%NUGiY_;1c!YnHo42GPIrZ`oqNojWDC18{X)Z+jX z#2AT5s|FLt*xb|JXfiL9y#otsan|CUBNwHxr31O>LJC;H$migQ+cxPn=;7N7-iG=2}YdxQCV+D9sj0oA>^T9`ZC^?_Ga+%J?CQ%d;1q;1% z?@8jAB#tR;d0a;!5*oB#i8vk3^)a$wf*K>J@x*b+WHRN>-2-Y>Lt3eEIvDZ6ZkLVCbF9@u zyee7YL6kHuiHVgoWW814v_C^-glf5yJ&HJkTa-h}9VMth5>{z7o7{gi;KAMrPIFe4 z8{D{lfy)=yX|Fd)l7M>;yM$p(R(SenV*(>Y=@NSfU4HrYA)o!yO

'+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]"})},showButtons:function(d){var j=this,e=tinyMCE.activeEditor,g,f,a,i=tinymce.DOM,c,b,h=e.dom.getAttrib(d,"class");if(h.indexOf("mceItem")!=-1||h.indexOf("wpGallery")!=-1){return}a=e.dom.getViewPort(e.getWin());g=i.getPos(e.getContentAreaContainer());f=e.dom.getPos(d);c=Math.max(f.x-a.x,0)+g.x;b=Math.max(f.y-a.y,0)+g.y;i.setStyles("wp_editbtns",{top:b+5+"px",left:c+5+"px",display:"block"});j.btnsTout=window.setTimeout(function(){e.plugins.wpeditimage.hideButtons()},5000)},hideButtons:function(){if(tinymce.DOM.isHidden("wp_editbtns")){return}tinymce.DOM.hide("wp_editbtns");window.clearTimeout(this.btnsTout)},_createButtons:function(){var d=this,b=tinyMCE.activeEditor,e=tinymce.DOM,a,c,f;e.remove("wp_editbtns");a=e.add(document.body,"div",{id:"wp_editbtns",style:"display:none;"});c=e.add("wp_editbtns","img",{src:d.url+"/img/image.png",id:"wp_editimgbtn",width:"24",height:"24",title:b.getLang("wpeditimage.edit_img")});tinymce.dom.Event.add(c,"mousedown",function(g){b.windowManager.bookmark=b.selection.getBookmark("simple");b.execCommand("WP_EditImage")});f=e.add("wp_editbtns","img",{src:d.url+"/img/delete.png",id:"wp_delimgbtn",width:"24",height:"24",title:b.getLang("wpeditimage.del_img")});tinymce.dom.Event.add(f,"mousedown",function(j){var g=tinyMCE.activeEditor,h=g.selection.getNode(),i;if(h.nodeName=="IMG"&&g.dom.getAttrib(h,"class").indexOf("mceItem")==-1){if((i=g.dom.getParent(h,"div"))&&g.dom.hasClass(i,"mceTemp")){g.dom.remove(i)}else{if((i=g.dom.getParent(h,"A"))&&i.childNodes.length==1){g.dom.remove(i)}else{g.dom.remove(h)}}g.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(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 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 3c9701d406..edfb1b2c74 100644 --- a/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.dev.js +++ b/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.dev.js @@ -10,7 +10,8 @@ // Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('...'); ed.addCommand('WP_Gallery', function() { - var el = ed.selection.getNode(), post_id, vp = tinymce.DOM.getViewPort(), H = vp.h - 80, W = ( 640 < vp.w ) ? 640 : vp.w; + var el = ed.selection.getNode(), post_id, vp = tinymce.DOM.getViewPort(), + H = vp.h - 80, W = ( 640 < vp.w ) ? 640 : vp.w; if ( el.nodeName != 'IMG' ) return; if ( ed.dom.getAttrib(el, 'class').indexOf('wpGallery') == -1 ) return; @@ -21,34 +22,12 @@ tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' ); }); - ed.onInit.add(function(ed) { - tinymce.dom.Event.add(ed.getWin(), 'scroll', function(e) { - ed.plugins.wpgallery.hideButtons(); - }); - }); - - ed.onBeforeExecCommand.add(function(ed, cmd, ui, val) { - ed.plugins.wpgallery.hideButtons(); - }); - - ed.onSaveContent.add(function(ed, o) { - ed.plugins.wpgallery.hideButtons(); - }); - - ed.onMouseUp.add(function(ed, e) { - if ( tinymce.isOpera ) { - if ( e.target.nodeName == 'IMG' ) - ed.plugins.wpgallery.showButtons(e.target); - } - - }); - ed.onMouseDown.add(function(ed, e) { - if ( tinymce.isOpera || e.target.nodeName != 'IMG' ) { - t.hideButtons(); - return; + if ( e.target.nodeName != 'IMG' ) { + ed.plugins.wordpress._hideButtons(); + } else if ( ed.dom.hasClass(e.target, 'wpGallery') ) { + ed.plugins.wordpress._showButtons(e.target, 'wp_gallerybtns'); } - ed.plugins.wpgallery.showButtons(e.target); }); ed.onBeforeSetContent.add(function(ed, o) { @@ -84,46 +63,17 @@ }); }, - showButtons : function(n) { - var t = this, ed = tinyMCE.activeEditor, p1, p2, vp, DOM = tinymce.DOM, X, Y; - - if (ed.dom.getAttrib(n, 'class').indexOf('wpGallery') == -1) - return; - - vp = ed.dom.getViewPort(ed.getWin()); - p1 = DOM.getPos(ed.getContentAreaContainer()); - p2 = ed.dom.getPos(n); - - X = Math.max(p2.x - vp.x, 0) + p1.x; - Y = Math.max(p2.y - vp.y, 0) + p1.y; - - DOM.setStyles('wp_gallerybtns', { - 'top' : Y+5+'px', - 'left' : X+5+'px', - 'display' : 'block' - }); - - t.btnsTout = window.setTimeout( function(){ed.plugins.wpgallery.hideButtons();}, 5000 ); - }, - - hideButtons : function() { - if ( tinymce.DOM.isHidden('wp_gallerybtns') ) return; - - tinymce.DOM.hide('wp_gallerybtns'); - window.clearTimeout(this.btnsTout); - }, - _createButtons : function() { - var t = this, ed = tinyMCE.activeEditor, DOM = tinymce.DOM, wp_gallerybtns, wp_editgallery, wp_delgallery; + var t = this, ed = tinyMCE.activeEditor, DOM = tinymce.DOM, editButton, dellButton; DOM.remove('wp_gallerybtns'); - wp_gallerybtns = DOM.add(document.body, 'div', { + DOM.add(document.body, 'div', { id : 'wp_gallerybtns', style : 'display:none;' }); - wp_editgallery = DOM.add('wp_gallerybtns', 'img', { + editButton = DOM.add('wp_gallerybtns', 'img', { src : t.url+'/img/edit.png', id : 'wp_editgallery', width : '24', @@ -131,14 +81,12 @@ title : ed.getLang('wordpress.editgallery') }); - wp_editgallery.onmousedown = function(e) { - var ed = tinyMCE.activeEditor; + tinymce.dom.Event.add(editButton, 'mousedown', function(e) { ed.windowManager.bookmark = ed.selection.getBookmark('simple'); ed.execCommand("WP_Gallery"); - this.parentNode.style.display = 'none'; - }; + }); - wp_delgallery = DOM.add('wp_gallerybtns', 'img', { + dellButton = DOM.add('wp_gallerybtns', 'img', { src : t.url+'/img/delete.png', id : 'wp_delgallery', width : '24', @@ -146,17 +94,16 @@ title : ed.getLang('wordpress.delgallery') }); - wp_delgallery.onmousedown = function(e) { + tinymce.dom.Event.add(dellButton, 'mousedown', function(e) { var ed = tinyMCE.activeEditor, el = ed.selection.getNode(); - if ( el.nodeName == 'IMG' && ed.dom.getAttrib(el, 'class').indexOf('wpGallery') != -1 ) { + if ( el.nodeName == 'IMG' && ed.dom.hasClass(el, 'wpGallery') ) { ed.dom.remove(el); - this.parentNode.style.display = 'none'; ed.execCommand('mceRepaint'); return false; } - }; + }); }, getInfo : function() { diff --git a/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js b/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js index e924e3dc24..8c1d8dfc19 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})},showButtons:function(d){var i=this,e=tinyMCE.activeEditor,g,f,a,h=tinymce.DOM,c,b;if(e.dom.getAttrib(d,"class").indexOf("wpGallery")==-1){return}a=e.dom.getViewPort(e.getWin());g=h.getPos(e.getContentAreaContainer());f=e.dom.getPos(d);c=Math.max(f.x-a.x,0)+g.x;b=Math.max(f.y-a.y,0)+g.y;h.setStyles("wp_gallerybtns",{top:b+5+"px",left:c+5+"px",display:"block"});i.btnsTout=window.setTimeout(function(){e.plugins.wpgallery.hideButtons()},5000)},hideButtons:function(){if(tinymce.DOM.isHidden("wp_gallerybtns")){return}tinymce.DOM.hide("wp_gallerybtns");window.clearTimeout(this.btnsTout)},_createButtons:function(){var d=this,b=tinyMCE.activeEditor,e=tinymce.DOM,c,f,a;e.remove("wp_gallerybtns");c=e.add(document.body,"div",{id:"wp_gallerybtns",style:"display:none;"});f=e.add("wp_gallerybtns","img",{src:d.url+"/img/edit.png",id:"wp_editgallery",width:"24",height:"24",title:b.getLang("wordpress.editgallery")});f.onmousedown=function(h){var g=tinyMCE.activeEditor;g.windowManager.bookmark=g.selection.getBookmark("simple");g.execCommand("WP_Gallery");this.parentNode.style.display="none"};a=e.add("wp_gallerybtns","img",{src:d.url+"/img/delete.png",id:"wp_delgallery",width:"24",height:"24",title:b.getLang("wordpress.delgallery")});a.onmousedown=function(i){var g=tinyMCE.activeEditor,h=g.selection.getNode();if(h.nodeName=="IMG"&&g.dom.getAttrib(h,"class").indexOf("wpGallery")!=-1){g.dom.remove(h);this.parentNode.style.display="none";g.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(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 diff --git a/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css b/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css index aee70e7634..40dfd3e279 100644 --- a/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css +++ b/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css @@ -64,13 +64,6 @@ dl.aligncenter { margin: 0; } -img.wpGallery { - border: 1px dotted #cc0000; - background: #ffffcc url("../../../../plugins/wpgallery/img/gallery.png") no-repeat scroll center center; - width: 99%; - height: 250px; -} - body.mceContentBody { font: 13px/19px Georgia, "Times New Roman", "Bitstream Charter", Times, serif; padding: 0.6em; diff --git a/wp-includes/js/tinymce/wp-tinymce.js b/wp-includes/js/tinymce/wp-tinymce.js index d3b300ba2b..a5b24da895 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)}}});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")}},getInfo:function(){return{longname:"WordPress Plugin",author:"WordPress",authorurl:"http://wordpress.org",infourl:"http://wordpress.org",version:"3.0"}},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",{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)})(); // 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]"})},showButtons:function(d){var j=this,e=tinyMCE.activeEditor,g,f,a,i=tinymce.DOM,c,b,h=e.dom.getAttrib(d,"class");if(h.indexOf("mceItem")!=-1||h.indexOf("wpGallery")!=-1){return}a=e.dom.getViewPort(e.getWin());g=i.getPos(e.getContentAreaContainer());f=e.dom.getPos(d);c=Math.max(f.x-a.x,0)+g.x;b=Math.max(f.y-a.y,0)+g.y;i.setStyles("wp_editbtns",{top:b+5+"px",left:c+5+"px",display:"block"});j.btnsTout=window.setTimeout(function(){e.plugins.wpeditimage.hideButtons()},5000)},hideButtons:function(){if(tinymce.DOM.isHidden("wp_editbtns")){return}tinymce.DOM.hide("wp_editbtns");window.clearTimeout(this.btnsTout)},_createButtons:function(){var d=this,b=tinyMCE.activeEditor,e=tinymce.DOM,a,c,f;e.remove("wp_editbtns");a=e.add(document.body,"div",{id:"wp_editbtns",style:"display:none;"});c=e.add("wp_editbtns","img",{src:d.url+"/img/image.png",id:"wp_editimgbtn",width:"24",height:"24",title:b.getLang("wpeditimage.edit_img")});c.onmousedown=function(h){var g=tinyMCE.activeEditor;g.windowManager.bookmark=g.selection.getBookmark("simple");g.execCommand("WP_EditImage");this.parentNode.style.display="none"};f=e.add("wp_editbtns","img",{src:d.url+"/img/delete.png",id:"wp_delimgbtn",width:"24",height:"24",title:b.getLang("wpeditimage.del_img")});f.onmousedown=function(j){var g=tinyMCE.activeEditor,h=g.selection.getNode(),i;if(h.nodeName=="IMG"&&g.dom.getAttrib(h,"class").indexOf("mceItem")==-1){if((i=g.dom.getParent(h,"div"))&&g.dom.hasClass(i,"mceTemp")){g.dom.remove(i)}else{if((i=g.dom.getParent(h,"A"))&&i.childNodes.length==1){g.dom.remove(i)}else{g.dom.remove(h)}}this.parentNode.style.display="none";g.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(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)})(); // 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 e=a.selection.getNode(),d;if(e.nodeName!="IMG"){return}if(a.dom.getAttrib(e,"class").indexOf("wpGallery")==-1){return}d=tinymce.DOM.get("post_ID").value;tb_show("",tinymce.documentBaseURL+"/media-upload.php?post_id="+d+"&tab=gallery&TB_iframe=true");tinymce.DOM.setStyle(["TB_overlay","TB_window","TB_load"],"z-index","999999")});a.onInit.add(function(d){tinymce.dom.Event.add(d.getWin(),"scroll",function(f){d.plugins.wpgallery.hideButtons()})});a.onBeforeExecCommand.add(function(d,f,e,g){d.plugins.wpgallery.hideButtons()});a.onSaveContent.add(function(d,e){d.plugins.wpgallery.hideButtons()});a.onMouseUp.add(function(d,f){if(tinymce.isOpera){if(f.target.nodeName=="IMG"){d.plugins.wpgallery.showButtons(f.target)}}});a.onMouseDown.add(function(d,f){if(tinymce.isOpera||f.target.nodeName!="IMG"){c.hideButtons();return}d.plugins.wpgallery.showButtons(f.target)});a.onBeforeSetContent.add(function(d,e){e.content=c._do_gallery(e.content)});a.onPostProcess.add(function(d,e){if(e.get){e.content=c._get_gallery(e.content)}})},_do_gallery:function(a){return a.replace(/\[gallery([^\]]*)\]/g,function(d,c){return''})},_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})},showButtons:function(d){var i=this,e=tinyMCE.activeEditor,g,f,a,h=tinymce.DOM,c,b;if(e.dom.getAttrib(d,"class").indexOf("wpGallery")==-1){return}a=e.dom.getViewPort(e.getWin());g=h.getPos(e.getContentAreaContainer());f=e.dom.getPos(d);c=Math.max(f.x-a.x,0)+g.x;b=Math.max(f.y-a.y,0)+g.y;h.setStyles("wp_gallerybtns",{top:b+5+"px",left:c+5+"px",display:"block"});i.btnsTout=window.setTimeout(function(){e.plugins.wpgallery.hideButtons()},5000)},hideButtons:function(){if(tinymce.DOM.isHidden("wp_gallerybtns")){return}tinymce.DOM.hide("wp_gallerybtns");window.clearTimeout(this.btnsTout)},_createButtons:function(){var d=this,b=tinyMCE.activeEditor,e=tinymce.DOM,c,f,a;e.remove("wp_gallerybtns");c=e.add(document.body,"div",{id:"wp_gallerybtns",style:"display:none;"});f=e.add("wp_gallerybtns","img",{src:d.url+"/img/edit.png",id:"wp_editgallery",width:"24",height:"24",title:b.getLang("wordpress.editgallery")});f.onmousedown=function(h){var g=tinyMCE.activeEditor;g.windowManager.bookmark=g.selection.getBookmark("simple");g.execCommand("WP_Gallery");this.parentNode.style.display="none"};a=e.add("wp_gallerybtns","img",{src:d.url+"/img/delete.png",id:"wp_delgallery",width:"24",height:"24",title:b.getLang("wordpress.delgallery")});a.onmousedown=function(i){var g=tinyMCE.activeEditor,h=g.selection.getNode();if(h.nodeName=="IMG"&&g.dom.getAttrib(h,"class").indexOf("wpGallery")!=-1){g.dom.remove(h);this.parentNode.style.display="none";g.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(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)})(); // 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 92d479ca52ecf8290b6c192b5eb8c5530a47f46f..23721a1a4afc18c824d00d8a58dc639e42461acd 100644 GIT binary patch delta 8822 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 delta 8685 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 LG7n{_h6e-y_4(g) diff --git a/wp-includes/version.php b/wp-includes/version.php index dbf64e3b61..0baaf4eb5f 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-1235'; +$tinymce_version = '327-1235b'; /** * Holds the cache manifest version