From 190670e218f11d6644012db0e8d82e48fc312ece Mon Sep 17 00:00:00 2001 From: azaozz Date: Sat, 4 Jun 2011 00:46:47 +0000 Subject: [PATCH] DFW: restore editor width shortcuts, restore limited overwriting of the theme styling in TinyMCE, show the toolbar on mouse move in TinyMCE, improve the help, fixes #17503, fixes #17644, fixes #17664, fixes #17596 git-svn-id: http://svn.automattic.com/wordpress/trunk@18137 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/post.php | 1 + wp-admin/js/wp-fullscreen.dev.js | 23 +++++++++++++++--- wp-admin/js/wp-fullscreen.js | 2 +- .../wpfullscreen/css/wp-fullscreen.css | 11 +++++++++ .../plugins/wpfullscreen/editor_plugin.dev.js | 6 +++++ .../plugins/wpfullscreen/editor_plugin.js | 2 +- wp-includes/js/tinymce/wp-mce-help.php | 7 +++++- wp-includes/js/tinymce/wp-tinymce.js.gz | Bin 93300 -> 93366 bytes wp-includes/script-loader.php | 2 +- wp-includes/version.php | 2 +- 10 files changed, 48 insertions(+), 8 deletions(-) create mode 100644 wp-includes/js/tinymce/plugins/wpfullscreen/css/wp-fullscreen.css diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php index 9bced155c0..2a87799f77 100644 --- a/wp-admin/includes/post.php +++ b/wp-admin/includes/post.php @@ -1581,6 +1581,7 @@ function wp_tiny_mce( $teeny = false, $settings = false ) { 'paste_text_use_dialog' => true, 'extended_valid_elements' => 'article[*],aside[*],audio[*],canvas[*],command[*],datalist[*],details[*],embed[*],figcaption[*],figure[*],footer[*],header[*],hgroup[*],keygen[*],mark[*],meter[*],nav[*],output[*],progress[*],section[*],source[*],summary,time[*],video[*],wbr', 'wpeditimage_disable_captions' => $no_captions, + 'wp_fullscreen_content_css' => "$baseurl/plugins/wpfullscreen/css/wp-fullscreen.css", 'plugins' => implode( ',', $plugins ), ); diff --git a/wp-admin/js/wp-fullscreen.dev.js b/wp-admin/js/wp-fullscreen.dev.js index d8f9dde6ea..59c57c5cfe 100644 --- a/wp-admin/js/wp-fullscreen.dev.js +++ b/wp-admin/js/wp-fullscreen.dev.js @@ -78,7 +78,8 @@ PubSub.prototype.publish = function( topic, args ) { mode : 'tinymce', editor_id : 'content', title_id : 'title', - timer : 0 + timer : 0, + toolbar_shown : false } /** @@ -87,7 +88,7 @@ PubSub.prototype.publish = function( topic, args ) { * Creates a function that publishes start/stop topics. * Used to throttle events. */ - bounder = function( start, stop, delay ) { + bounder = api.bounder = function( start, stop, delay ) { delay = delay || 1250; if ( block ) @@ -243,6 +244,7 @@ PubSub.prototype.publish = function( topic, args ) { s.toolbars.removeClass('fade-1000').addClass('fade-300'); api.fade.In( s.toolbars, 300, function(){ ps.publish('toolbarShown'); }, true ); $('#wp-fullscreen-body').addClass('wp-fullscreen-focus'); + s.toolbar_shown = true; }); ps.subscribe( 'hideToolbar', function() { @@ -257,6 +259,7 @@ PubSub.prototype.publish = function( topic, args ) { ps.subscribe( 'toolbarHidden', function() { s.toolbars.removeClass('fade-1000'); + s.toolbar_shown = false; }); ps.subscribe( 'show', function() { // This event occurs before the overlay blocks the UI. @@ -480,11 +483,16 @@ PubSub.prototype.publish = function( topic, args ) { wptitlehint('wp-fullscreen-title'); $(document).keyup(function(e){ - var c = e.keyCode || e.charCode, data; + var c = e.keyCode || e.charCode, a, data; if ( !fullscreen.settings.visible ) return true; + if ( navigator.platform && navigator.platform.indexOf('Mac') != -1 ) + a = e.ctrlKey; // Ctrl key for Mac + else + a = e.altKey; // Alt key for Win & Linux + if ( 27 == c ) { // Esc data = { event: e, @@ -501,6 +509,15 @@ PubSub.prototype.publish = function( topic, args ) { fullscreen.off(); } + if ( a && (61 == c || 107 == c || 187 == c) ) // + + api.dfw_width(25); + + if ( a && (45 == c || 109 == c || 189 == c) ) // - + api.dfw_width(-25); + + if ( a && 48 == c ) // 0 + api.dfw_width(0); + return false; }); diff --git a/wp-admin/js/wp-fullscreen.js b/wp-admin/js/wp-fullscreen.js index 73de07d230..5394eefc82 100644 --- a/wp-admin/js/wp-fullscreen.js +++ b/wp-admin/js/wp-fullscreen.js @@ -1 +1 @@ -var PubSub,fullscreen,wptitlehint;PubSub=function(){this.topics={}};PubSub.prototype.subscribe=function(a,b){if(!this.topics[a]){this.topics[a]=[]}this.topics[a].push(b);return b};PubSub.prototype.unsubscribe=function(b,e){var c,a,d=this.topics[b];if(!d){return e||[]}if(e){for(c=0,a=d.length;c1200){return}g.width(h+f);setUserSetting("dfw_width",h+f)};e.subscribe("showToolbar",function(){a.toolbars.removeClass("fade-1000").addClass("fade-300");b.fade.In(a.toolbars,300,function(){e.publish("toolbarShown")},true);c("#wp-fullscreen-body").addClass("wp-fullscreen-focus")});e.subscribe("hideToolbar",function(){a.toolbars.removeClass("fade-300").addClass("fade-1000");b.fade.Out(a.toolbars,1000,function(){e.publish("toolbarHidden")},true);c("#wp-fullscreen-body").removeClass("wp-fullscreen-focus")});e.subscribe("toolbarShown",function(){a.toolbars.removeClass("fade-300")});e.subscribe("toolbarHidden",function(){a.toolbars.removeClass("fade-1000")});e.subscribe("show",function(){var f=c("#wp-fullscreen-title").val(c("#"+a.title_id).val());set_title_hint(f);c("#wp-fullscreen-save input").attr("title",c("#last-edit").text());a.textarea_obj.value=edCanvas.value;if(a.has_tinymce&&a.mode==="tinymce"){tinyMCE.execCommand("wpFullScreenInit")}a._edCanvas=edCanvas;edCanvas=a.textarea_obj;a.orig_y=c(window).scrollTop()});e.subscribe("showing",function(){c(document.body).addClass("fullscreen-active");b.refresh_buttons();c(document).bind("mousemove.fullscreen",function(f){d("showToolbar","hideToolbar",2000)});d("showToolbar","hideToolbar",2000);b.bind_resize();setTimeout(b.resize_textarea,200);scrollTo(0,0);c("#wpadminbar").hide()});e.subscribe("shown",function(){a.visible=true;if(a.has_tinymce&&!a.is_mce_on){htmled=document.getElementById(a.editor_id),old_val=htmled.value;htmled.value=switchEditors.wpautop(old_val);tinyMCE.settings.setup=function(f){f.onInit.add(function(g){g.hide();delete tinyMCE.settings.setup;g.getElement().value=old_val})};tinyMCE.execCommand("mceAddControl",false,a.editor_id);a.is_mce_on=true}});e.subscribe("hide",function(){b.savecontent();c(document).unbind(".fullscreen");c(a.textarea_obj).unbind(".grow");if(a.has_tinymce&&a.mode==="tinymce"){tinyMCE.execCommand("wpFullScreenSave")}set_title_hint(c("#"+a.title_id));edCanvas=a._edCanvas;edCanvas.value=a.textarea_obj.value});e.subscribe("hiding",function(){if(a.has_tinymce&&a.mode==="tinymce"&&c("#"+a.editor_id).is(":visible")){switchEditors.go(a.editor_id,"tinymce")}else{if(a.mode=="html"&&c("#"+a.editor_id).is(":hidden")){switchEditors.go(a.editor_id,"html")}}c(document.body).removeClass("fullscreen-active");scrollTo(0,a.orig_y);c("#wpadminbar").show()});e.subscribe("hidden",function(){a.visible=false;c("#wp_mce_fullscreen").removeAttr("style");if(a.has_tinymce&&a.is_mce_on){tinyMCE.execCommand("wpFullScreenClose")}a.textarea_obj.value="";b.oldheight=0});e.subscribe("switchMode",function(h,g){var f;if(!a.has_tinymce||!a.is_mce_on){return}f=tinyMCE.get("wp_mce_fullscreen");if(h==="html"&&g==="tinymce"){a.textarea_obj.value=switchEditors.wpautop(a.textarea_obj.value);if("undefined"==typeof(f)){tinyMCE.execCommand("wpFullScreenInit")}else{f.show()}}else{if(h==="tinymce"&&g==="html"){if(f){f.hide()}}}});e.subscribe("switchedMode",function(g,f){b.refresh_buttons(true);if(f==="html"){setTimeout(b.resize_textarea,200)}});b.b=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("Bold")}};b.i=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("Italic")}};b.ul=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("InsertUnorderedList")}};b.ol=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("InsertOrderedList")}};b.link=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("WP_Link")}else{wpLink.open()}};b.unlink=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("unlink")}};b.atd=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("mceWritingImprovementTool")}};b.help=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("WP_Help")}};b.blockquote=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("mceBlockQuote")}};b.refresh_buttons=function(f){f=f||false;if(a.mode==="html"){c("#wp-fullscreen-mode-bar").removeClass("wp-tmce-mode").addClass("wp-html-mode");if(f){c("#wp-fullscreen-button-bar").fadeOut(150,function(){c(this).addClass("wp-html-mode").fadeIn(150)})}else{c("#wp-fullscreen-button-bar").addClass("wp-html-mode")}}else{if(a.mode==="tinymce"){c("#wp-fullscreen-mode-bar").removeClass("wp-html-mode").addClass("wp-tmce-mode");if(f){c("#wp-fullscreen-button-bar").fadeOut(150,function(){c(this).removeClass("wp-html-mode").fadeIn(150)})}else{c("#wp-fullscreen-button-bar").removeClass("wp-html-mode")}}}};b.ui={init:function(){var f=c("#fullscreen-topbar"),h=c("#wp_mce_fullscreen"),g=0;a.toolbars=f.add(c("#wp-fullscreen-status"));a.element=c("#fullscreen-fader");a.textarea_obj=h[0];a.has_tinymce=typeof(tinyMCE)!="undefined";if(!a.has_tinymce){c("#wp-fullscreen-mode-bar").hide()}if(wptitlehint){wptitlehint("wp-fullscreen-title")}c(document).keyup(function(j){var k=j.keyCode||j.charCode,i;if(!fullscreen.settings.visible){return true}if(27==k){i={event:j,what:"dfw",cb:fullscreen.off,condition:function(){if(c("#TB_window").is(":visible")||c(".wp-dialog").is(":visible")){return false}return true}};if(!jQuery(document).triggerHandler("wp_CloseOnEscape",[i])){fullscreen.off()}}return false});if(typeof(wpWordCount)!="undefined"){h.keyup(function(j){var i=j.keyCode||j.charCode;if(i==g){return true}if(13==i||8==g||46==g){c(document).triggerHandler("wpcountwords",[h.val()])}g=i;return true})}f.mouseenter(function(i){a.toolbars.addClass("fullscreen-make-sticky");c(document).unbind(".fullscreen");clearTimeout(a.timer);a.timer=0}).mouseleave(function(i){a.toolbars.removeClass("fullscreen-make-sticky");if(a.visible){c(document).bind("mousemove.fullscreen",function(j){d("showToolbar","hideToolbar",2000)})}})},fade:function(g,f,h){if(!a.element){b.ui.init()}if(g&&!e.publish(g)){return}b.fade.In(a.element,600,function(){if(f){e.publish(f)}b.fade.Out(a.element,600,function(){if(h){e.publish(h)}})})}};b.fade={transitionend:"transitionend webkitTransitionEnd oTransitionEnd",sensitivity:100,In:function(g,h,i,f){i=i||c.noop;h=h||400;f=f||false;if(b.fade.transitions){if(g.is(":visible")){g.addClass("fade-trigger");return g}g.show();g.first().one(this.transitionend,function(){i()});setTimeout(function(){g.addClass("fade-trigger")},this.sensitivity)}else{if(f){g.stop()}g.css("opacity",1);g.first().fadeIn(h,i);if(g.length>1){g.not(":first").fadeIn(h)}}return g},Out:function(g,h,i,f){i=i||c.noop;h=h||400;f=f||false;if(!g.is(":visible")){return g}if(b.fade.transitions){g.first().one(b.fade.transitionend,function(){if(g.hasClass("fade-trigger")){return}g.hide();i()});setTimeout(function(){g.removeClass("fade-trigger")},this.sensitivity)}else{if(f){g.stop()}g.first().fadeOut(h,i);if(g.length>1){g.not(":first").fadeOut(h)}}return g},transitions:(function(){var f=document.documentElement.style;return(typeof(f.WebkitTransition)=="string"||typeof(f.MozTransition)=="string"||typeof(f.OTransition)=="string"||typeof(f.transition)=="string")})()};b.bind_resize=function(){c(a.textarea_obj).bind("keypress.grow click.grow paste.grow",function(){setTimeout(b.resize_textarea,200)})};b.oldheight=0;b.resize_textarea=function(){var f=a.textarea_obj,g;g=f.scrollHeight>300?f.scrollHeight:300;if(g!=b.oldheight){f.style.height=g+"px";b.oldheight=g}}})(jQuery); \ No newline at end of file +var PubSub,fullscreen,wptitlehint;PubSub=function(){this.topics={}};PubSub.prototype.subscribe=function(a,b){if(!this.topics[a]){this.topics[a]=[]}this.topics[a].push(b);return b};PubSub.prototype.unsubscribe=function(b,e){var c,a,d=this.topics[b];if(!d){return e||[]}if(e){for(c=0,a=d.length;c1200){return}g.width(h+f);setUserSetting("dfw_width",h+f)};e.subscribe("showToolbar",function(){a.toolbars.removeClass("fade-1000").addClass("fade-300");b.fade.In(a.toolbars,300,function(){e.publish("toolbarShown")},true);c("#wp-fullscreen-body").addClass("wp-fullscreen-focus");a.toolbar_shown=true});e.subscribe("hideToolbar",function(){a.toolbars.removeClass("fade-300").addClass("fade-1000");b.fade.Out(a.toolbars,1000,function(){e.publish("toolbarHidden")},true);c("#wp-fullscreen-body").removeClass("wp-fullscreen-focus")});e.subscribe("toolbarShown",function(){a.toolbars.removeClass("fade-300")});e.subscribe("toolbarHidden",function(){a.toolbars.removeClass("fade-1000");a.toolbar_shown=false});e.subscribe("show",function(){var f=c("#wp-fullscreen-title").val(c("#"+a.title_id).val());set_title_hint(f);c("#wp-fullscreen-save input").attr("title",c("#last-edit").text());a.textarea_obj.value=edCanvas.value;if(a.has_tinymce&&a.mode==="tinymce"){tinyMCE.execCommand("wpFullScreenInit")}a._edCanvas=edCanvas;edCanvas=a.textarea_obj;a.orig_y=c(window).scrollTop()});e.subscribe("showing",function(){c(document.body).addClass("fullscreen-active");b.refresh_buttons();c(document).bind("mousemove.fullscreen",function(f){d("showToolbar","hideToolbar",2000)});d("showToolbar","hideToolbar",2000);b.bind_resize();setTimeout(b.resize_textarea,200);scrollTo(0,0);c("#wpadminbar").hide()});e.subscribe("shown",function(){a.visible=true;if(a.has_tinymce&&!a.is_mce_on){htmled=document.getElementById(a.editor_id),old_val=htmled.value;htmled.value=switchEditors.wpautop(old_val);tinyMCE.settings.setup=function(f){f.onInit.add(function(g){g.hide();delete tinyMCE.settings.setup;g.getElement().value=old_val})};tinyMCE.execCommand("mceAddControl",false,a.editor_id);a.is_mce_on=true}});e.subscribe("hide",function(){b.savecontent();c(document).unbind(".fullscreen");c(a.textarea_obj).unbind(".grow");if(a.has_tinymce&&a.mode==="tinymce"){tinyMCE.execCommand("wpFullScreenSave")}set_title_hint(c("#"+a.title_id));edCanvas=a._edCanvas;edCanvas.value=a.textarea_obj.value});e.subscribe("hiding",function(){if(a.has_tinymce&&a.mode==="tinymce"&&c("#"+a.editor_id).is(":visible")){switchEditors.go(a.editor_id,"tinymce")}else{if(a.mode=="html"&&c("#"+a.editor_id).is(":hidden")){switchEditors.go(a.editor_id,"html")}}c(document.body).removeClass("fullscreen-active");scrollTo(0,a.orig_y);c("#wpadminbar").show()});e.subscribe("hidden",function(){a.visible=false;c("#wp_mce_fullscreen").removeAttr("style");if(a.has_tinymce&&a.is_mce_on){tinyMCE.execCommand("wpFullScreenClose")}a.textarea_obj.value="";b.oldheight=0});e.subscribe("switchMode",function(h,g){var f;if(!a.has_tinymce||!a.is_mce_on){return}f=tinyMCE.get("wp_mce_fullscreen");if(h==="html"&&g==="tinymce"){a.textarea_obj.value=switchEditors.wpautop(a.textarea_obj.value);if("undefined"==typeof(f)){tinyMCE.execCommand("wpFullScreenInit")}else{f.show()}}else{if(h==="tinymce"&&g==="html"){if(f){f.hide()}}}});e.subscribe("switchedMode",function(g,f){b.refresh_buttons(true);if(f==="html"){setTimeout(b.resize_textarea,200)}});b.b=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("Bold")}};b.i=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("Italic")}};b.ul=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("InsertUnorderedList")}};b.ol=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("InsertOrderedList")}};b.link=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("WP_Link")}else{wpLink.open()}};b.unlink=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("unlink")}};b.atd=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("mceWritingImprovementTool")}};b.help=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("WP_Help")}};b.blockquote=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("mceBlockQuote")}};b.refresh_buttons=function(f){f=f||false;if(a.mode==="html"){c("#wp-fullscreen-mode-bar").removeClass("wp-tmce-mode").addClass("wp-html-mode");if(f){c("#wp-fullscreen-button-bar").fadeOut(150,function(){c(this).addClass("wp-html-mode").fadeIn(150)})}else{c("#wp-fullscreen-button-bar").addClass("wp-html-mode")}}else{if(a.mode==="tinymce"){c("#wp-fullscreen-mode-bar").removeClass("wp-html-mode").addClass("wp-tmce-mode");if(f){c("#wp-fullscreen-button-bar").fadeOut(150,function(){c(this).removeClass("wp-html-mode").fadeIn(150)})}else{c("#wp-fullscreen-button-bar").removeClass("wp-html-mode")}}}};b.ui={init:function(){var f=c("#fullscreen-topbar"),h=c("#wp_mce_fullscreen"),g=0;a.toolbars=f.add(c("#wp-fullscreen-status"));a.element=c("#fullscreen-fader");a.textarea_obj=h[0];a.has_tinymce=typeof(tinyMCE)!="undefined";if(!a.has_tinymce){c("#wp-fullscreen-mode-bar").hide()}if(wptitlehint){wptitlehint("wp-fullscreen-title")}c(document).keyup(function(k){var l=k.keyCode||k.charCode,i,j;if(!fullscreen.settings.visible){return true}if(navigator.platform&&navigator.platform.indexOf("Mac")!=-1){i=k.ctrlKey}else{i=k.altKey}if(27==l){j={event:k,what:"dfw",cb:fullscreen.off,condition:function(){if(c("#TB_window").is(":visible")||c(".wp-dialog").is(":visible")){return false}return true}};if(!jQuery(document).triggerHandler("wp_CloseOnEscape",[j])){fullscreen.off()}}if(i&&(61==l||107==l||187==l)){b.dfw_width(25)}if(i&&(45==l||109==l||189==l)){b.dfw_width(-25)}if(i&&48==l){b.dfw_width(0)}return false});if(typeof(wpWordCount)!="undefined"){h.keyup(function(j){var i=j.keyCode||j.charCode;if(i==g){return true}if(13==i||8==g||46==g){c(document).triggerHandler("wpcountwords",[h.val()])}g=i;return true})}f.mouseenter(function(i){a.toolbars.addClass("fullscreen-make-sticky");c(document).unbind(".fullscreen");clearTimeout(a.timer);a.timer=0}).mouseleave(function(i){a.toolbars.removeClass("fullscreen-make-sticky");if(a.visible){c(document).bind("mousemove.fullscreen",function(j){d("showToolbar","hideToolbar",2000)})}})},fade:function(g,f,h){if(!a.element){b.ui.init()}if(g&&!e.publish(g)){return}b.fade.In(a.element,600,function(){if(f){e.publish(f)}b.fade.Out(a.element,600,function(){if(h){e.publish(h)}})})}};b.fade={transitionend:"transitionend webkitTransitionEnd oTransitionEnd",sensitivity:100,In:function(g,h,i,f){i=i||c.noop;h=h||400;f=f||false;if(b.fade.transitions){if(g.is(":visible")){g.addClass("fade-trigger");return g}g.show();g.first().one(this.transitionend,function(){i()});setTimeout(function(){g.addClass("fade-trigger")},this.sensitivity)}else{if(f){g.stop()}g.css("opacity",1);g.first().fadeIn(h,i);if(g.length>1){g.not(":first").fadeIn(h)}}return g},Out:function(g,h,i,f){i=i||c.noop;h=h||400;f=f||false;if(!g.is(":visible")){return g}if(b.fade.transitions){g.first().one(b.fade.transitionend,function(){if(g.hasClass("fade-trigger")){return}g.hide();i()});setTimeout(function(){g.removeClass("fade-trigger")},this.sensitivity)}else{if(f){g.stop()}g.first().fadeOut(h,i);if(g.length>1){g.not(":first").fadeOut(h)}}return g},transitions:(function(){var f=document.documentElement.style;return(typeof(f.WebkitTransition)=="string"||typeof(f.MozTransition)=="string"||typeof(f.OTransition)=="string"||typeof(f.transition)=="string")})()};b.bind_resize=function(){c(a.textarea_obj).bind("keypress.grow click.grow paste.grow",function(){setTimeout(b.resize_textarea,200)})};b.oldheight=0;b.resize_textarea=function(){var f=a.textarea_obj,g;g=f.scrollHeight>300?f.scrollHeight:300;if(g!=b.oldheight){f.style.height=g+"px";b.oldheight=g}}})(jQuery); \ No newline at end of file diff --git a/wp-includes/js/tinymce/plugins/wpfullscreen/css/wp-fullscreen.css b/wp-includes/js/tinymce/plugins/wpfullscreen/css/wp-fullscreen.css new file mode 100644 index 0000000000..0b3fab2634 --- /dev/null +++ b/wp-includes/js/tinymce/plugins/wpfullscreen/css/wp-fullscreen.css @@ -0,0 +1,11 @@ +/* +Distraction Free Writing mode TinyMCE Styles +*/ + +html, body { + background: transparent; + width: auto !important; + max-width: none !important; + margin: 0 !important; + padding: 0 !important; +} diff --git a/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.dev.js b/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.dev.js index 8f4a817615..ff1f55301f 100644 --- a/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.dev.js +++ b/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.dev.js @@ -49,6 +49,7 @@ s.wp_fullscreen_editor_id = ed.id; s.theme_advanced_resizing = false; s.theme_advanced_statusbar_location = 'none'; + s.content_css = s.content_css + ',' + s.wp_fullscreen_content_css; s.height = tinymce.isIE ? b.scrollHeight : b.offsetHeight; tinymce.each(ed.getParam('wp_fullscreen_settings'), function(v, k) { @@ -83,6 +84,11 @@ }); fsed.render(); + + fsed.dom.bind( fsed.getWin(), 'mousemove', function(e){ + if ( !fullscreen.settings.toolbar_shown ) + fullscreen.bounder( 'showToolbar', 'hideToolbar', 2000 ); + }); }); // Register buttons diff --git a/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.js b/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.js index c134a1c25d..88d12ea497 100644 --- a/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.js +++ b/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.js @@ -1 +1 @@ -(function(){tinymce.create("tinymce.plugins.wpFullscreenPlugin",{init:function(a,c){var d=this,g=0,e={},f=tinymce.DOM;a.addCommand("wpFullScreenClose",function(){if(a.getParam("wp_fullscreen_is_enabled")){f.win.setTimeout(function(){tinyMCE.remove(a);f.remove("wp_mce_fullscreen_parent");tinyMCE.settings=tinyMCE.oldSettings},10)}});a.addCommand("wpFullScreenSave",function(){var h=tinyMCE.get("wp_mce_fullscreen"),i;h.focus();i=tinyMCE.get(h.getParam("wp_fullscreen_editor_id"));i.setContent(h.getContent({format:"raw"}),{format:"raw"})});a.addCommand("wpFullScreenInit",function(){var j=a.getDoc(),h=j.body,i;if(a.id=="wp_mce_fullscreen"){return}tinyMCE.oldSettings=tinyMCE.settings;tinymce.each(a.settings,function(k,l){e[l]=k});e.id="wp_mce_fullscreen";e.wp_fullscreen_is_enabled=true;e.wp_fullscreen_editor_id=a.id;e.theme_advanced_resizing=false;e.theme_advanced_statusbar_location="none";e.height=tinymce.isIE?h.scrollHeight:h.offsetHeight;tinymce.each(a.getParam("wp_fullscreen_settings"),function(m,l){e[l]=m});i=new tinymce.Editor("wp_mce_fullscreen",e);i.onInit.add(function(k){var m=tinymce.DOM,l=m.select("a.mceButton",m.get("wp-fullscreen-buttons"));if(!a.isHidden()){k.setContent(a.getContent())}else{k.setContent(switchEditors.wpautop(k.getElement().value))}setTimeout(function(){k.onNodeChange.add(function(o,n,p){tinymce.each(l,function(s){var r,q;if(r=m.get("wp_mce_fullscreen_"+s.id.substr(6))){q=r.className;if(q){s.className=q}}})})},1000);k.focus()});i.render()});if("undefined"!=fullscreen){a.addButton("fullscreen",{title:"fullscreen.desc",onclick:function(){fullscreen.on()}})}if(a.getParam("fullscreen_is_enabled")||!a.getParam("wp_fullscreen_is_enabled")){return}function b(){var k=a.getDoc(),h=k.body,m=k.documentElement,j=tinymce.DOM,l,i;if(tinymce.isIE){i=h.scrollHeight}else{if(tinymce.isWebKit){i=h.offsetHeight}else{i=m.offsetHeight}}l=(i>300)?i:300;if(g!=l){g=l;j.setStyle(j.get(a.id+"_ifr"),"height",l+"px")}}a.onInit.add(function(i,h){i.onChange.add(b);i.onSetContent.add(b);i.onPaste.add(b);i.onKeyUp.add(b);i.onPostRender.add(b);i.getBody().style.overflowY="hidden"});if(a.getParam("autoresize_on_init",true)){a.onLoadContent.add(function(i,h){setTimeout(function(){b()},1200)})}a.addCommand("wpAutoResize",b)},getInfo:function(){return{longname:"WP Fullscreen",author:"WordPress",authorurl:"http://wordpress.org",infourl:"",version:"1.0"}}});tinymce.PluginManager.add("wpfullscreen",tinymce.plugins.wpFullscreenPlugin)})(); \ No newline at end of file +(function(){tinymce.create("tinymce.plugins.wpFullscreenPlugin",{init:function(a,c){var d=this,g=0,e={},f=tinymce.DOM;a.addCommand("wpFullScreenClose",function(){if(a.getParam("wp_fullscreen_is_enabled")){f.win.setTimeout(function(){tinyMCE.remove(a);f.remove("wp_mce_fullscreen_parent");tinyMCE.settings=tinyMCE.oldSettings},10)}});a.addCommand("wpFullScreenSave",function(){var h=tinyMCE.get("wp_mce_fullscreen"),i;h.focus();i=tinyMCE.get(h.getParam("wp_fullscreen_editor_id"));i.setContent(h.getContent({format:"raw"}),{format:"raw"})});a.addCommand("wpFullScreenInit",function(){var j=a.getDoc(),h=j.body,i;if(a.id=="wp_mce_fullscreen"){return}tinyMCE.oldSettings=tinyMCE.settings;tinymce.each(a.settings,function(k,l){e[l]=k});e.id="wp_mce_fullscreen";e.wp_fullscreen_is_enabled=true;e.wp_fullscreen_editor_id=a.id;e.theme_advanced_resizing=false;e.theme_advanced_statusbar_location="none";e.content_css=e.content_css+","+e.wp_fullscreen_content_css;e.height=tinymce.isIE?h.scrollHeight:h.offsetHeight;tinymce.each(a.getParam("wp_fullscreen_settings"),function(m,l){e[l]=m});i=new tinymce.Editor("wp_mce_fullscreen",e);i.onInit.add(function(k){var m=tinymce.DOM,l=m.select("a.mceButton",m.get("wp-fullscreen-buttons"));if(!a.isHidden()){k.setContent(a.getContent())}else{k.setContent(switchEditors.wpautop(k.getElement().value))}setTimeout(function(){k.onNodeChange.add(function(o,n,p){tinymce.each(l,function(s){var r,q;if(r=m.get("wp_mce_fullscreen_"+s.id.substr(6))){q=r.className;if(q){s.className=q}}})})},1000);k.focus()});i.render();i.dom.bind(i.getWin(),"mousemove",function(k){if(!fullscreen.settings.toolbar_shown){fullscreen.bounder("showToolbar","hideToolbar",2000)}})});if("undefined"!=fullscreen){a.addButton("fullscreen",{title:"fullscreen.desc",onclick:function(){fullscreen.on()}})}if(a.getParam("fullscreen_is_enabled")||!a.getParam("wp_fullscreen_is_enabled")){return}function b(){var k=a.getDoc(),h=k.body,m=k.documentElement,j=tinymce.DOM,l,i;if(tinymce.isIE){i=h.scrollHeight}else{if(tinymce.isWebKit){i=h.offsetHeight}else{i=m.offsetHeight}}l=(i>300)?i:300;if(g!=l){g=l;j.setStyle(j.get(a.id+"_ifr"),"height",l+"px")}}a.onInit.add(function(i,h){i.onChange.add(b);i.onSetContent.add(b);i.onPaste.add(b);i.onKeyUp.add(b);i.onPostRender.add(b);i.getBody().style.overflowY="hidden"});if(a.getParam("autoresize_on_init",true)){a.onLoadContent.add(function(i,h){setTimeout(function(){b()},1200)})}a.addCommand("wpAutoResize",b)},getInfo:function(){return{longname:"WP Fullscreen",author:"WordPress",authorurl:"http://wordpress.org",infourl:"",version:"1.0"}}});tinymce.PluginManager.add("wpfullscreen",tinymce.plugins.wpFullscreenPlugin)})(); \ No newline at end of file diff --git a/wp-includes/js/tinymce/wp-mce-help.php b/wp-includes/js/tinymce/wp-mce-help.php index ac8079862d..1fb13f822f 100644 --- a/wp-includes/js/tinymce/wp-mce-help.php +++ b/wp-includes/js/tinymce/wp-mce-help.php @@ -234,12 +234,17 @@ wp_admin_css( 'wp-admin', true ); cv ax zy - + bi u1 23 45 69 + + + Alt +Ctrl + + Alt -Ctrl - + Alt 0Ctrl 0

