From b7b715a2624c5d71c6e01444b4f81eac371f7fae Mon Sep 17 00:00:00 2001 From: bumpbot Date: Tue, 28 Feb 2012 14:18:24 +0000 Subject: [PATCH] Compress scripts/styles: 3.4-alpha-20014. git-svn-id: http://svn.automattic.com/wordpress/trunk@20014 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../plugins/wpeditimage/editor_plugin.js | 2 +- wp-includes/js/tinymce/wp-tinymce.js.gz | Bin 100729 -> 100846 bytes wp-includes/version.php | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js b/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js index bbb2099bfd..708a1e47c3 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",{url:"",editor:{},init:function(a,c){var d=this,b={};d.url=c;d.editor=a;d._createButtons();a.addCommand("WP_EditImage",function(){var i=a.selection.getNode(),g,h,e,f=a.dom.getAttrib(i,"class");if(f.indexOf("mceItem")!=-1||f.indexOf("wpGallery")!=-1||i.nodeName!="IMG"){return}g=tinymce.DOM.getViewPort();h=680<(g.h-70)?680:g.h-70;e=650");f.dom.insertAfter(h,i);f.selection.select(h.firstChild);if(tinymce.isIE){f.selection.setContent("")}else{f.selection.setContent('
');f.selection.setCursorLocation(h,0)}f.dom.events.cancel(j);return false}}});a.onBeforeSetContent.add(function(e,f){f.content=e.wpSetImgCaption(f.content)});a.onPostProcess.add(function(e,f){if(f.get){f.content=e.wpGetImgCaption(f.content)}});a.wpSetImgCaption=function(e){return d._do_shcode(e)};a.wpGetImgCaption=function(e){return d._get_shcode(e)}},_do_shcode:function(a){return a.replace(/(?:

)?\[(?:wp_)?caption([^\]]+)\]([\s\S]+?)\[\/(?:wp_)?caption\](?:<\/p>)?/g,function(g,d,k){var j,f,e,h,i;j=d.match(/id=['"]([^'"]+)['"] ?/);d=d.replace(j[0],"");f=d.match(/align=['"]([^'"]+)['"] ?/);d=d.replace(f[0],"");e=d.match(/width=['"]([0-9]+)['"] ?/);d=d.replace(e[0],"");h=tinymce.trim(d).replace(/caption=['"]/,"").replace(/['"]$/,"");j=(j&&j[1])?j[1]:"";f=(f&&f[1])?f[1]:"alignnone";e=(e&&e[1])?e[1]:"";if(!e||!h){return k}i=(f=="aligncenter")?"mceTemp mceIEcenter":"mceTemp";return'

'+k+'
'+h+"
"})},_get_shcode:function(a){return a.replace(/
\s*
]+)>\s*
]+>([\s\S]+?)<\/dt>\s*
]+>([\s\S]+?)<\/dd>\s*<\/dl>\s*<\/div>/gi,function(g,d,j,h){var i,f,e;e=j.match(/width="([0-9]+)"/);e=(e&&e[1])?e[1]:"";if(!e||!h){return j}i=d.match(/id="([^"]+)"/);i=(i&&i[1])?i[1]:"";f=d.match(/class="([^"]+)"/);f=(f&&f[1])?f[1]:"";f=f.match(/align[a-z]+/)||"alignnone";h=h.replace(/<[a-z][^<>]+>/g,function(b){return b.replace(/"/g,"'")});h=h.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 +(function(){tinymce.create("tinymce.plugins.wpEditImage",{url:"",editor:{},init:function(a,c){var d=this,b={};d.url=c;d.editor=a;d._createButtons();a.addCommand("WP_EditImage",function(){var i=a.selection.getNode(),g,h,e,f=a.dom.getAttrib(i,"class");if(f.indexOf("mceItem")!=-1||f.indexOf("wpGallery")!=-1||i.nodeName!="IMG"){return}g=tinymce.DOM.getViewPort();h=680<(g.h-70)?680:g.h-70;e=650");f.dom.insertAfter(h,i);f.selection.select(h.firstChild);if(tinymce.isIE){f.selection.setContent("")}else{f.selection.setContent('
');f.selection.setCursorLocation(h,0)}f.dom.events.cancel(j);return false}}});a.onBeforeSetContent.add(function(e,f){f.content=e.wpSetImgCaption(f.content)});a.onPostProcess.add(function(e,f){if(f.get){f.content=e.wpGetImgCaption(f.content)}});a.wpSetImgCaption=function(e){return d._do_shcode(e)};a.wpGetImgCaption=function(e){return d._get_shcode(e)}},_do_shcode:function(a){return a.replace(/(?:

)?\[(?:wp_)?caption([^\]]+)\]([\s\S]+?)\[\/(?:wp_)?caption\](?:<\/p>)?/g,function(g,d,k){var j,f,e,h,i;j=d.match(/id=['"]([^'"]*)['"] ?/);d=d.replace(j[0],"");f=d.match(/align=['"]([^'"]*)['"] ?/);d=d.replace(f[0],"");e=d.match(/width=['"]([0-9]*)['"] ?/);d=d.replace(e[0],"");h=tinymce.trim(d).replace(/caption=['"]/,"").replace(/['"]$/,"");j=(j&&j[1])?j[1]:"";f=(f&&f[1])?f[1]:"alignnone";e=(e&&e[1])?e[1]:"";if(!e||!h){return k}i="mceTemp";if(f=="aligncenter"){i+=" mceIEcenter"}return'

'+k+'
'+h+"
"})},_get_shcode:function(a){return a.replace(/
]*>([\s\S]+?)<\/div>/g,function(d,c){var e=c.replace(/
]+)>\s*
]+>([\s\S]+?)<\/dt>\s*
]+>([\s\S]*?)<\/dd>\s*<\/dl>/gi,function(i,f,l,j){var k,h,g;g=l.match(/width="([0-9]*)"/);g=(g&&g[1])?g[1]:"";if(!g||!j){return l}k=f.match(/id="([^"]*)"/);k=(k&&k[1])?k[1]:"";h=f.match(/class="([^"]*)"/);h=(h&&h[1])?h[1]:"";h=h.match(/align[a-z]+/)||"alignnone";j=j.replace(/<[a-z][^<>]+>/g,function(b){b=b.replace(/="[^"]+"/,function(m){return m.replace(/'/g,"'")});return b.replace(/"/g,"'")});j=j.replace(/"/g,""");return'[caption id="'+k+'" align="'+h+'" width="'+g+'" caption="'+j+'"]'+l+"[/caption]"});if(e.indexOf("[caption")!==0){e=c.replace(/[\s\S]*?((?:]+>)?]+>(?:<\/a>)?)(

[\s\S]*<\/p>)?[\s\S]*/gi,"

$1

$2")}return e})},_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/wp-tinymce.js.gz b/wp-includes/js/tinymce/wp-tinymce.js.gz index 159cf2f23bfb5ba1f3fbe8fc4e0b2d8d37b9cf27..bc28536e6e5feb2624284810246e353dbbd6a340 100644 GIT binary patch delta 2342 zcmV+>3EB4fk_PUR1_vLD2na3WOo0cr2Lb7TfBOTBuZ6$&P7cwJjBy=YV`a ze}{>j5>*~}&z}YH9_$8uj!}eVQJ&pq{ua6gEqDN=krSe50n+aDn> z)L9#O2`-#;KW$(eU>G~gJ+LsT(YM==fA>lx24dwZm@o^4+_sjS8Mv7o+7af*YFRKx zC$Jp+L``9Jxs1dRE{xa(U{66WzG@8p(hzQAf|#KNF++eD6Q(!b;B{n9o{4H#ZchBt z;O)lCk^W#wr-f4uXp zcOee*3B8N{ zMA{Ob2Pq5r@!RKH`v`o#+t?OHI`g_|X#7`aT1=2E_b-GGKl zqb-CtMVJ~CNvDqEDRxFn@>TZ8jF!x%ww8gJOFK1|5XIGHJjLQjH_h!!# z!EyVng7<=CvKh^?-c}p9D3$(m0)B`C+_6PEqRx&4lODdCS;*N{uJ5oo+2hT@YRZ;K zpTQ&!q&W_8_7^)?_= zdthsUPDPBn5V!p)k(2fl313!4K#o4##)Wd@Sh=&ZQOMNSq8YD?QXeMOJTX(J$g+D; zcB~#d-PrFrHUP1GHhT8iP$A2l60RkHvI2-L#g|f$oyC;+Cy>LE{z0s4p%;WIqq*I~5Xoref}+Y# z+GztS6zQ*Hf0zdV9@t>qVA+hqUCe@iSAMAwv4ayNiRPmr6tgH2z#UYviTzUa{2@ThNrbPu z^s2D$#}o^&*=3Ykd=4ZXz%qMF?~e7KONebNUMCtXe^50`z8=7b{tVs&kF;*N;K zI$V85Eg2E0Or?M`c7ie4QYBoCB}yHdkR9aS3AKU;adPz!?c7O53bJ+;F$HU@brRTB zx;&+CNSw=$NjKP{R1H%qUco;3$vLi*hrR4YeG2_aWi8Ra_e=ENYYX`Qxm2!w?Cz#M zi>Y0ye@OU8NnQ0CTd1faov5KNx<0)%_u%i{56rsF48=6s^1M6{;r6Fq3L`kGKCO$u zFFkowe-_rR$|vvxbu;*7Z`%VhIpN4X%jLK~>q(mVKZSX+gDQC#yt(u4r6(`GrsV^| zu(*su&a`_Hb}_MPjW)7Ak9`8RJ?;_f4Aq$%{=&YhFAdaC_FC*QoK|F>~Nrz zxhumz-_OL3*TX=+b!>Z+4qRqjdbtOODyIKG6H+jOu=VYCX%XVVBi@1KZ_$P&|zELMGEjj{iQ zYgQ~*{R4|;)&641>ga1Et2^bYMq50C?=wQmUAin^C!b?q z`ZdcOdLwRmHW>G?(UUr97H`TO-WIh*vL?GR?W>6eYYr}o<31Ff0hU4kNrh7Um~vvW5w>#&$t-S3#o}UCPJA&qDZ)0 z`Abeiph;A^8VsWAX0J2^luV(`4vFxFV+Whe$y6KDL#Yr7hZCqJxGt9=k>6Vj-={&V zOectkT+R`EbyYkhQRoeQq=Hq|$;&V-CikMSiiau_E>g*j+AX_f*jo$f5OI^_41nVQ M14=olbP=%x09t30iU0rr delta 2224 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 diff --git a/wp-includes/version.php b/wp-includes/version.php index c343e66f09..46340733a1 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '3.4-alpha-19998'; +$wp_version = '3.4-alpha-20014'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. @@ -18,7 +18,7 @@ $wp_db_version = 19863; * * @global string $tinymce_version */ -$tinymce_version = '348-19998'; +$tinymce_version = '348-20014'; /** * Holds the cache manifest version