From 9e8f2c77948851ed2bdfb03c198d4c5d6b84c9c6 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Fri, 28 Nov 2014 01:44:22 +0000 Subject: [PATCH] Editor: use the Alt+Shift+W keyboard shortcut for new DFW from both the Visual and Text editors. Props afercia, fixes #30450. Built from https://develop.svn.wordpress.org/trunk@30593 git-svn-id: http://core.svn.wordpress.org/trunk@30583 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/js/editor-expand.js | 31 +++++++++++++++--- wp-admin/js/editor-expand.min.js | 2 +- .../js/tinymce/plugins/wpfullscreen/plugin.js | 2 -- .../plugins/wpfullscreen/plugin.min.js | 2 +- wp-includes/js/tinymce/wp-tinymce.js.gz | Bin 135908 -> 135901 bytes wp-includes/version.php | 2 +- 6 files changed, 29 insertions(+), 10 deletions(-) diff --git a/wp-admin/js/editor-expand.js b/wp-admin/js/editor-expand.js index 946951b6d6..5657ff6e90 100644 --- a/wp-admin/js/editor-expand.js +++ b/wp-admin/js/editor-expand.js @@ -808,6 +808,7 @@ _isActive = true; $document.trigger( 'dfw-activate' ); + $content.on( 'keydown.focus-shortcut', toggleViaKeyboard ); } } @@ -818,6 +819,7 @@ _isActive = false; $document.trigger( 'dfw-deactivate' ); + $content.off( 'keydown.focus-shortcut' ); } } @@ -858,7 +860,11 @@ } function toggle() { - ( _isOn ? off : on )(); + if ( _isOn ) { + off(); + } else { + on(); + } } function isOn() { @@ -868,7 +874,8 @@ function fadeOut( event ) { var key = event && event.keyCode; - if ( key === 27 ) { + // fadeIn and return on Escape and keyboard shortcut Alt+Shift+W. + if ( key === 27 || ( key === 87 && event.altKey && event.shiftKey ) ) { fadeIn(); return; } @@ -1027,7 +1034,7 @@ return $.contains( $el.get( 0 ), document.activeElement ); } - // The focussed node is before or behind the editor area, and not ouside the wrap. + // The focused node is before or behind the editor area, and not outside the wrap. if ( ( position === 2 || position === 4 ) && ( hasFocus( $menuWrap ) || hasFocus( $wrap ) || hasFocus( $footer ) ) ) { fadeIn(); } @@ -1076,6 +1083,16 @@ } } + function toggleViaKeyboard( event ) { + if ( event.altKey && event.shiftKey && 87 === event.keyCode ) { + toggle(); + } + } + + if ( $( '#postdivrich' ).hasClass( 'wp-editor-expand' ) ) { + $content.on( 'keydown.focus-shortcut', toggleViaKeyboard ); + } + $document.on( 'tinymce-editor-setup.focus', function( event, editor ) { editor.addButton( 'dfw', { active: _isOn, @@ -1099,8 +1116,12 @@ button.active( false ); } ); }, - tooltip: 'Distraction Free Writing' + tooltip: 'Distraction Free Writing', + shortcut: 'Alt+Shift+W' } ); + + editor.addCommand( 'wpToggleDFW', toggle ); + editor.addShortcut( 'alt+shift+w', '', 'wpToggleDFW' ); } ); $document.on( 'tinymce-editor-init.focus', function( event, editor ) { @@ -1138,7 +1159,7 @@ $document.on( 'dfw-on.focus', mceBind ).on( 'dfw-off.focus', mceUnbind ); - // Make sure the body focusses when clicking outside it. + // Make sure the body focuses when clicking outside it. editor.on( 'click', function( event ) { if ( event.target === editor.getDoc().documentElement ) { editor.focus(); diff --git a/wp-admin/js/editor-expand.min.js b/wp-admin/js/editor-expand.min.js index b2887bcd34..2fd40df87f 100644 --- a/wp-admin/js/editor-expand.min.js +++ b/wp-admin/js/editor-expand.min.js @@ -1 +1 @@ -!function(a,b){"use strict";var c=b(a),d=b(document),e=b("#wpadminbar"),f=b("#wpfooter");b(function(){function g(){var a=c.width();T={windowHeight:c.height(),windowWidth:a,adminBarHeight:a>600?e.outerHeight():0,toolsHeight:t.outerHeight()||0,menuBarHeight:A.outerHeight()||0,visualTopHeight:u.outerHeight()||0,textTopHeight:w.outerHeight()||0,bottomHeight:z.outerHeight()||0,statusBarHeight:B.outerHeight()||0,sideSortablesHeight:C.height()||0},T.menuBarHeight<3&&(T.menuBarHeight=0)}function h(b){var c,d,e,f,g,h=jQuery.ui.keyCode,i=b.keyCode,j=document.createRange(),k=x[0].selectionStart,l=x[0].selectionEnd,m=y[0].firstChild,n=10;if(!k||!l||k===l){try{j.setStart(m,k),j.setEnd(m,l+1)}catch(o){}c=j.getBoundingClientRect(),c.height&&(d=c.top-n,e=d+c.height+n,f=T.adminBarHeight+T.toolsHeight+T.textTopHeight,g=T.windowHeight-T.bottomHeight,f>d&&(i===h.UP||i===h.LEFT||i===h.BACKSPACE)?a.scrollTo(a.pageXOffset,d+a.pageYOffset-f):e>g&&a.scrollTo(a.pageXOffset,e+a.pageYOffset-g))}}function i(){if(!(p&&!p.isHidden()||!p&&"tinymce"===R)){var a,b=x.height();y.width(x.width()-22),y.text(x.val()+" "),a=y.height(),Q>a&&(a=Q),a!==b&&(x.height(a),j())}}function j(b){if(!F||!F.settings.visible){var e,h,j,k,l,m,n,o,q,r=c.scrollTop(),G=b&&b.type,H="scroll"!==G,N=p&&!p.isHidden(),R=Q,U=E.offset().top,V=1,W=s.width();(H||!T.windowHeight)&&g(),N||"resize"!==G||i(),N?(e=u,h=v,n=T.visualTopHeight):(e=w,h=x,n=T.textTopHeight),m=e.parent().offset().top,o=h.offset().top,q=h.outerHeight(),l=N?Q+n:Q+20,l=q>l+5,l?((!I||H)&&r>=m-T.toolsHeight-T.adminBarHeight&&r<=m-T.toolsHeight-T.adminBarHeight+q-R?(I=!0,t.css({position:"fixed",top:T.adminBarHeight,width:W}),N&&A.length&&A.css({position:"fixed",top:T.adminBarHeight+T.toolsHeight,width:W-2*V-(N?0:e.outerWidth()-e.width())}),e.css({position:"fixed",top:T.adminBarHeight+T.toolsHeight+T.menuBarHeight,width:W-2*V-(N?0:e.outerWidth()-e.width())})):(I||H)&&(r<=m-T.toolsHeight-T.adminBarHeight?(I=!1,t.css({position:"absolute",top:0,width:W}),N&&A.length&&A.css({position:"absolute",top:0,width:W-2*V}),e.css({position:"absolute",top:T.menuBarHeight,width:W-2*V-(N?0:e.outerWidth()-e.width())})):r>=m-T.toolsHeight-T.adminBarHeight+q-R&&(I=!1,t.css({position:"absolute",top:q-R,width:W}),N&&A.length&&A.css({position:"absolute",top:q-R,width:W-2*V}),e.css({position:"absolute",top:q-R+T.menuBarHeight,width:W-2*V-(N?0:e.outerWidth()-e.width())}))),(!J||H&&S)&&r+T.windowHeight<=o+q+T.bottomHeight+T.statusBarHeight+V?b&&b.deltaHeight>0&&b.deltaHeight<100?a.scrollBy(0,b.deltaHeight):S&&(J=!0,B.css({position:"fixed",bottom:T.bottomHeight,visibility:"",width:W-2*V}),z.css({position:"fixed",bottom:0,width:W})):(!S&&J||(J||H)&&r+T.windowHeight>o+q+T.bottomHeight+T.statusBarHeight-V)&&(J=!1,B.add(z).attr("style",""),S||B.css("visibility","hidden"))):H&&(t.css({position:"absolute",top:0,width:W}),N&&A.length&&A.css({position:"absolute",top:0,width:W-2*V}),e.css({position:"absolute",top:T.menuBarHeight,width:W-2*V-(N?0:e.outerWidth()-e.width())}),B.add(z).attr("style","")),D.width()<300&&T.windowWidth>600&&d.height()>C.height()+U+120&&T.windowHeightT.windowHeight||K||L?U>=r+O?(C.attr("style",""),K=L=!1):r>M?K?(K=!1,j=C.offset().top-T.adminBarHeight,k=f.offset().top,kr&&(L?(L=!1,j=C.offset().top-P,k=f.offset().top,k=r+O&&(K=!0,C.css({position:"fixed",top:O,bottom:""}))):(r>=U-O?C.css({position:"fixed",top:O}):C.attr("style",""),K=L=!1),M=r):(C.attr("style",""),K=L=!1),H&&(s.css({paddingTop:T.toolsHeight}),N?v.css({paddingTop:T.visualTopHeight+T.menuBarHeight}):(x.css({marginTop:T.textTopHeight}),y.width(W-20-2*V)))}}function k(){i(),j()}function l(a){for(var b=1;6>b;b++)setTimeout(a,500*b)}function m(){clearTimeout(q),q=setTimeout(j,100)}function n(){a.pageYOffset&&a.pageYOffset>N&&a.scrollTo(a.pageXOffset,0),r.addClass("wp-editor-expand"),c.on("scroll.editor-expand resize.editor-expand",function(a){j(a.type),m()}),d.on("wp-collapse-menu.editor-expand postboxes-columnchange.editor-expand editor-classchange.editor-expand",j).on("postbox-toggled.editor-expand",function(){!K&&!L&&a.pageYOffset>O&&(L=!0,a.scrollBy(0,-1),j(),a.scrollBy(0,1)),j()}).on("wp-window-resized.editor-expand",function(){p&&!p.isHidden()?p.execCommand("wpAutoResize"):i()}),x.on("focus.editor-expand input.editor-expand propertychange.editor-expand",i),x.on("keyup.editor-expand",h),G(),F&&F.pubsub.subscribe("hidden",k),p&&(p.settings.wp_autoresize_on=!0,p.execCommand("wpAutoResizeOn"),p.isHidden()||p.execCommand("wpAutoResize")),(!p||p.isHidden())&&i(),j(),d.trigger("editor-expand-on")}function o(){var e=a.getUserSetting("ed_size");a.pageYOffset&&a.pageYOffset>N&&a.scrollTo(a.pageXOffset,0),r.removeClass("wp-editor-expand"),c.off(".editor-expand"),d.off(".editor-expand"),x.off(".editor-expand"),H(),F&&F.pubsub.unsubscribe("hidden",k),b.each([u,w,t,A,z,B,s,v,x,C],function(a,b){b&&b.attr("style","")}),I=J=K=L=!1,p&&(p.settings.wp_autoresize_on=!1,p.execCommand("wpAutoResizeOff"),p.isHidden()||(x.hide(),e&&p.theme.resizeTo(null,e))),e&&x.height(e),d.trigger("editor-expand-off")}var p,q,r=b("#postdivrich"),s=b("#wp-content-wrap"),t=b("#wp-content-editor-tools"),u=b(),v=b(),w=b("#ed_toolbar"),x=b("#content"),y=b('
'),z=b("#post-status-info"),A=b(),B=b(),C=b("#side-sortables"),D=b("#postbox-container-1"),E=b("#post-body"),F=a.wp.editor&&a.wp.editor.fullscreen,G=function(){},H=function(){},I=!1,J=!1,K=!1,L=!1,M=0,N=130,O=56,P=20,Q=300,R=a.getUserSetting("editor"),S=!!parseInt(a.getUserSetting("hidetb"),10),T={windowHeight:0,windowWidth:0,adminBarHeight:0,toolsHeight:0,menuBarHeight:0,visualTopHeight:0,textTopHeight:0,bottomHeight:0,statusBarHeight:0,sideSortablesHeight:0};y.insertAfter(x),y.css({"font-family":x.css("font-family"),"font-size":x.css("font-size"),"line-height":x.css("line-height"),"white-space":"pre-wrap","word-wrap":"break-word"}),d.on("tinymce-editor-init.editor-expand",function(d,e){function f(){var a,b,c,d=e.selection.getNode();if(e.plugins.wpview&&(b=e.plugins.wpview.getView(d)))c=b.getBoundingClientRect();else{a=e.selection.getRng();try{c=a.getClientRects()[0]}catch(f){}c||(c=d.getBoundingClientRect())}return c.height?c:!1}function g(a){var b=a.keyCode;47>=b&&b!==q.SPACEBAR&&b!==q.ENTER&&b!==q.DELETE&&b!==q.BACKSPACE&&b!==q.UP&&b!==q.LEFT&&b!==q.DOWN&&b!==q.UP||b>=91&&93>=b||b>=112&&123>=b||144===b||145===b||h(b)}function h(b){var c,d,g,h,i=f(),j=50;i&&(c=i.top+e.iframeElement.getBoundingClientRect().top,d=c+i.height,c-=j,d+=j,g=T.adminBarHeight+T.toolsHeight+T.menuBarHeight+T.visualTopHeight,h=T.windowHeight-(S?T.bottomHeight+T.statusBarHeight:0),h-gc&&(b===q.UP||b===q.LEFT||b===q.BACKSPACE)?a.scrollTo(a.pageXOffset,c+a.pageYOffset-g):d>h&&a.scrollTo(a.pageXOffset,d+a.pageYOffset-h)))}function k(a){a.state||j()}function m(){c.on("scroll.mce-float-panels",t),setTimeout(function(){e.execCommand("wpAutoResize"),j()},300)}function n(){c.off("scroll.mce-float-panels"),setTimeout(function(){var b=s.offset().top;a.pageYOffset>b&&a.scrollTo(a.pageXOffset,b-T.adminBarHeight),i(),j()},100),j()}function o(){S=!S}var q=a.tinymce.util.VK,t=_.debounce(function(){!b(".mce-floatpanel:hover").length&&a.tinymce.ui.FloatPanel.hideAll(),b(".mce-tooltip").hide()},1e3,!0);"content"===e.id&&(p=e,e.settings.autoresize_min_height=Q,u=s.find(".mce-toolbar-grp"),v=s.find(".mce-edit-area"),B=s.find(".mce-statusbar"),A=s.find(".mce-menubar"),G=function(){e.on("keyup",g),e.on("show",m),e.on("hide",n),e.on("wp-toolbar-toggle",o),e.on("setcontent wp-autoresize wp-toolbar-toggle",j),e.on("undo redo",h),e.on("FullscreenStateChanged",k),c.off("scroll.mce-float-panels").on("scroll.mce-float-panels",t)},H=function(){e.off("keyup",g),e.off("show",m),e.off("hide",n),e.off("wp-toolbar-toggle",o),e.off("setcontent wp-autoresize wp-toolbar-toggle",j),e.off("undo redo",h),e.off("FullscreenStateChanged",k),c.off("scroll.mce-float-panels")},r.hasClass("wp-editor-expand")&&(G(),l(j)))}),r.hasClass("wp-editor-expand")&&(n(),s.hasClass("html-active")&&l(function(){j(),i()})),b("#adv-settings .editor-expand").show(),b("#editor-expand-toggle").on("change.editor-expand",function(){b(this).prop("checked")?(n(),a.setUserSetting("editor_expand","on")):(o(),a.setUserSetting("editor_expand","off"))}),a.editorExpand={on:n,off:o}}),b(function(){function g(){Q||(Q=!0,d.trigger("dfw-activate"))}function h(){Q&&(k(),Q=!1,d.trigger("dfw-deactivate"))}function i(){return Q}function j(){!R&&Q&&(R=!0,J.on("keydown.focus",n),I.add(J).on("blur.focus",p),n(),a.setUserSetting("post_dfw","on"),d.trigger("dfw-on"))}function k(){R&&(R=!1,I.add(J).off(".focus"),o(),H.off(".focus"),a.setUserSetting("post_dfw","off"),d.trigger("dfw-off"))}function l(){(R?k:j)()}function m(){return R}function n(b){var d=b&&b.keyCode;return 27===d?void o():void(b&&(b.metaKey||b.ctrlKey&&!b.altKey||d&&(47>=d&&8!==d&&13!==d&&32!==d&&46!==d||d>=91&&93>=d||d>=112&&135>=d||d>=144&&150>=d||d>=224))||(u||(u=!0,clearTimeout(D),D=setTimeout(function(){K.show()},600),H.css("z-index",9998),K.on("mouseenter.focus",function(){x=H.offset(),x.right=x.left+H.outerWidth(),x.bottom=x.top+H.outerHeight(),c.on("scroll.focus",function(){var b=a.pageYOffset;B&&A&&B!==b&&(Ax.bottom+U)&&o(),B=b})}).on("mouseleave.focus",function(){y=z=null,S=T=0,c.off("scroll.focus")}).on("mousemove.focus",function(a){var b=a.pageX,c=a.pageY;if(y&&z&&(b!==y||c!==z))if(z>=c&&c=z&&c>x.bottom||y>=b&&b=y&&b>x.right){if(S+=Math.abs(y-b),T+=Math.abs(z-c),(c<=x.top-U||c>=x.bottom+U||b<=x.left-U||b>=x.right+U)&&(S>10||T>10))return o(),y=z=null,void(S=T=0)}else S=T=0;y=b,z=c}).on("touchstart.focus",function(a){a.preventDefault(),o()}),H.off("mouseenter.focus"),C&&(clearTimeout(C),C=null),F.addClass("focus-on").removeClass("focus-off")),q(),s()))}function o(){u&&(u=!1,clearTimeout(D),D=setTimeout(function(){K.hide()},200),H.css("z-index",""),K.off("mouseenter.focus mouseleave.focus mousemove.focus touchstart.focus"),H.on("mouseenter.focus",function(){(b.contains(H.get(0),document.activeElement)||E)&&n()}),C=setTimeout(function(){C=null,H.off("mouseenter.focus")},1e3),F.addClass("focus-off").removeClass("focus-on")),r(),t()}function p(){setTimeout(function(){function a(a){return b.contains(a.get(0),document.activeElement)}var c=document.activeElement.compareDocumentPosition(H.get(0));2!==c&&4!==c||!(a(N)||a(G)||a(f))||o()},0)}function q(){!v&&u&&(v=!0,e.on("mouseenter.focus",function(){e.addClass("focus-off")}).on("mouseleave.focus",function(){e.removeClass("focus-off")}))}function r(){v&&(v=!1,e.off(".focus"))}function s(){w||!u||L.find(":focus").length||(w=!0,L.stop().fadeTo("fast",.3).on("mouseenter.focus",t).off("mouseleave.focus"),M.on("focus.focus",t).off("blur.focus"))}function t(){w&&(w=!1,L.stop().fadeTo("fast",1).on("mouseleave.focus",s).off("mouseenter.focus"),M.on("blur.focus",s).off("focus.focus"))}var u,v,w,x,y,z,A,B,C,D,E,F=b(document.body),G=b("#wpcontent"),H=b("#post-body-content"),I=b("#title"),J=b("#content"),K=b(document.createElement("DIV")),L=b("#edit-slug-box"),M=L.find("a").add(L.find("button")).add(L.find("input")),N=b("#adminmenuwrap"),O=b(),P=b(),Q="on"===a.getUserSetting("editor_expand","on"),R=Q?"on"===a.getUserSetting("post_dfw"):!1,S=0,T=0,U=20;F.append(K),K.css({display:"none",position:"fixed",top:e.height(),right:0,bottom:0,left:0,"z-index":9997}),H.css({position:"relative"}),c.on("mousemove.focus",function(a){A=a.pageY}),d.on("tinymce-editor-setup.focus",function(a,b){b.addButton("dfw",{active:R,classes:"wp-dfw btn widget",disabled:!Q,onclick:l,onPostRender:function(){var a=this;d.on("dfw-activate.focus",function(){a.disabled(!1)}).on("dfw-deactivate.focus",function(){a.disabled(!0)}).on("dfw-on.focus",function(){a.active(!0)}).on("dfw-off.focus",function(){a.active(!1)})},tooltip:"Distraction Free Writing"})}),d.on("tinymce-editor-init.focus",function(a,c){function e(){E=!0}function f(){E=!1}var g,h;"content"===c.id&&(O=b(c.getWin()),P=b(c.getContentAreaContainer()).find("iframe"),g=function(){c.on("keydown",n),c.on("blur",p),c.on("focus",e),c.on("blur",f)},h=function(){c.off("keydown",n),c.off("blur",p),c.off("focus",e),c.off("blur",f)},R&&g(),d.on("dfw-on.focus",g).on("dfw-off.focus",h),c.on("click",function(a){a.target===c.getDoc().documentElement&&c.focus()}))}),d.on("quicktags-init",function(a,c){var d;c.settings.buttons&&-1!==(","+c.settings.buttons+",").indexOf(",dfw,")&&(d=b("#"+c.name+"_dfw"),b(document).on("dfw-activate",function(){d.prop("disabled",!1)}).on("dfw-deactivate",function(){d.prop("disabled",!0)}).on("dfw-on",function(){d.addClass("active")}).on("dfw-off",function(){d.removeClass("active")}))}),d.on("editor-expand-on.focus",g).on("editor-expand-off.focus",h),R&&(J.on("keydown.focus",n),I.add(J).on("blur.focus",p)),a.wp=a.wp||{},a.wp.editor=a.wp.editor||{},a.wp.editor.dfw={activate:g,deactivate:h,isActive:i,on:j,off:k,toggle:l,isOn:m}})}(window,window.jQuery); \ No newline at end of file +!function(a,b){"use strict";var c=b(a),d=b(document),e=b("#wpadminbar"),f=b("#wpfooter");b(function(){function g(){var a=c.width();T={windowHeight:c.height(),windowWidth:a,adminBarHeight:a>600?e.outerHeight():0,toolsHeight:t.outerHeight()||0,menuBarHeight:A.outerHeight()||0,visualTopHeight:u.outerHeight()||0,textTopHeight:w.outerHeight()||0,bottomHeight:z.outerHeight()||0,statusBarHeight:B.outerHeight()||0,sideSortablesHeight:C.height()||0},T.menuBarHeight<3&&(T.menuBarHeight=0)}function h(b){var c,d,e,f,g,h=jQuery.ui.keyCode,i=b.keyCode,j=document.createRange(),k=x[0].selectionStart,l=x[0].selectionEnd,m=y[0].firstChild,n=10;if(!k||!l||k===l){try{j.setStart(m,k),j.setEnd(m,l+1)}catch(o){}c=j.getBoundingClientRect(),c.height&&(d=c.top-n,e=d+c.height+n,f=T.adminBarHeight+T.toolsHeight+T.textTopHeight,g=T.windowHeight-T.bottomHeight,f>d&&(i===h.UP||i===h.LEFT||i===h.BACKSPACE)?a.scrollTo(a.pageXOffset,d+a.pageYOffset-f):e>g&&a.scrollTo(a.pageXOffset,e+a.pageYOffset-g))}}function i(){if(!(p&&!p.isHidden()||!p&&"tinymce"===R)){var a,b=x.height();y.width(x.width()-22),y.text(x.val()+" "),a=y.height(),Q>a&&(a=Q),a!==b&&(x.height(a),j())}}function j(b){if(!F||!F.settings.visible){var e,h,j,k,l,m,n,o,q,r=c.scrollTop(),G=b&&b.type,H="scroll"!==G,N=p&&!p.isHidden(),R=Q,U=E.offset().top,V=1,W=s.width();(H||!T.windowHeight)&&g(),N||"resize"!==G||i(),N?(e=u,h=v,n=T.visualTopHeight):(e=w,h=x,n=T.textTopHeight),m=e.parent().offset().top,o=h.offset().top,q=h.outerHeight(),l=N?Q+n:Q+20,l=q>l+5,l?((!I||H)&&r>=m-T.toolsHeight-T.adminBarHeight&&r<=m-T.toolsHeight-T.adminBarHeight+q-R?(I=!0,t.css({position:"fixed",top:T.adminBarHeight,width:W}),N&&A.length&&A.css({position:"fixed",top:T.adminBarHeight+T.toolsHeight,width:W-2*V-(N?0:e.outerWidth()-e.width())}),e.css({position:"fixed",top:T.adminBarHeight+T.toolsHeight+T.menuBarHeight,width:W-2*V-(N?0:e.outerWidth()-e.width())})):(I||H)&&(r<=m-T.toolsHeight-T.adminBarHeight?(I=!1,t.css({position:"absolute",top:0,width:W}),N&&A.length&&A.css({position:"absolute",top:0,width:W-2*V}),e.css({position:"absolute",top:T.menuBarHeight,width:W-2*V-(N?0:e.outerWidth()-e.width())})):r>=m-T.toolsHeight-T.adminBarHeight+q-R&&(I=!1,t.css({position:"absolute",top:q-R,width:W}),N&&A.length&&A.css({position:"absolute",top:q-R,width:W-2*V}),e.css({position:"absolute",top:q-R+T.menuBarHeight,width:W-2*V-(N?0:e.outerWidth()-e.width())}))),(!J||H&&S)&&r+T.windowHeight<=o+q+T.bottomHeight+T.statusBarHeight+V?b&&b.deltaHeight>0&&b.deltaHeight<100?a.scrollBy(0,b.deltaHeight):S&&(J=!0,B.css({position:"fixed",bottom:T.bottomHeight,visibility:"",width:W-2*V}),z.css({position:"fixed",bottom:0,width:W})):(!S&&J||(J||H)&&r+T.windowHeight>o+q+T.bottomHeight+T.statusBarHeight-V)&&(J=!1,B.add(z).attr("style",""),S||B.css("visibility","hidden"))):H&&(t.css({position:"absolute",top:0,width:W}),N&&A.length&&A.css({position:"absolute",top:0,width:W-2*V}),e.css({position:"absolute",top:T.menuBarHeight,width:W-2*V-(N?0:e.outerWidth()-e.width())}),B.add(z).attr("style","")),D.width()<300&&T.windowWidth>600&&d.height()>C.height()+U+120&&T.windowHeightT.windowHeight||K||L?U>=r+O?(C.attr("style",""),K=L=!1):r>M?K?(K=!1,j=C.offset().top-T.adminBarHeight,k=f.offset().top,kr&&(L?(L=!1,j=C.offset().top-P,k=f.offset().top,k=r+O&&(K=!0,C.css({position:"fixed",top:O,bottom:""}))):(r>=U-O?C.css({position:"fixed",top:O}):C.attr("style",""),K=L=!1),M=r):(C.attr("style",""),K=L=!1),H&&(s.css({paddingTop:T.toolsHeight}),N?v.css({paddingTop:T.visualTopHeight+T.menuBarHeight}):(x.css({marginTop:T.textTopHeight}),y.width(W-20-2*V)))}}function k(){i(),j()}function l(a){for(var b=1;6>b;b++)setTimeout(a,500*b)}function m(){clearTimeout(q),q=setTimeout(j,100)}function n(){a.pageYOffset&&a.pageYOffset>N&&a.scrollTo(a.pageXOffset,0),r.addClass("wp-editor-expand"),c.on("scroll.editor-expand resize.editor-expand",function(a){j(a.type),m()}),d.on("wp-collapse-menu.editor-expand postboxes-columnchange.editor-expand editor-classchange.editor-expand",j).on("postbox-toggled.editor-expand",function(){!K&&!L&&a.pageYOffset>O&&(L=!0,a.scrollBy(0,-1),j(),a.scrollBy(0,1)),j()}).on("wp-window-resized.editor-expand",function(){p&&!p.isHidden()?p.execCommand("wpAutoResize"):i()}),x.on("focus.editor-expand input.editor-expand propertychange.editor-expand",i),x.on("keyup.editor-expand",h),G(),F&&F.pubsub.subscribe("hidden",k),p&&(p.settings.wp_autoresize_on=!0,p.execCommand("wpAutoResizeOn"),p.isHidden()||p.execCommand("wpAutoResize")),(!p||p.isHidden())&&i(),j(),d.trigger("editor-expand-on")}function o(){var e=a.getUserSetting("ed_size");a.pageYOffset&&a.pageYOffset>N&&a.scrollTo(a.pageXOffset,0),r.removeClass("wp-editor-expand"),c.off(".editor-expand"),d.off(".editor-expand"),x.off(".editor-expand"),H(),F&&F.pubsub.unsubscribe("hidden",k),b.each([u,w,t,A,z,B,s,v,x,C],function(a,b){b&&b.attr("style","")}),I=J=K=L=!1,p&&(p.settings.wp_autoresize_on=!1,p.execCommand("wpAutoResizeOff"),p.isHidden()||(x.hide(),e&&p.theme.resizeTo(null,e))),e&&x.height(e),d.trigger("editor-expand-off")}var p,q,r=b("#postdivrich"),s=b("#wp-content-wrap"),t=b("#wp-content-editor-tools"),u=b(),v=b(),w=b("#ed_toolbar"),x=b("#content"),y=b('
'),z=b("#post-status-info"),A=b(),B=b(),C=b("#side-sortables"),D=b("#postbox-container-1"),E=b("#post-body"),F=a.wp.editor&&a.wp.editor.fullscreen,G=function(){},H=function(){},I=!1,J=!1,K=!1,L=!1,M=0,N=130,O=56,P=20,Q=300,R=a.getUserSetting("editor"),S=!!parseInt(a.getUserSetting("hidetb"),10),T={windowHeight:0,windowWidth:0,adminBarHeight:0,toolsHeight:0,menuBarHeight:0,visualTopHeight:0,textTopHeight:0,bottomHeight:0,statusBarHeight:0,sideSortablesHeight:0};y.insertAfter(x),y.css({"font-family":x.css("font-family"),"font-size":x.css("font-size"),"line-height":x.css("line-height"),"white-space":"pre-wrap","word-wrap":"break-word"}),d.on("tinymce-editor-init.editor-expand",function(d,e){function f(){var a,b,c,d=e.selection.getNode();if(e.plugins.wpview&&(b=e.plugins.wpview.getView(d)))c=b.getBoundingClientRect();else{a=e.selection.getRng();try{c=a.getClientRects()[0]}catch(f){}c||(c=d.getBoundingClientRect())}return c.height?c:!1}function g(a){var b=a.keyCode;47>=b&&b!==q.SPACEBAR&&b!==q.ENTER&&b!==q.DELETE&&b!==q.BACKSPACE&&b!==q.UP&&b!==q.LEFT&&b!==q.DOWN&&b!==q.UP||b>=91&&93>=b||b>=112&&123>=b||144===b||145===b||h(b)}function h(b){var c,d,g,h,i=f(),j=50;i&&(c=i.top+e.iframeElement.getBoundingClientRect().top,d=c+i.height,c-=j,d+=j,g=T.adminBarHeight+T.toolsHeight+T.menuBarHeight+T.visualTopHeight,h=T.windowHeight-(S?T.bottomHeight+T.statusBarHeight:0),h-gc&&(b===q.UP||b===q.LEFT||b===q.BACKSPACE)?a.scrollTo(a.pageXOffset,c+a.pageYOffset-g):d>h&&a.scrollTo(a.pageXOffset,d+a.pageYOffset-h)))}function k(a){a.state||j()}function m(){c.on("scroll.mce-float-panels",t),setTimeout(function(){e.execCommand("wpAutoResize"),j()},300)}function n(){c.off("scroll.mce-float-panels"),setTimeout(function(){var b=s.offset().top;a.pageYOffset>b&&a.scrollTo(a.pageXOffset,b-T.adminBarHeight),i(),j()},100),j()}function o(){S=!S}var q=a.tinymce.util.VK,t=_.debounce(function(){!b(".mce-floatpanel:hover").length&&a.tinymce.ui.FloatPanel.hideAll(),b(".mce-tooltip").hide()},1e3,!0);"content"===e.id&&(p=e,e.settings.autoresize_min_height=Q,u=s.find(".mce-toolbar-grp"),v=s.find(".mce-edit-area"),B=s.find(".mce-statusbar"),A=s.find(".mce-menubar"),G=function(){e.on("keyup",g),e.on("show",m),e.on("hide",n),e.on("wp-toolbar-toggle",o),e.on("setcontent wp-autoresize wp-toolbar-toggle",j),e.on("undo redo",h),e.on("FullscreenStateChanged",k),c.off("scroll.mce-float-panels").on("scroll.mce-float-panels",t)},H=function(){e.off("keyup",g),e.off("show",m),e.off("hide",n),e.off("wp-toolbar-toggle",o),e.off("setcontent wp-autoresize wp-toolbar-toggle",j),e.off("undo redo",h),e.off("FullscreenStateChanged",k),c.off("scroll.mce-float-panels")},r.hasClass("wp-editor-expand")&&(G(),l(j)))}),r.hasClass("wp-editor-expand")&&(n(),s.hasClass("html-active")&&l(function(){j(),i()})),b("#adv-settings .editor-expand").show(),b("#editor-expand-toggle").on("change.editor-expand",function(){b(this).prop("checked")?(n(),a.setUserSetting("editor_expand","on")):(o(),a.setUserSetting("editor_expand","off"))}),a.editorExpand={on:n,off:o}}),b(function(){function g(){R||(R=!0,d.trigger("dfw-activate"),K.on("keydown.focus-shortcut",u))}function h(){R&&(k(),R=!1,d.trigger("dfw-deactivate"),K.off("keydown.focus-shortcut"))}function i(){return R}function j(){!S&&R&&(S=!0,K.on("keydown.focus",n),J.add(K).on("blur.focus",p),n(),a.setUserSetting("post_dfw","on"),d.trigger("dfw-on"))}function k(){S&&(S=!1,J.add(K).off(".focus"),o(),I.off(".focus"),a.setUserSetting("post_dfw","off"),d.trigger("dfw-off"))}function l(){S?k():j()}function m(){return S}function n(b){var d=b&&b.keyCode;return 27===d||87===d&&b.altKey&&b.shiftKey?void o():void(b&&(b.metaKey||b.ctrlKey&&!b.altKey||d&&(47>=d&&8!==d&&13!==d&&32!==d&&46!==d||d>=91&&93>=d||d>=112&&135>=d||d>=144&&150>=d||d>=224))||(v||(v=!0,clearTimeout(E),E=setTimeout(function(){L.show()},600),I.css("z-index",9998),L.on("mouseenter.focus",function(){y=I.offset(),y.right=y.left+I.outerWidth(),y.bottom=y.top+I.outerHeight(),c.on("scroll.focus",function(){var b=a.pageYOffset;C&&B&&C!==b&&(By.bottom+V)&&o(),C=b})}).on("mouseleave.focus",function(){z=A=null,T=U=0,c.off("scroll.focus")}).on("mousemove.focus",function(a){var b=a.pageX,c=a.pageY;if(z&&A&&(b!==z||c!==A))if(A>=c&&c=A&&c>y.bottom||z>=b&&b=z&&b>y.right){if(T+=Math.abs(z-b),U+=Math.abs(A-c),(c<=y.top-V||c>=y.bottom+V||b<=y.left-V||b>=y.right+V)&&(T>10||U>10))return o(),z=A=null,void(T=U=0)}else T=U=0;z=b,A=c}).on("touchstart.focus",function(a){a.preventDefault(),o()}),I.off("mouseenter.focus"),D&&(clearTimeout(D),D=null),G.addClass("focus-on").removeClass("focus-off")),q(),s()))}function o(){v&&(v=!1,clearTimeout(E),E=setTimeout(function(){L.hide()},200),I.css("z-index",""),L.off("mouseenter.focus mouseleave.focus mousemove.focus touchstart.focus"),I.on("mouseenter.focus",function(){(b.contains(I.get(0),document.activeElement)||F)&&n()}),D=setTimeout(function(){D=null,I.off("mouseenter.focus")},1e3),G.addClass("focus-off").removeClass("focus-on")),r(),t()}function p(){setTimeout(function(){function a(a){return b.contains(a.get(0),document.activeElement)}var c=document.activeElement.compareDocumentPosition(I.get(0));2!==c&&4!==c||!(a(O)||a(H)||a(f))||o()},0)}function q(){!w&&v&&(w=!0,e.on("mouseenter.focus",function(){e.addClass("focus-off")}).on("mouseleave.focus",function(){e.removeClass("focus-off")}))}function r(){w&&(w=!1,e.off(".focus"))}function s(){x||!v||M.find(":focus").length||(x=!0,M.stop().fadeTo("fast",.3).on("mouseenter.focus",t).off("mouseleave.focus"),N.on("focus.focus",t).off("blur.focus"))}function t(){x&&(x=!1,M.stop().fadeTo("fast",1).on("mouseleave.focus",s).off("mouseenter.focus"),N.on("blur.focus",s).off("focus.focus"))}function u(a){a.altKey&&a.shiftKey&&87===a.keyCode&&l()}var v,w,x,y,z,A,B,C,D,E,F,G=b(document.body),H=b("#wpcontent"),I=b("#post-body-content"),J=b("#title"),K=b("#content"),L=b(document.createElement("DIV")),M=b("#edit-slug-box"),N=M.find("a").add(M.find("button")).add(M.find("input")),O=b("#adminmenuwrap"),P=b(),Q=b(),R="on"===a.getUserSetting("editor_expand","on"),S=R?"on"===a.getUserSetting("post_dfw"):!1,T=0,U=0,V=20;G.append(L),L.css({display:"none",position:"fixed",top:e.height(),right:0,bottom:0,left:0,"z-index":9997}),I.css({position:"relative"}),c.on("mousemove.focus",function(a){B=a.pageY}),b("#postdivrich").hasClass("wp-editor-expand")&&K.on("keydown.focus-shortcut",u),d.on("tinymce-editor-setup.focus",function(a,b){b.addButton("dfw",{active:S,classes:"wp-dfw btn widget",disabled:!R,onclick:l,onPostRender:function(){var a=this;d.on("dfw-activate.focus",function(){a.disabled(!1)}).on("dfw-deactivate.focus",function(){a.disabled(!0)}).on("dfw-on.focus",function(){a.active(!0)}).on("dfw-off.focus",function(){a.active(!1)})},tooltip:"Distraction Free Writing",shortcut:"Alt+Shift+W"}),b.addCommand("wpToggleDFW",l),b.addShortcut("alt+shift+w","","wpToggleDFW")}),d.on("tinymce-editor-init.focus",function(a,c){function e(){F=!0}function f(){F=!1}var g,h;"content"===c.id&&(P=b(c.getWin()),Q=b(c.getContentAreaContainer()).find("iframe"),g=function(){c.on("keydown",n),c.on("blur",p),c.on("focus",e),c.on("blur",f)},h=function(){c.off("keydown",n),c.off("blur",p),c.off("focus",e),c.off("blur",f)},S&&g(),d.on("dfw-on.focus",g).on("dfw-off.focus",h),c.on("click",function(a){a.target===c.getDoc().documentElement&&c.focus()}))}),d.on("quicktags-init",function(a,c){var d;c.settings.buttons&&-1!==(","+c.settings.buttons+",").indexOf(",dfw,")&&(d=b("#"+c.name+"_dfw"),b(document).on("dfw-activate",function(){d.prop("disabled",!1)}).on("dfw-deactivate",function(){d.prop("disabled",!0)}).on("dfw-on",function(){d.addClass("active")}).on("dfw-off",function(){d.removeClass("active")}))}),d.on("editor-expand-on.focus",g).on("editor-expand-off.focus",h),S&&(K.on("keydown.focus",n),J.add(K).on("blur.focus",p)),a.wp=a.wp||{},a.wp.editor=a.wp.editor||{},a.wp.editor.dfw={activate:g,deactivate:h,isActive:i,on:j,off:k,toggle:l,isOn:m}})}(window,window.jQuery); \ No newline at end of file diff --git a/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.js b/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.js index 9e0940e9e7..6a03aba7b6 100644 --- a/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.js +++ b/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.js @@ -56,8 +56,6 @@ tinymce.PluginManager.add( 'wpfullscreen', function( editor ) { if ( editor.getParam('wp_fullscreen') ) { fullscreenOn(); } - - editor.addShortcut( 'alt+shift+w', '', 'wpFullScreen' ); }); // Register buttons diff --git a/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.min.js b/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.min.js index 22295c3750..5ab4ee5fa8 100644 --- a/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.min.js +++ b/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.min.js @@ -1 +1 @@ -tinymce.PluginManager.add("wpfullscreen",function(a){function b(){f.wp_fullscreen=!0,a.dom.addClass(a.getDoc().documentElement,"wp-fullscreen"),a.execCommand("wpAutoResizeOn")}function c(){f.wp_fullscreen=!1,a.dom.removeClass(a.getDoc().documentElement,"wp-fullscreen"),a.execCommand("wpAutoResizeOff")}function d(){return"undefined"!=typeof wp&&wp.editor&&wp.editor.fullscreen}function e(){var b=d();b&&(a.getParam("wp_fullscreen")?b.off():b.on())}var f=a.settings;a.addCommand("wpFullScreenOn",b),a.addCommand("wpFullScreenOff",c),a.addCommand("wpFullScreen",e),a.on("keydown",function(a){var b;27===a.keyCode&&(b=d())&&b.settings.visible&&b.off()}),a.on("init",function(){a.getParam("wp_fullscreen")&&b(),a.addShortcut("alt+shift+w","","wpFullScreen")}),a.addButton("wp_fullscreen",{tooltip:"Distraction Free Writing",shortcut:"Alt+Shift+W",onclick:e,classes:"wp-fullscreen btn widget"}),a.addMenuItem("wp_fullscreen",{text:"Distraction Free Writing",icon:"wp_fullscreen",shortcut:"Alt+Shift+W",context:"view",onclick:e})}); \ No newline at end of file +tinymce.PluginManager.add("wpfullscreen",function(a){function b(){f.wp_fullscreen=!0,a.dom.addClass(a.getDoc().documentElement,"wp-fullscreen"),a.execCommand("wpAutoResizeOn")}function c(){f.wp_fullscreen=!1,a.dom.removeClass(a.getDoc().documentElement,"wp-fullscreen"),a.execCommand("wpAutoResizeOff")}function d(){return"undefined"!=typeof wp&&wp.editor&&wp.editor.fullscreen}function e(){var b=d();b&&(a.getParam("wp_fullscreen")?b.off():b.on())}var f=a.settings;a.addCommand("wpFullScreenOn",b),a.addCommand("wpFullScreenOff",c),a.addCommand("wpFullScreen",e),a.on("keydown",function(a){var b;27===a.keyCode&&(b=d())&&b.settings.visible&&b.off()}),a.on("init",function(){a.getParam("wp_fullscreen")&&b()}),a.addButton("wp_fullscreen",{tooltip:"Distraction Free Writing",shortcut:"Alt+Shift+W",onclick:e,classes:"wp-fullscreen btn widget"}),a.addMenuItem("wp_fullscreen",{text:"Distraction Free Writing",icon:"wp_fullscreen",shortcut:"Alt+Shift+W",context:"view",onclick:e})}); \ 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 1601b1f15d474b02491ad7ee3acd9f39b892e5c4..d0f988b5d14d7cc74f73f0699eb2dbb09fb63e60 100644 GIT binary patch delta 4031 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 delta 4038 zcmV;%4>|DNr3mDu2!MnEv;s>5e_Bz5EJrq=B}%bmMHR+Y(NZZXQFZ})kPu0L#3AYc z-X+hHC(C?2SI@CHZ08S&-JPACqo=2*kFWn91bdd>0o8>o&MwJ28>o@|z;-1`(HMeW zt?h)>-H`a;oGc5nnN7B(=M8ilncgxsy^YlER$$UAI#B&OL(xDPq1?0(tZWl;slwyTKLh&Dw<6JI2$J&~m6 zwYH9mTjl0GGb?G++~Cbq{#o8UD++)%hY1;f9R*A=r_?p4M^au|r6nJb($i8B!eE%v z+eJgLxnbq?QRfh~h6pcLe=`IC3rSlx&26@BS`nhI4CDE|ctiW_LnhO1``K}0jpl4; zEA%_A-qP82Eh+v?u~ss?w~RxlDaC~C6t^vHGPD^%TRHX=Oe`v5V$tc4{Au3(xy0Tj+Gf|NcHJ*3xnI=w;8B``e@7+p9nx*leL|O7 z3pko7{8oekleLdyfD>YPnn35p4_mRl(qmo33Pz5-d*p2Ir99KRe0MROO{T{anJr2b z3DfMQJyJWNu^hq+?OZNh^e^|Gf(}zRxiN(Lh_iEp+6buh%JJk}SwtQ~;dwl{)uxgx zv|adAlZDDBBydtuf787Jh&hD@yk{#+NM`*u69Bq!V5zf>WWCpKFn(}(|K3?-hxK_D zn^y_$^Dp~b?ZJK9@D z+O97TzRA$@d>z>xYM$-MeaTHw%83j4 zrWzb&2F_j-fAIm34Egr@mumj<>g)$4<3to9GOQLwUu-H`tD>88_7LVLVRTCnPzUxh zXcou0+>lH~)IC(mRNM+*tf}zpZ{_5-**S3K0ly|**H`twiwHlBw zwqz5Gki-iQ@T*13*;g=%j{l4Ycj85u2cPaVAp`vhe_yZbcIpPuZgk&b2^kcMg#Fqo z5|1t_?F|X;)4?g`P3#W|%LqW+(sDsT-psY7=flAO9OoB$8+b9p5HE%m0A5V7u0&g& zH5)MqC5qF-$F%;{RwWIUNt((4cNNZVEI6t|>+Bhgqk)uP0TQJFM7?(_F)N)8#ByM8 zI=6l@f6qoUAtB2-`cXXGdpjMW?d?q4NxEbr`Gvmq*80p;PQnjc`5uy1%N*A6WDIUQ zD91r_BTQBV{#HZFOv;3hqw1D5baz+^mF{jAE}~v(WFZYnAk}L!!2E7{`aZ51FUUe> zzAGROe`>EtgXgiqi;@L3L3u_;vD?of6`r&cd;a0aD;@J88la%B(us`q6T_8wu;h`9?Vf+GLL9~q{Y z_K(uL2@6|HO#HliXW2^m}Xouy&HIh*M;9znf4^ ze{4&&OCtBjWb~FY&tY|sL_Ys!1~)bA0h9+z`=hFd(&f%|TQwu85k=wVMvEJARF#S< zrpSN@pEtB`*4&4znd)mo(XcM9Vm}G861@nPFVM{zTmdx`zXH6ikL~X4-KDchm*z|% zNbA64w=wy!B^sQ6bEWl7I0)6D>Z4|qe^Rn(u7hdrKP0hFB8X6^k(uy1`sscp2CoZW zHZg!k(utQ%({7P$n@3LdrVM+-6=y85I;B}~dxPhu{iRQ^I=@`o+}j4Dy}(ASA#-o9 zv5~A_eg*8Lg@v`Zzkgru!P5Rte+QltLWg$QwFu+85k)Cu%FaM>F=$JThC5n)fB%L~ zmfHipgg3A;=IRh163lmvA*Kre~@lzoy?#& zaI!$I3~yjEVWC?Kj~=Z3{`SI-70alL7=EbECBzPw!U*C-4+?!o28pR_7i;dxWa5hj%Q;u=Lq|1JLNSjt$kXcP(1(mpY*zNQ#l1&JEqm0L(OCYUEarsKpvsT8E&sG1btmq| z?q;pSSge%BD`#|$fg7eyjG~2ZloK>24NiPK*l>IJe-E3IRUkLwN8iqr-I_Zf zjMvkudONthsHWK`C}KZD5&R{O$+p?k{K4qepj?h#P4MSj>9AWs5M`qQZV;PcTo*^3B+>OVFkwIKlk5`dD4=?<0ur5FjQDKA&ID`rXq9rw`tV8z4_{`!5o{ z>y>X&;?b5m;iP1%I=)m}=n9o_+$8s+(L4a9&kp7joKI#>LNA-;Cf4Wlt5boD@?yi~ zM_V}lGt$BFU*tL?fB&0Oms>ZEQGUKA@addK9bM!fe;SKkilUfjS@KE(!o*7U>L(W} zHV2BV4{#tnO8~D-_@^FGq}}@HO2reYH!js1ou)S&%W9m(O4&11v+I$GG+SG~j-W+A z^Xn(jZcxi)F1qT8jN4KD8N^#x9jRy?I4q(U@p3An-6=$IN<-;Zn7P#x!Q+Mmvb7$Wr4tYxOIoE|u;!CRaV{f>or7xY(AC1hNTYXB zwXf2vmE+@L#8(WJR6G&1{bx*BMMs*Fgz}eHf23qWCQK%s!`amLduSzX^PyI*V0!oW zZL92EM5F>@;2+gz{KVN`{7ltJ%F(};#%D@uP4#if;X7K>Y6JIMo!+{-RCKmAh~sUs zRjIAV^dq=|46%6;nOrT#WX^&eS1sN^wfRrjX`pIOSfiQZX zf8^Wy>dY_b?d-ICi^F1tyVR$d?%gTcL-2^LZVc4l(fELw)xtpZj&CNP_`Qq=d)h@oaf8ev9 z-~NOiaHNc(drd6|79GE5TOIfsIXlRqY;I#Ku96vCA4$GUX7>0m<~+B@2Ytnzlp?iJ zd@8y1MQEadia;4<&gde$&LP?j;fua-b=UCemqkxt#-ezQWO9H5wGJbP>~xb)kkesY zoq)gXHo4i9f8Yk=`&?|IQ|BWYe_hH@el-awe}j!&Hi`V4S);@{2wHU`{Y*u{V9uO6 z#a2-{OU|tG+&|K}a(YPu2{vb+=2I=3Ri5IdLE?0VJ(Yp!s*`dQ^erZMs^n#f76Mvn7NIi z2p)!Co0}Mm2($Xr7**?1tjLz;L7MqX#?`9zvp28w6XM8bY_{cFhd$rhhGnhgSZ1!! zAU0cy<&tc*_B}SOqsGGhbMdGvDi{AVMBHL&`y-B1aGVS@HD!Nv3LDm=Gh(V4-q5pA z`8{(G{cy&1h-j<@7g`)se}4KE_zt7wQ%b5HE8UQ=9Uj4Y(@nVr#d^OlUrsaWKrwW6 z!RA~K9zmp7q);(+oLF|})6+HXfRXQ-iq=B#814Srqxv~R=&|6-BjTaj1ebltDe>4f znps>{gXv2+nSUHyCKJ!$y7uK>79Y#5@^ULr+I6!N>*d3I4(kKXxg=JOPGd0{Stc% sUggT`1ZVAT34|4MRb|>EWw=VaPQfou!7rxZ7kHxo4?{E3jp{lE0CHd3CjbBd diff --git a/wp-includes/version.php b/wp-includes/version.php index f63122bda5..e4a88b8c9e 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.1-beta2-30592'; +$wp_version = '4.1-beta2-30593'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.