From f184243aa34761486c486899401f008abe6be789 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Fri, 16 May 2014 18:17:14 +0000 Subject: [PATCH] DFW: fix closing only the wpLink or media modal when pressing Esc. Built from https://develop.svn.wordpress.org/trunk@28455 git-svn-id: http://core.svn.wordpress.org/trunk@28282 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/js/wp-fullscreen.js | 3 +- wp-admin/js/wp-fullscreen.min.js | 2 +- .../js/tinymce/plugins/wpfullscreen/plugin.js | 32 +++++++++++------- .../plugins/wpfullscreen/plugin.min.js | 2 +- wp-includes/js/tinymce/wp-tinymce.js.gz | Bin 123061 -> 123072 bytes 5 files changed, 23 insertions(+), 16 deletions(-) diff --git a/wp-admin/js/wp-fullscreen.js b/wp-admin/js/wp-fullscreen.js index a00940cd66..de73060ae5 100644 --- a/wp-admin/js/wp-fullscreen.js +++ b/wp-admin/js/wp-fullscreen.js @@ -510,10 +510,11 @@ } }); - $( window ).on( 'keyup', function( event ) { + $( window ).on( 'keydown.wp-fullscreen', function( event ) { // Turn fullscreen off when Esc is pressed. if ( 27 === event.keyCode && s.visible ) { api.off(); + event.stopImmediatePropagation(); } }); diff --git a/wp-admin/js/wp-fullscreen.min.js b/wp-admin/js/wp-fullscreen.min.js index 326387fe65..54044868df 100644 --- a/wp-admin/js/wp-fullscreen.min.js +++ b/wp-admin/js/wp-fullscreen.min.js @@ -1 +1 @@ -!function(a,b){function c(){m.removeClass("wp-dfw-show-ui")}function d(b){g.$dfwWrap.parents().each(function(c,d){var e,f=a(d);return b?(d.style.position&&f.data("wp-dfw-css-position",d.style.position),f.css("position","static")):(e=f.data("wp-dfw-css-position"),e=e||"",f.css("position",e)),"BODY"===d.nodeName?!1:void 0})}var e,f,g,h,i,j,k=0,l="transitionend webkitTransitionEnd",m=a(document.body),n=a(document);j=function(){this.topics={},this.subscribe=function(a,b){return this.topics[a]||(this.topics[a]=[]),this.topics[a].push(b),b},this.unsubscribe=function(a,b){var c,d,e=this.topics[a];if(!e)return b||[];if(b){for(c=0,d=e.length;d>c;c++)b==e[c]&&e.splice(c,1);return b}return this.topics[a]=[],e},this.publish=function(a,b){var c,d,e,f=this.topics[a];if(f){for(b=b||[],c=0,d=f.length;d>c;c++)e=f[c].apply(null,b)===!1||e;return!e}}},e={},f=e.pubsub=new j,g=e.settings={visible:!1,mode:"tinymce",id:"",title_id:"",timer:0,toolbar_shown:!1},h=e.toggleUI=function(a){clearTimeout(i),m.hasClass("wp-dfw-show-ui")&&"show"!==a?"autohide"!==a&&m.removeClass("wp-dfw-show-ui"):m.addClass("wp-dfw-show-ui"),"autohide"===a&&(i=setTimeout(c,2e3))},e.on=function(){var c,d,f;if(!g.visible){if(g.$fullscreenFader||e.ui.init(),"object"==typeof b.wp_fullscreen_settings&&a.extend(g,b.wp_fullscreen_settings),c=g.id||b.wpActiveEditor,!c){if(!g.hasTinymce)return;c=tinymce.activeEditor.id}g.id=c,d=g.$dfwWrap=a("#wp-"+c+"-wrap"),d.length&&(g.$dfwTextarea=a("#"+c),g.$editorContainer=d.find(".wp-editor-container"),k=n.scrollTop(),g.hasTinymce&&(g.editor=tinymce.get(c)),g.editor&&!g.editor.isHidden()?(g.origHeight=a("#"+c+"_ifr").height(),g.mode="tinymce"):(g.origHeight=g.$dfwTextarea.height(),g.mode="html"),f="undefined"==typeof b.adminpage||"post-php"!==b.adminpage&&"post-new-php"!==b.adminpage?c+"-title":"title",g.$dfwTitle=a("#"+f),g.$dfwTitle.length||(g.$dfwTitle=null),e.ui.fade("show","showing","shown"))}},e.off=function(){g.visible&&e.ui.fade("hide","hiding","hidden")},e.switchmode=function(a){var b=g.mode;return a&&g.visible&&g.hasTinymce&&"undefined"!=typeof switchEditors?b==a?b:("tinymce"!==a||g.editor||(g.editor=tinymce.get(g.id),!g.editor&&"undefined"!=typeof tinyMCEPreInit&&tinyMCEPreInit.mceInit&&tinyMCEPreInit.mceInit[g.id]&&(tinyMCEPreInit.mceInit[g.id].wp_fullscreen=!0)),g.mode=a,switchEditors.go(g.id,a),e.refreshButtons(!0),"html"===a&&setTimeout(e.resizeTextarea,200),a):b},e.save=function(){var c=a("#hiddenaction"),d=c.val(),e=a("#wp-fullscreen-save .spinner"),f=a("#wp-fullscreen-save .wp-fullscreen-saved-message"),h=a("#wp-fullscreen-save .wp-fullscreen-error-message");e.show(),h.hide(),f.hide(),c.val("wp-fullscreen-save-post"),g.editor&&!g.editor.isHidden()&&g.editor.save(),a.ajax({url:b.ajaxurl,type:"post",data:a("form#post").serialize(),dataType:"json"}).done(function(b){e.hide(),b&&b.success?(f.show(),setTimeout(function(){f.fadeOut(300)},3e3),b.data&&b.data.last_edited&&a("#wp-fullscreen-save input").attr("title",b.data.last_edited)):h.show()}).fail(function(){e.hide(),h.show()}),c.val(d)},e.dfwWidth=function(b,c){var d;return b&&-1!==b.toString().indexOf("%")?(g.$editorContainer.css("width",b),g.$statusbar.css("width",b),void(g.$dfwTitle&&g.$dfwTitle.css("width",b))):b?(c?d=b:(d=g.$editorContainer.width(),d+=b),void(200>d||d>1200||(g.$editorContainer.width(d),g.$statusbar.width(d),g.$dfwTitle&&g.$dfwTitle.width(d-16),setUserSetting("dfw_width",d)))):(d=a("#wp-fullscreen-body").data("theme-width")||800,g.$editorContainer.width(d),g.$statusbar.width(d),g.$dfwTitle&&g.$dfwTitle.width(d-16),void deleteUserSetting("dfw_width"))},f.subscribe("show",function(){var b=a("#last-edit").text();b&&a("#wp-fullscreen-save input").attr("title",b)}),f.subscribe("showing",function(){m.addClass("wp-fullscreen-active"),g.$dfwWrap.addClass("wp-fullscreen-wrap"),g.$dfwTitle&&(g.$dfwTitle.after(''),g.$dfwWrap.prepend(g.$dfwTitle.addClass("wp-fullscreen-title"))),e.refreshButtons(),d(!0),a("#wpadminbar").hide(),h("autohide"),e.bind_resize(),g.editor&&g.editor.execCommand("wpFullScreenOn"),"ontouchstart"in b?e.dfwWidth("90%"):e.dfwWidth(a("#wp-fullscreen-body").data("dfw-width")||800,!0),scrollTo(0,0)}),f.subscribe("shown",function(){g.visible=!0,g.editor&&!g.editor.isHidden()?g.editor.execCommand("wpAutoResize"):e.resizeTextarea("force")}),f.subscribe("hide",function(){n.unbind(".fullscreen"),g.$dfwTextarea.unbind(".wp-dfw-resize")}),f.subscribe("hiding",function(){m.removeClass("wp-fullscreen-active"),g.$dfwTitle&&a("#wp-fullscreen-title-placeholder").before(g.$dfwTitle.removeClass("wp-fullscreen-title").css("width","")).remove(),g.$dfwWrap.removeClass("wp-fullscreen-wrap"),g.$editorContainer.css("width",""),g.$dfwTextarea.add("#"+g.id+"_ifr").height(g.origHeight),g.editor&&g.editor.execCommand("wpFullScreenOff"),d(!1),b.scrollTo(0,k),a("#wpadminbar").show()}),f.subscribe("hidden",function(){g.visible=!1}),e.refreshButtons=function(b){"html"===g.mode?(a("#wp-fullscreen-mode-bar").removeClass("wp-tmce-mode").addClass("wp-html-mode").find("a").removeClass("active").filter(".wp-fullscreen-mode-html").addClass("active"),b?a("#wp-fullscreen-button-bar").fadeOut(150,function(){a(this).addClass("wp-html-mode").fadeIn(150)}):a("#wp-fullscreen-button-bar").addClass("wp-html-mode")):"tinymce"===g.mode&&(a("#wp-fullscreen-mode-bar").removeClass("wp-html-mode").addClass("wp-tmce-mode").find("a").removeClass("active").filter(".wp-fullscreen-mode-tinymce").addClass("active"),b?a("#wp-fullscreen-button-bar").fadeOut(150,function(){a(this).removeClass("wp-html-mode").fadeIn(150)}):a("#wp-fullscreen-button-bar").removeClass("wp-html-mode"))},e.ui={init:function(){var c;g.toolbar=c=a("#fullscreen-topbar"),g.$fullscreenFader=a("#fullscreen-fader"),g.$statusbar=a("#wp-fullscreen-status"),g.hasTinymce="undefined"!=typeof tinymce,g.hasTinymce||a("#wp-fullscreen-mode-bar").hide(),n.keyup(function(a){var b,c=a.keyCode||a.charCode;g.visible&&(b=navigator.platform&&-1!==navigator.platform.indexOf("Mac")?a.ctrlKey:a.altKey,!b||61!==c&&107!==c&&187!==c||(e.dfwWidth(25),a.preventDefault()),!b||45!==c&&109!==c&&189!==c||(e.dfwWidth(-25),a.preventDefault()),b&&48===c&&(e.dfwWidth(0),a.preventDefault()))}),a(b).on("keyup",function(a){27===a.keyCode&&g.visible&&e.off()}),"ontouchstart"in b&&m.addClass("wp-dfw-touch"),c.on("mouseenter",function(){h("show")}).on("mouseleave",function(){h("autohide")}),a("#wp-fullscreen-buttons").on("click.wp-fullscreen","button",function(a){var c=a.currentTarget.id?a.currentTarget.id.substr(6):null;if(g.editor&&"tinymce"===g.mode)switch(c){case"bold":g.editor.execCommand("Bold");break;case"italic":g.editor.execCommand("Italic");break;case"bullist":g.editor.execCommand("InsertUnorderedList");break;case"numlist":g.editor.execCommand("InsertOrderedList");break;case"link":g.editor.execCommand("WP_Link");break;case"unlink":g.editor.execCommand("unlink");break;case"help":g.editor.execCommand("WP_Help");break;case"blockquote":g.editor.execCommand("mceBlockQuote")}else"link"===c&&b.wpLink&&b.wpLink.open();"wp-media-library"===c&&"undefined"!=typeof wp&&wp.media&&wp.media.editor&&wp.media.editor.open(g.id)})},fade:function(a,b,c){g.$fullscreenFader||e.ui.init(),(!a||f.publish(a))&&e.fade.In(g.$fullscreenFader,200,function(){b&&f.publish(b),e.fade.Out(g.$fullscreenFader,200,function(){c&&f.publish(c)})})}},e.fade={sensitivity:100,In:function(b,c,d,f){if(d=d||a.noop,c=c||400,f=f||!1,e.fade.transitions){if(b.is(":visible"))return b.addClass("fade-trigger"),b;b.show(),b.first().one(l,function(){d()}),setTimeout(function(){b.addClass("fade-trigger")},this.sensitivity)}else f&&b.stop(),b.css("opacity",1),b.first().fadeIn(c,d),b.length>1&&b.not(":first").fadeIn(c);return b},Out:function(b,c,d,f){return d=d||a.noop,c=c||400,f=f||!1,b.is(":visible")?(e.fade.transitions?(b.first().one(l,function(){b.hasClass("fade-trigger")||(b.hide(),d())}),setTimeout(function(){b.removeClass("fade-trigger")},this.sensitivity)):(f&&b.stop(),b.first().fadeOut(c,d),b.length>1&&b.not(":first").fadeOut(c)),b):b},transitions:function(){var a=document.documentElement.style;return"string"==typeof a.WebkitTransition||"string"==typeof a.MozTransition||"string"==typeof a.OTransition||"string"==typeof a.transition}()},e.bind_resize=function(){g.$dfwTextarea.on("keydown.wp-dfw-resize click.wp-dfw-resize paste.wp-dfw-resize",function(){e.resizeTextarea()})},e.resizeTextarea=function(){var a=g.$dfwTextarea[0];a.scrollHeight>a.clientHeight&&(a.style.height=a.scrollHeight+50+"px")},b.wp=b.wp||{},b.wp.editor=b.wp.editor||{},b.wp.editor.fullscreen=e}(jQuery,window); \ No newline at end of file +!function(a,b){function c(){m.removeClass("wp-dfw-show-ui")}function d(b){g.$dfwWrap.parents().each(function(c,d){var e,f=a(d);return b?(d.style.position&&f.data("wp-dfw-css-position",d.style.position),f.css("position","static")):(e=f.data("wp-dfw-css-position"),e=e||"",f.css("position",e)),"BODY"===d.nodeName?!1:void 0})}var e,f,g,h,i,j,k=0,l="transitionend webkitTransitionEnd",m=a(document.body),n=a(document);j=function(){this.topics={},this.subscribe=function(a,b){return this.topics[a]||(this.topics[a]=[]),this.topics[a].push(b),b},this.unsubscribe=function(a,b){var c,d,e=this.topics[a];if(!e)return b||[];if(b){for(c=0,d=e.length;d>c;c++)b==e[c]&&e.splice(c,1);return b}return this.topics[a]=[],e},this.publish=function(a,b){var c,d,e,f=this.topics[a];if(f){for(b=b||[],c=0,d=f.length;d>c;c++)e=f[c].apply(null,b)===!1||e;return!e}}},e={},f=e.pubsub=new j,g=e.settings={visible:!1,mode:"tinymce",id:"",title_id:"",timer:0,toolbar_shown:!1},h=e.toggleUI=function(a){clearTimeout(i),m.hasClass("wp-dfw-show-ui")&&"show"!==a?"autohide"!==a&&m.removeClass("wp-dfw-show-ui"):m.addClass("wp-dfw-show-ui"),"autohide"===a&&(i=setTimeout(c,2e3))},e.on=function(){var c,d,f;if(!g.visible){if(g.$fullscreenFader||e.ui.init(),"object"==typeof b.wp_fullscreen_settings&&a.extend(g,b.wp_fullscreen_settings),c=g.id||b.wpActiveEditor,!c){if(!g.hasTinymce)return;c=tinymce.activeEditor.id}g.id=c,d=g.$dfwWrap=a("#wp-"+c+"-wrap"),d.length&&(g.$dfwTextarea=a("#"+c),g.$editorContainer=d.find(".wp-editor-container"),k=n.scrollTop(),g.hasTinymce&&(g.editor=tinymce.get(c)),g.editor&&!g.editor.isHidden()?(g.origHeight=a("#"+c+"_ifr").height(),g.mode="tinymce"):(g.origHeight=g.$dfwTextarea.height(),g.mode="html"),f="undefined"==typeof b.adminpage||"post-php"!==b.adminpage&&"post-new-php"!==b.adminpage?c+"-title":"title",g.$dfwTitle=a("#"+f),g.$dfwTitle.length||(g.$dfwTitle=null),e.ui.fade("show","showing","shown"))}},e.off=function(){g.visible&&e.ui.fade("hide","hiding","hidden")},e.switchmode=function(a){var b=g.mode;return a&&g.visible&&g.hasTinymce&&"undefined"!=typeof switchEditors?b==a?b:("tinymce"!==a||g.editor||(g.editor=tinymce.get(g.id),!g.editor&&"undefined"!=typeof tinyMCEPreInit&&tinyMCEPreInit.mceInit&&tinyMCEPreInit.mceInit[g.id]&&(tinyMCEPreInit.mceInit[g.id].wp_fullscreen=!0)),g.mode=a,switchEditors.go(g.id,a),e.refreshButtons(!0),"html"===a&&setTimeout(e.resizeTextarea,200),a):b},e.save=function(){var c=a("#hiddenaction"),d=c.val(),e=a("#wp-fullscreen-save .spinner"),f=a("#wp-fullscreen-save .wp-fullscreen-saved-message"),h=a("#wp-fullscreen-save .wp-fullscreen-error-message");e.show(),h.hide(),f.hide(),c.val("wp-fullscreen-save-post"),g.editor&&!g.editor.isHidden()&&g.editor.save(),a.ajax({url:b.ajaxurl,type:"post",data:a("form#post").serialize(),dataType:"json"}).done(function(b){e.hide(),b&&b.success?(f.show(),setTimeout(function(){f.fadeOut(300)},3e3),b.data&&b.data.last_edited&&a("#wp-fullscreen-save input").attr("title",b.data.last_edited)):h.show()}).fail(function(){e.hide(),h.show()}),c.val(d)},e.dfwWidth=function(b,c){var d;return b&&-1!==b.toString().indexOf("%")?(g.$editorContainer.css("width",b),g.$statusbar.css("width",b),void(g.$dfwTitle&&g.$dfwTitle.css("width",b))):b?(c?d=b:(d=g.$editorContainer.width(),d+=b),void(200>d||d>1200||(g.$editorContainer.width(d),g.$statusbar.width(d),g.$dfwTitle&&g.$dfwTitle.width(d-16),setUserSetting("dfw_width",d)))):(d=a("#wp-fullscreen-body").data("theme-width")||800,g.$editorContainer.width(d),g.$statusbar.width(d),g.$dfwTitle&&g.$dfwTitle.width(d-16),void deleteUserSetting("dfw_width"))},f.subscribe("show",function(){var b=a("#last-edit").text();b&&a("#wp-fullscreen-save input").attr("title",b)}),f.subscribe("showing",function(){m.addClass("wp-fullscreen-active"),g.$dfwWrap.addClass("wp-fullscreen-wrap"),g.$dfwTitle&&(g.$dfwTitle.after(''),g.$dfwWrap.prepend(g.$dfwTitle.addClass("wp-fullscreen-title"))),e.refreshButtons(),d(!0),a("#wpadminbar").hide(),h("autohide"),e.bind_resize(),g.editor&&g.editor.execCommand("wpFullScreenOn"),"ontouchstart"in b?e.dfwWidth("90%"):e.dfwWidth(a("#wp-fullscreen-body").data("dfw-width")||800,!0),scrollTo(0,0)}),f.subscribe("shown",function(){g.visible=!0,g.editor&&!g.editor.isHidden()?g.editor.execCommand("wpAutoResize"):e.resizeTextarea("force")}),f.subscribe("hide",function(){n.unbind(".fullscreen"),g.$dfwTextarea.unbind(".wp-dfw-resize")}),f.subscribe("hiding",function(){m.removeClass("wp-fullscreen-active"),g.$dfwTitle&&a("#wp-fullscreen-title-placeholder").before(g.$dfwTitle.removeClass("wp-fullscreen-title").css("width","")).remove(),g.$dfwWrap.removeClass("wp-fullscreen-wrap"),g.$editorContainer.css("width",""),g.$dfwTextarea.add("#"+g.id+"_ifr").height(g.origHeight),g.editor&&g.editor.execCommand("wpFullScreenOff"),d(!1),b.scrollTo(0,k),a("#wpadminbar").show()}),f.subscribe("hidden",function(){g.visible=!1}),e.refreshButtons=function(b){"html"===g.mode?(a("#wp-fullscreen-mode-bar").removeClass("wp-tmce-mode").addClass("wp-html-mode").find("a").removeClass("active").filter(".wp-fullscreen-mode-html").addClass("active"),b?a("#wp-fullscreen-button-bar").fadeOut(150,function(){a(this).addClass("wp-html-mode").fadeIn(150)}):a("#wp-fullscreen-button-bar").addClass("wp-html-mode")):"tinymce"===g.mode&&(a("#wp-fullscreen-mode-bar").removeClass("wp-html-mode").addClass("wp-tmce-mode").find("a").removeClass("active").filter(".wp-fullscreen-mode-tinymce").addClass("active"),b?a("#wp-fullscreen-button-bar").fadeOut(150,function(){a(this).removeClass("wp-html-mode").fadeIn(150)}):a("#wp-fullscreen-button-bar").removeClass("wp-html-mode"))},e.ui={init:function(){var c;g.toolbar=c=a("#fullscreen-topbar"),g.$fullscreenFader=a("#fullscreen-fader"),g.$statusbar=a("#wp-fullscreen-status"),g.hasTinymce="undefined"!=typeof tinymce,g.hasTinymce||a("#wp-fullscreen-mode-bar").hide(),n.keyup(function(a){var b,c=a.keyCode||a.charCode;g.visible&&(b=navigator.platform&&-1!==navigator.platform.indexOf("Mac")?a.ctrlKey:a.altKey,!b||61!==c&&107!==c&&187!==c||(e.dfwWidth(25),a.preventDefault()),!b||45!==c&&109!==c&&189!==c||(e.dfwWidth(-25),a.preventDefault()),b&&48===c&&(e.dfwWidth(0),a.preventDefault()))}),a(b).on("keydown.wp-fullscreen",function(a){27===a.keyCode&&g.visible&&(e.off(),a.stopImmediatePropagation())}),"ontouchstart"in b&&m.addClass("wp-dfw-touch"),c.on("mouseenter",function(){h("show")}).on("mouseleave",function(){h("autohide")}),a("#wp-fullscreen-buttons").on("click.wp-fullscreen","button",function(a){var c=a.currentTarget.id?a.currentTarget.id.substr(6):null;if(g.editor&&"tinymce"===g.mode)switch(c){case"bold":g.editor.execCommand("Bold");break;case"italic":g.editor.execCommand("Italic");break;case"bullist":g.editor.execCommand("InsertUnorderedList");break;case"numlist":g.editor.execCommand("InsertOrderedList");break;case"link":g.editor.execCommand("WP_Link");break;case"unlink":g.editor.execCommand("unlink");break;case"help":g.editor.execCommand("WP_Help");break;case"blockquote":g.editor.execCommand("mceBlockQuote")}else"link"===c&&b.wpLink&&b.wpLink.open();"wp-media-library"===c&&"undefined"!=typeof wp&&wp.media&&wp.media.editor&&wp.media.editor.open(g.id)})},fade:function(a,b,c){g.$fullscreenFader||e.ui.init(),(!a||f.publish(a))&&e.fade.In(g.$fullscreenFader,200,function(){b&&f.publish(b),e.fade.Out(g.$fullscreenFader,200,function(){c&&f.publish(c)})})}},e.fade={sensitivity:100,In:function(b,c,d,f){if(d=d||a.noop,c=c||400,f=f||!1,e.fade.transitions){if(b.is(":visible"))return b.addClass("fade-trigger"),b;b.show(),b.first().one(l,function(){d()}),setTimeout(function(){b.addClass("fade-trigger")},this.sensitivity)}else f&&b.stop(),b.css("opacity",1),b.first().fadeIn(c,d),b.length>1&&b.not(":first").fadeIn(c);return b},Out:function(b,c,d,f){return d=d||a.noop,c=c||400,f=f||!1,b.is(":visible")?(e.fade.transitions?(b.first().one(l,function(){b.hasClass("fade-trigger")||(b.hide(),d())}),setTimeout(function(){b.removeClass("fade-trigger")},this.sensitivity)):(f&&b.stop(),b.first().fadeOut(c,d),b.length>1&&b.not(":first").fadeOut(c)),b):b},transitions:function(){var a=document.documentElement.style;return"string"==typeof a.WebkitTransition||"string"==typeof a.MozTransition||"string"==typeof a.OTransition||"string"==typeof a.transition}()},e.bind_resize=function(){g.$dfwTextarea.on("keydown.wp-dfw-resize click.wp-dfw-resize paste.wp-dfw-resize",function(){e.resizeTextarea()})},e.resizeTextarea=function(){var a=g.$dfwTextarea[0];a.scrollHeight>a.clientHeight&&(a.style.height=a.scrollHeight+50+"px")},b.wp=b.wp||{},b.wp.editor=b.wp.editor||{},b.wp.editor.fullscreen=e}(jQuery,window); \ 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 52f981198a..8119a21736 100644 --- a/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.js +++ b/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.js @@ -63,27 +63,33 @@ tinymce.PluginManager.add( 'wpfullscreen', function( editor ) { editor.addCommand( 'wpFullScreenOn', fullscreenOn ); editor.addCommand( 'wpFullScreenOff', fullscreenOff ); - function toggleFullscreen() { - // Toggle DFW mode. For use from inside the editor. - if ( typeof wp === 'undefined' || ! wp.editor || ! wp.editor.fullscreen ) { - return; - } + function getExtAPI() { + return ( typeof wp !== 'undefined' && wp.editor && wp.editor.fullscreen ); + } - if ( editor.getParam('wp_fullscreen') ) { - wp.editor.fullscreen.off(); - } else { - wp.editor.fullscreen.on(); + // Toggle DFW mode. For use from inside the editor. + function toggleFullscreen() { + var fullscreen = getExtAPI(); + + if ( fullscreen ) { + if ( editor.getParam('wp_fullscreen') ) { + fullscreen.off(); + } else { + fullscreen.on(); + } } } editor.addCommand( 'wpFullScreen', toggleFullscreen ); - editor.on( 'keyup', function( event ) { + editor.on( 'keydown', function( event ) { + var fullscreen; + // Turn fullscreen off when Esc is pressed. - if ( event.keyCode === 27 && wp.editor.fullscreen.settings.visible ) { - wp.editor.fullscreen.off(); + if ( event.keyCode === 27 && ( fullscreen = getExtAPI() ) && fullscreen.settings.visible ) { + fullscreen.off(); } - } ); + }); editor.on( 'init', function() { // Set the editor when initializing from whitin DFW diff --git a/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.min.js b/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.min.js index f25581a613..730e60c1bb 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(c){var d,e,f=a.getDoc(),h=f.body,i=tinymce.DOM,j=250;c&&"setcontent"===c.type&&c.initial||a.settings.inline||(e=tinymce.Env.ie?h.scrollHeight:tinymce.Env.webkit&&0===h.clientHeight?0:h.offsetHeight,e>250&&(j=e),h.scrollTop=0,j!==g&&(d=j-g,i.setStyle(i.get(a.id+"_ifr"),"height",j+"px"),g=j,tinymce.isWebKit&&0>d&&b(c)))}function c(){f.wp_fullscreen=!0,a.dom.addClass(a.getDoc().documentElement,"wp-fullscreen"),a.on("change setcontent paste keyup",b)}function d(){f.wp_fullscreen=!1,a.dom.removeClass(a.getDoc().documentElement,"wp-fullscreen"),a.off("change setcontent paste keyup",b),g=0}function e(){"undefined"!=typeof wp&&wp.editor&&wp.editor.fullscreen&&(a.getParam("wp_fullscreen")?wp.editor.fullscreen.off():wp.editor.fullscreen.on())}var f=a.settings,g=0;a.addCommand("wpAutoResize",b),a.addCommand("wpFullScreenOn",c),a.addCommand("wpFullScreenOff",d),a.addCommand("wpFullScreen",e),a.on("keyup",function(a){27===a.keyCode&&wp.editor.fullscreen.settings.visible&&wp.editor.fullscreen.off()}),a.on("init",function(){a.getParam("wp_fullscreen")&&c(),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(c){var d,e,f=a.getDoc(),g=f.body,i=tinymce.DOM,j=250;c&&"setcontent"===c.type&&c.initial||a.settings.inline||(e=tinymce.Env.ie?g.scrollHeight:tinymce.Env.webkit&&0===g.clientHeight?0:g.offsetHeight,e>250&&(j=e),g.scrollTop=0,j!==h&&(d=j-h,i.setStyle(i.get(a.id+"_ifr"),"height",j+"px"),h=j,tinymce.isWebKit&&0>d&&b(c)))}function c(){g.wp_fullscreen=!0,a.dom.addClass(a.getDoc().documentElement,"wp-fullscreen"),a.on("change setcontent paste keyup",b)}function d(){g.wp_fullscreen=!1,a.dom.removeClass(a.getDoc().documentElement,"wp-fullscreen"),a.off("change setcontent paste keyup",b),h=0}function e(){return"undefined"!=typeof wp&&wp.editor&&wp.editor.fullscreen}function f(){var b=e();b&&(a.getParam("wp_fullscreen")?b.off():b.on())}var g=a.settings,h=0;a.addCommand("wpAutoResize",b),a.addCommand("wpFullScreenOn",c),a.addCommand("wpFullScreenOff",d),a.addCommand("wpFullScreen",f),a.on("keydown",function(a){var b;27===a.keyCode&&(b=e())&&b.settings.visible&&b.off()}),a.on("init",function(){a.getParam("wp_fullscreen")&&c(),a.addShortcut("alt+shift+w","","wpFullScreen")}),a.addButton("wp_fullscreen",{tooltip:"Distraction Free Writing",shortcut:"Alt+Shift+W",onclick:f,classes:"wp-fullscreen btn widget"}),a.addMenuItem("wp_fullscreen",{text:"Distraction Free Writing",icon:"wp_fullscreen",shortcut:"Alt+Shift+W",context:"view",onclick:f})}); \ 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 d5e3cda1f3dab1ce424967464dbcc47650066e41..25016da6ad220769b50eac0c94783cce2d9a8f1c 100644 GIT binary patch delta 2590 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 AGXMYp delta 2578 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
-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