diff --git a/wp-includes/js/tinymce/wp-tinymce.js.gz b/wp-includes/js/tinymce/wp-tinymce.js.gz index d7c45c933653a9f718cba0e05d1854a97a560c6b..ecc3a3600f14badbdc805cd31bb165a606b363af 100644 GIT binary patch delta 5211 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 delta 5145 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 H1AYVmC*Kcm diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 4c351a66e7..7c4eefc623 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -96,7 +96,7 @@ function wp_default_scripts( &$scripts ) { $scripts->add( 'editor', "/wp-admin/js/editor$suffix.js", array('utils','jquery'), '20110411' ); $scripts->add_data( 'editor', 'group', 1 ); - $scripts->add( 'wp-fullscreen', "/wp-admin/js/wp-fullscreen$suffix.js", array('jquery'), '20110530' ); + $scripts->add( 'wp-fullscreen', "/wp-admin/js/wp-fullscreen$suffix.js", array('jquery'), '20110603' ); $scripts->add_data( 'wp-fullscreen', 'group', 1 ); $scripts->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.6.1'); diff --git a/wp-includes/version.php b/wp-includes/version.php index 09f319bc04..d18b496d35 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -36,7 +36,7 @@ $wp_db_version = 17517; * * @global string $tinymce_version */ -$tinymce_version = '342-20110601'; +$tinymce_version = '342-20110603'; /** * Holds the cache manifest version