From 945d4500b4a5fed2869d4f74bbb11ae528595d8c Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Mon, 19 Sep 2011 00:47:23 +0000
Subject: [PATCH] Add TinyMCE command to handle opening of the upload/insert
 popup, fix the shortcut "Alt+Shift+M", fix the "image" button in DFW, fixes
 #17992, fixes #18697, see $17144

git-svn-id: https://develop.svn.wordpress.org/trunk@18710 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/css/media.css                        |   2 +-
 wp-admin/css/media.dev.css                    |  20 -------
 wp-admin/js/wp-fullscreen.dev.js              |  25 +++++----
 wp-admin/js/wp-fullscreen.js                  |   2 +-
 wp-includes/class-wp-editor.php               |   6 +-
 .../plugins/wordpress/editor_plugin.dev.js    |  53 ++++++------------
 .../plugins/wordpress/editor_plugin.js        |   2 +-
 wp-includes/js/tinymce/wp-tinymce.js.gz       | Bin 95814 -> 95777 bytes
 wp-includes/script-loader.php                 |   2 +-
 wp-includes/version.php                       |   2 +-
 10 files changed, 38 insertions(+), 76 deletions(-)

diff --git a/wp-admin/css/media.css b/wp-admin/css/media.css
index f43d62ff3d..728ad57f91 100644
--- a/wp-admin/css/media.css
+++ b/wp-admin/css/media.css
@@ -1 +1 @@
-div#media-upload-header{margin:0;padding:0 5px;font-weight:bold;position:relative;border-bottom-width:1px;border-bottom-style:solid;}body#media-upload ul#sidemenu{font-weight:normal;margin:0 5px;left:0;bottom:-1px;float:none;overflow:hidden;}div#media-upload-error{margin:1em;font-weight:bold;}form{margin:1em;}#search-filter{text-align:right;}th{position:relative;}.media-upload-form label.form-help,td.help{font-family:sans-serif;font-style:italic;font-weight:normal;}.media-upload-form p.help{margin:0;padding:0;}.media-upload-form fieldset{width:100%;border:none;text-align:justify;margin:0 0 1em 0;padding:0;}.image-align-none-label{background:url(../images/align-none.png) no-repeat center left;}.image-align-left-label{background:url(../images/align-left.png) no-repeat center left;}.image-align-center-label{background:url(../images/align-center.png) no-repeat center left;}.image-align-right-label{background:url(../images/align-right.png) no-repeat center left;}tr.image-size td{width:460px;}tr.image-size div.image-size-item{float:left;width:25%;margin:0;}#library-form .progress,#gallery-form .progress,.insert-gallery,.describe.startopen,.describe.startclosed{display:none;}.media-item .thumbnail{max-width:128px;max-height:128px;}thead.media-item-info tr{background-color:transparent;}thead.media-item-info th,thead.media-item-info td{border:none;margin:0;}.form-table thead.media-item-info{border:8px solid #fff;}abbr.required{text-decoration:none;border:none;}.describe label{display:inline;}.describe td{vertical-align:middle;padding:0 5px 8px 0;}.describe td.error{padding:2px 8px;}.describe td.A1{width:132px;}.describe input[type="text"],.describe textarea{width:460px;border-width:1px;border-style:solid;}.hidden{height:0;width:0;overflow:hidden;border:none;}#media-upload p.ml-submit{padding:1em 0;}#media-upload p.help,#media-upload label.help{font-family:sans-serif;font-style:italic;font-weight:normal;}#media-upload #media-items{border-bottom-width:1px;border-bottom-style:solid;width:623px;}#media-upload #media-items:empty{border:0 none;}#media-upload .media-item{border-style:solid solid none;border-width:1px 1px 0;min-height:36px;width:100%;}#media-upload .ui-sortable .media-item{cursor:move;}.filename{line-height:36px;padding:0 10px;overflow:hidden;}#media-upload .describe{width:100%;clear:both;cursor:default;}#media-upload .describe th.label{padding-top:.2em;text-align:left;min-width:120px;}#media-upload tr.image-size{margin-bottom:1em;height:3em;}#media-upload #filter{width:623px;}#media-upload #filter .subsubsub{margin:8px 0;}#filter .tablenav select{border-style:solid;border-width:1px;padding:2px;vertical-align:top;width:auto;}#media-upload .del-attachment{display:none;margin:5px 0;}.menu_order{float:right;font-size:11px;margin:10px 10px 0;}.menu_order_input{border:1px solid #ddd;font-size:10px;padding:1px;width:23px;}.ui-sortable-helper{background-color:#fff;border:1px solid #aaa;opacity:.6;filter:alpha(opacity=60);}#media-upload th.order-head{width:20%;text-align:center;}#media-upload th.actions-head{width:25%;text-align:center;}#media-upload a.wp-post-thumbnail{margin:0 20px;}#media-items a.delete{display:block;float:right;}#media-upload .widefat{width:626px;border-style:solid solid none;}.sorthelper{height:37px;width:623px;display:block;}#gallery-settings th.label{width:160px;}#gallery-settings #basic th.label{padding:5px 5px 5px 0;}#gallery-settings .title{clear:both;padding:0 0 3px;font-size:1.6em;border-bottom:1px solid #DADADA;}h3.media-title{font-size:1.6em;}h4.media-sub-title{border-bottom:1px solid #DADADA;font-size:1.3em;margin:12px;padding:0 0 3px;}#gallery-settings .title,h3.media-title,h4.media-sub-title{font-family:Georgia,"Times New Roman",Times,serif;font-weight:normal;color:#5A5A5A;}#gallery-settings .describe td{vertical-align:middle;height:3em;}#gallery-settings .describe th.label{padding-top:.5em;text-align:left;}#gallery-settings .describe{padding:5px;width:615px;clear:both;cursor:default;}#gallery-settings .describe select{width:15em;}#gallery-settings .describe select option,#gallery-settings .describe td{padding:0;}#gallery-settings label,#gallery-settings legend{font-size:13px;color:#464646;margin-right:15px;}#gallery-settings .align .field label{margin:0 1.5em 0 0;}#gallery-settings p.ml-submit{border-top:1px solid #dfdfdf;}#gallery-settings select#columns{width:6em;}#sort-buttons{font-size:.8em;margin:3px 25px -8px 0;text-align:right;max-width:625px;}#sort-buttons a{text-decoration:none;}#sort-buttons #asc,#sort-buttons #showall{padding-left:5px;}#sort-buttons span{margin-right:25px;}
\ No newline at end of file
+div#media-upload-header{margin:0;padding:0 5px;font-weight:bold;position:relative;border-bottom-width:1px;border-bottom-style:solid;}body#media-upload ul#sidemenu{font-weight:normal;margin:0 5px;left:0;bottom:-1px;float:none;overflow:hidden;}div#media-upload-error{margin:1em;font-weight:bold;}form{margin:1em;}#search-filter{text-align:right;}th{position:relative;}.media-upload-form label.form-help,td.help{font-family:sans-serif;font-style:italic;font-weight:normal;}.media-upload-form p.help{margin:0;padding:0;}.media-upload-form fieldset{width:100%;border:none;text-align:justify;margin:0 0 1em 0;padding:0;}.image-align-none-label{background:url(../images/align-none.png) no-repeat center left;}.image-align-left-label{background:url(../images/align-left.png) no-repeat center left;}.image-align-center-label{background:url(../images/align-center.png) no-repeat center left;}.image-align-right-label{background:url(../images/align-right.png) no-repeat center left;}tr.image-size td{width:460px;}tr.image-size div.image-size-item{float:left;width:25%;margin:0;}#library-form .progress,#gallery-form .progress,.insert-gallery,.describe.startopen,.describe.startclosed{display:none;}.media-item .thumbnail{max-width:128px;max-height:128px;}thead.media-item-info tr{background-color:transparent;}thead.media-item-info th,thead.media-item-info td{border:none;margin:0;}.form-table thead.media-item-info{border:8px solid #fff;}abbr.required{text-decoration:none;border:none;}.describe label{display:inline;}.describe td{vertical-align:middle;padding:0 5px 8px 0;}.describe td.error{padding:2px 8px;}.describe td.A1{width:132px;}.describe input[type="text"],.describe textarea{width:460px;border-width:1px;border-style:solid;}#media-upload p.ml-submit{padding:1em 0;}#media-upload p.help,#media-upload label.help{font-family:sans-serif;font-style:italic;font-weight:normal;}#media-upload #media-items{border-bottom-width:1px;border-bottom-style:solid;width:623px;}#media-upload #media-items:empty{border:0 none;}#media-upload .media-item{border-style:solid solid none;border-width:1px 1px 0;min-height:36px;width:100%;}#media-upload .ui-sortable .media-item{cursor:move;}.filename{line-height:36px;padding:0 10px;overflow:hidden;}#media-upload .describe{width:100%;clear:both;cursor:default;}#media-upload .describe th.label{padding-top:.2em;text-align:left;min-width:120px;}#media-upload tr.image-size{margin-bottom:1em;height:3em;}#media-upload #filter{width:623px;}#media-upload #filter .subsubsub{margin:8px 0;}#filter .tablenav select{border-style:solid;border-width:1px;padding:2px;vertical-align:top;width:auto;}#media-upload .del-attachment{display:none;margin:5px 0;}.menu_order{float:right;font-size:11px;margin:10px 10px 0;}.menu_order_input{border:1px solid #ddd;font-size:10px;padding:1px;width:23px;}.ui-sortable-helper{background-color:#fff;border:1px solid #aaa;opacity:.6;filter:alpha(opacity=60);}#media-upload th.order-head{width:20%;text-align:center;}#media-upload th.actions-head{width:25%;text-align:center;}#media-upload a.wp-post-thumbnail{margin:0 20px;}#media-items a.delete{display:block;float:right;}#media-upload .widefat{width:626px;border-style:solid solid none;}.sorthelper{height:37px;width:623px;display:block;}#gallery-settings th.label{width:160px;}#gallery-settings #basic th.label{padding:5px 5px 5px 0;}#gallery-settings .title{clear:both;padding:0 0 3px;font-size:1.6em;border-bottom:1px solid #DADADA;}h3.media-title{font-size:1.6em;}h4.media-sub-title{border-bottom:1px solid #DADADA;font-size:1.3em;margin:12px;padding:0 0 3px;}#gallery-settings .title,h3.media-title,h4.media-sub-title{font-family:Georgia,"Times New Roman",Times,serif;font-weight:normal;color:#5A5A5A;}#gallery-settings .describe td{vertical-align:middle;height:3em;}#gallery-settings .describe th.label{padding-top:.5em;text-align:left;}#gallery-settings .describe{padding:5px;width:615px;clear:both;cursor:default;}#gallery-settings .describe select{width:15em;}#gallery-settings .describe select option,#gallery-settings .describe td{padding:0;}#gallery-settings label,#gallery-settings legend{font-size:13px;color:#464646;margin-right:15px;}#gallery-settings .align .field label{margin:0 1.5em 0 0;}#gallery-settings p.ml-submit{border-top:1px solid #dfdfdf;}#gallery-settings select#columns{width:6em;}#sort-buttons{font-size:.8em;margin:3px 25px -8px 0;text-align:right;max-width:625px;}#sort-buttons a{text-decoration:none;}#sort-buttons #asc,#sort-buttons #showall{padding-left:5px;}#sort-buttons span{margin-right:25px;}
\ No newline at end of file
diff --git a/wp-admin/css/media.dev.css b/wp-admin/css/media.dev.css
index a9c617b89b..02358eb1f3 100644
--- a/wp-admin/css/media.dev.css
+++ b/wp-admin/css/media.dev.css
@@ -364,23 +364,3 @@ h4.media-sub-title {
 	margin-right: 25px;
 }
 
-.drag-drop #drag-drop-area {
-	border: 4px dashed #DDDDDD;
-    height: 300px;
-}
-
-.drag-drop .drag-drop-inside {
-	padding-top: 100px;
-}
-
-.drag-drop .drag-drop-inside p {
-	text-align: center;
-}
-
-.dragdrop-info {
-	display: none;
-}
-
-.drag-drop .dragdrop-info {
-	display: block;
-}
diff --git a/wp-admin/js/wp-fullscreen.dev.js b/wp-admin/js/wp-fullscreen.dev.js
index b8f14f0071..b1cf432373 100644
--- a/wp-admin/js/wp-fullscreen.dev.js
+++ b/wp-admin/js/wp-fullscreen.dev.js
@@ -143,19 +143,14 @@ PubSub.prototype.publish = function( topic, args ) {
 		if ( typeof(wp_fullscreen_settings) != 'undefined' )
 			$.extend( s, wp_fullscreen_settings );
 
-		// enable DFW only on the Add/Edit Post screens for now
-		/*
 		s.editor_id = wpActiveEditor || 'content';
 
-		if ( !s.title_id && $('input#title').length && s.editor_id == 'content' )
-			s.title_id = 'title';
-
-		if ( !s.title_id )
-			$('#wp-fullscreen-title').hide();
-		*/
-
-		s.editor_id = 'content';
-		s.title_id = 'title';
+		if ( !s.title_id ) {
+			if ( $('input#title').length && s.editor_id == 'content' )
+				s.title_id = 'title';
+			else
+				$('#wp-fullscreen-title').hide();
+		}
 
 		s.mode = $('#' + s.editor_id).is(':hidden') ? 'tinymce' : 'html';
 		s.qt_canvas = $('#' + s.editor_id).get(0);
@@ -360,6 +355,8 @@ PubSub.prototype.publish = function( topic, args ) {
 
 			s.is_mce_on = true;
 		}
+
+		wpActiveEditor = 'wp_mce_fullscreen';
 	});
 
 	ps.subscribe( 'hide', function() { // This event occurs before the overlay blocks DFW.
@@ -402,6 +399,7 @@ PubSub.prototype.publish = function( topic, args ) {
 
 		s.textarea_obj.value = '';
 		api.oldheight = 0;
+		wpActiveEditor = s.editor_id;
 	});
 
 	ps.subscribe( 'switchMode', function( from, to ) {
@@ -485,6 +483,11 @@ PubSub.prototype.publish = function( topic, args ) {
 			tinyMCE.execCommand('mceBlockQuote');
 	}
 
+	api.medialib = function() {
+		if ( s.has_tinymce && 'tinymce' === s.mode )
+			tinyMCE.execCommand('WP_Medialib');
+	}
+
 	api.refresh_buttons = function( fade ) {
 		fade = fade || false;
 
diff --git a/wp-admin/js/wp-fullscreen.js b/wp-admin/js/wp-fullscreen.js
index e248961035..32a47de115 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;c<a;c++){if(e==d[c]){d.splice(c,1)}}return e}else{this.topics[b]=[];return d}};PubSub.prototype.publish=function(c,b){var d,a,e,f=this.topics[c];if(!f){return}b=b||[];for(d=0,a=f.length;d<a;d++){e=(f[d].apply(null,b)===false||e)}return !e};(function(c){var b,e,d,a;fullscreen=b={};e=b.pubsub=new PubSub();timer=0;block=false;a=b.settings={visible:false,mode:"tinymce",editor_id:"content",title_id:"",timer:0,toolbar_shown:false};d=b.bounder=function(l,h,g,j){var k,i;g=g||1250;if(j){k=j.pageY||j.clientY||j.offsetY;i=c(document).scrollTop();if(!j.isDefaultPrevented){k=135+k}if(k-i>120){return}}if(block){return}block=true;setTimeout(function(){block=false},400);if(a.timer){clearTimeout(a.timer)}else{e.publish(l)}function f(){e.publish(h);a.timer=0}a.timer=setTimeout(f,g)};b.on=function(){if(a.visible){return}if(typeof(wp_fullscreen_settings)!="undefined"){c.extend(a,wp_fullscreen_settings)}a.editor_id="content";a.title_id="title";a.mode=c("#"+a.editor_id).is(":hidden")?"tinymce":"html";a.qt_canvas=c("#"+a.editor_id).get(0);if(!a.element){b.ui.init()}a.is_mce_on=a.has_tinymce&&typeof(tinyMCE.get(a.editor_id))!="undefined";b.ui.fade("show","showing","shown")};b.off=function(){if(!a.visible){return}b.ui.fade("hide","hiding","hidden")};b.switchmode=function(g){var f=a.mode;if(!g||!a.visible||!a.has_tinymce){return f}if(f==g){return f}e.publish("switchMode",[f,g]);a.mode=g;e.publish("switchedMode",[f,g]);return g};b.save=function(){var h=c("#hiddenaction"),f=h.val(),i=c("#wp-fullscreen-save img"),g=c("#wp-fullscreen-save span");i.show();b.savecontent();h.val("wp-fullscreen-save-post");c.post(ajaxurl,c("form#post").serialize(),function(j){i.hide();g.show();setTimeout(function(){g.fadeOut(1000)},3000);if(j.last_edited){c("#wp-fullscreen-save input").attr("title",j.last_edited)}},"json");h.val(f)};b.savecontent=function(){var f,g;if(a.title_id){c("#"+a.title_id).val(c("#wp-fullscreen-title").val())}if(a.mode==="tinymce"&&(f=tinyMCE.get("wp_mce_fullscreen"))){g=f.save()}else{g=c("#wp_mce_fullscreen").val()}c("#"+a.editor_id).val(g);c(document).triggerHandler("wpcountwords",[g])};set_title_hint=function(f){if(!f.val().length){f.siblings("label").css("visibility","")}else{f.siblings("label").css("visibility","hidden")}};b.dfw_width=function(h){var g=c("#wp-fullscreen-wrap"),f=g.width();if(!h){g.width(c("#wp-fullscreen-central-toolbar").width());deleteUserSetting("dfw_width");return}f=h+f;if(f<200||f>1200){return}g.width(f);setUserSetting("dfw_width",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;if(a.title_id){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=a.qt_canvas.value;if(a.has_tinymce&&a.mode==="tinymce"){tinyMCE.execCommand("wpFullScreenInit")}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,f)});d("showToolbar","hideToolbar",2000);b.bind_resize();setTimeout(b.resize_textarea,200);scrollTo(0,0);c("#wpadminbar").hide()});e.subscribe("shown",function(){var f;a.visible=true;if(a.has_tinymce&&!a.is_mce_on){f=function(g,h){var k=h.getElement(),i=k.value,j=tinyMCEPreInit.mceInit[a.editor_id];if(j&&j.wpautop&&typeof(switchEditors)!="undefined"){k.value=switchEditors.wpautop(k.value)}h.onInit.add(function(l){l.hide();l.getElement().value=i;tinymce.onAddEditor.remove(f)})};tinymce.onAddEditor.add(f);tinyMCE.init(tinyMCEPreInit.mceInit[a.editor_id]);a.is_mce_on=true}});e.subscribe("hide",function(){var f=c("#"+a.editor_id).is(":hidden");if(a.has_tinymce&&a.mode==="tinymce"&&!f){switchEditors.go(c("#"+a.editor_id+"-tmce").get(0))}else{if(a.mode==="html"&&f){switchEditors.go(c("#"+a.editor_id+"-html").get(0))}}b.savecontent();c(document).unbind(".fullscreen");c(a.textarea_obj).unbind(".grow");if(a.has_tinymce&&a.mode==="tinymce"){tinyMCE.execCommand("wpFullScreenSave")}if(a.title_id){set_title_hint(c("#"+a.title_id))}a.qt_canvas.value=a.textarea_obj.value});e.subscribe("hiding",function(){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, #wp-fullscreen-title").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"){if(tinyMCE.get(a.editor_id).getParam("wpautop")&&typeof(switchEditors)!="undefined"){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,j)})}})},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;c<a;c++){if(e==d[c]){d.splice(c,1)}}return e}else{this.topics[b]=[];return d}};PubSub.prototype.publish=function(c,b){var d,a,e,f=this.topics[c];if(!f){return}b=b||[];for(d=0,a=f.length;d<a;d++){e=(f[d].apply(null,b)===false||e)}return !e};(function(c){var b,e,d,a;fullscreen=b={};e=b.pubsub=new PubSub();timer=0;block=false;a=b.settings={visible:false,mode:"tinymce",editor_id:"content",title_id:"",timer:0,toolbar_shown:false};d=b.bounder=function(l,h,g,j){var k,i;g=g||1250;if(j){k=j.pageY||j.clientY||j.offsetY;i=c(document).scrollTop();if(!j.isDefaultPrevented){k=135+k}if(k-i>120){return}}if(block){return}block=true;setTimeout(function(){block=false},400);if(a.timer){clearTimeout(a.timer)}else{e.publish(l)}function f(){e.publish(h);a.timer=0}a.timer=setTimeout(f,g)};b.on=function(){if(a.visible){return}if(typeof(wp_fullscreen_settings)!="undefined"){c.extend(a,wp_fullscreen_settings)}a.editor_id=wpActiveEditor||"content";if(!a.title_id){if(c("input#title").length&&a.editor_id=="content"){a.title_id="title"}else{c("#wp-fullscreen-title").hide()}}a.mode=c("#"+a.editor_id).is(":hidden")?"tinymce":"html";a.qt_canvas=c("#"+a.editor_id).get(0);if(!a.element){b.ui.init()}a.is_mce_on=a.has_tinymce&&typeof(tinyMCE.get(a.editor_id))!="undefined";b.ui.fade("show","showing","shown")};b.off=function(){if(!a.visible){return}b.ui.fade("hide","hiding","hidden")};b.switchmode=function(g){var f=a.mode;if(!g||!a.visible||!a.has_tinymce){return f}if(f==g){return f}e.publish("switchMode",[f,g]);a.mode=g;e.publish("switchedMode",[f,g]);return g};b.save=function(){var h=c("#hiddenaction"),f=h.val(),i=c("#wp-fullscreen-save img"),g=c("#wp-fullscreen-save span");i.show();b.savecontent();h.val("wp-fullscreen-save-post");c.post(ajaxurl,c("form#post").serialize(),function(j){i.hide();g.show();setTimeout(function(){g.fadeOut(1000)},3000);if(j.last_edited){c("#wp-fullscreen-save input").attr("title",j.last_edited)}},"json");h.val(f)};b.savecontent=function(){var f,g;if(a.title_id){c("#"+a.title_id).val(c("#wp-fullscreen-title").val())}if(a.mode==="tinymce"&&(f=tinyMCE.get("wp_mce_fullscreen"))){g=f.save()}else{g=c("#wp_mce_fullscreen").val()}c("#"+a.editor_id).val(g);c(document).triggerHandler("wpcountwords",[g])};set_title_hint=function(f){if(!f.val().length){f.siblings("label").css("visibility","")}else{f.siblings("label").css("visibility","hidden")}};b.dfw_width=function(h){var g=c("#wp-fullscreen-wrap"),f=g.width();if(!h){g.width(c("#wp-fullscreen-central-toolbar").width());deleteUserSetting("dfw_width");return}f=h+f;if(f<200||f>1200){return}g.width(f);setUserSetting("dfw_width",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;if(a.title_id){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=a.qt_canvas.value;if(a.has_tinymce&&a.mode==="tinymce"){tinyMCE.execCommand("wpFullScreenInit")}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,f)});d("showToolbar","hideToolbar",2000);b.bind_resize();setTimeout(b.resize_textarea,200);scrollTo(0,0);c("#wpadminbar").hide()});e.subscribe("shown",function(){var f;a.visible=true;if(a.has_tinymce&&!a.is_mce_on){f=function(g,h){var k=h.getElement(),i=k.value,j=tinyMCEPreInit.mceInit[a.editor_id];if(j&&j.wpautop&&typeof(switchEditors)!="undefined"){k.value=switchEditors.wpautop(k.value)}h.onInit.add(function(l){l.hide();l.getElement().value=i;tinymce.onAddEditor.remove(f)})};tinymce.onAddEditor.add(f);tinyMCE.init(tinyMCEPreInit.mceInit[a.editor_id]);a.is_mce_on=true}wpActiveEditor="wp_mce_fullscreen"});e.subscribe("hide",function(){var f=c("#"+a.editor_id).is(":hidden");if(a.has_tinymce&&a.mode==="tinymce"&&!f){switchEditors.go(c("#"+a.editor_id+"-tmce").get(0))}else{if(a.mode==="html"&&f){switchEditors.go(c("#"+a.editor_id+"-html").get(0))}}b.savecontent();c(document).unbind(".fullscreen");c(a.textarea_obj).unbind(".grow");if(a.has_tinymce&&a.mode==="tinymce"){tinyMCE.execCommand("wpFullScreenSave")}if(a.title_id){set_title_hint(c("#"+a.title_id))}a.qt_canvas.value=a.textarea_obj.value});e.subscribe("hiding",function(){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, #wp-fullscreen-title").removeAttr("style");if(a.has_tinymce&&a.is_mce_on){tinyMCE.execCommand("wpFullScreenClose")}a.textarea_obj.value="";b.oldheight=0;wpActiveEditor=a.editor_id});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"){if(tinyMCE.get(a.editor_id).getParam("wpautop")&&typeof(switchEditors)!="undefined"){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.medialib=function(){if(a.has_tinymce&&"tinymce"===a.mode){tinyMCE.execCommand("WP_Medialib")}};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,j)})}})},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/class-wp-editor.php b/wp-includes/class-wp-editor.php
index 834c302428..e7faf80702 100644
--- a/wp-includes/class-wp-editor.php
+++ b/wp-includes/class-wp-editor.php
@@ -594,10 +594,6 @@ class WP_Editor {
 			<div id="wp-fullscreen-button-bar"><div id="wp-fullscreen-buttons" class="wp_themeSkin">
 	<?php
 
-		$media_link_type = 'image';
-		if ( is_multisite() && ( ( ! $mu_media_buttons = get_site_option( 'mu_media_buttons' ) ) || empty( $mu_media_buttons['image'] ) ) )
-			$media_link_type = 'media';
-
 		$buttons = array(
 			// format: title, onclick, show in both editors
 			'bold' => array( 'title' => __('Bold (Ctrl + B)'), 'onclick' => 'fullscreen.b();', 'both' => false ),
@@ -607,7 +603,7 @@ class WP_Editor {
 			'numlist' => array( 'title' => __('Ordered list (Alt + Shift + O)'), 'onclick' => 'fullscreen.ol();', 'both' => false ),
 			'1' => 'separator',
 			'blockquote' => array( 'title' => __('Blockquote (Alt+Shift+Q)'), 'onclick' => 'fullscreen.blockquote();', 'both' => false ),
-			'image' => array( 'title' => __('Insert/edit image (Alt + Shift + M)'), 'onclick' => "jQuery('#add_{$media_link_type}').click();", 'both' => true ),
+			'image' => array( 'title' => __('Insert/edit image (Alt + Shift + M)'), 'onclick' => "fullscreen.medialib();", 'both' => true ),
 			'2' => 'separator',
 			'link' => array( 'title' => __('Insert/edit link (Alt + Shift + A)'), 'onclick' => 'fullscreen.link();', 'both' => true ),
 			'unlink' => array( 'title' => __('Unlink (Alt + Shift + S)'), 'onclick' => 'fullscreen.unlink();', 'both' => false ),
diff --git a/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.dev.js b/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.dev.js
index 6b27cd1c74..7536fdde3a 100644
--- a/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.dev.js
+++ b/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.dev.js
@@ -63,6 +63,19 @@
 					setUserSetting('hidetb', '0');
 				}
 			});
+			
+			ed.addCommand('WP_Medialib', function() {
+				var id = ed.getParam('wp_fullscreen_editor_id') || ed.getParam('fullscreen_editor_id') || ed.id,
+					link = tinymce.DOM.select('#wp-' + id + '-media-buttons a.thickbox');
+
+				if ( link && link[0] )
+					link = link[0];
+				else
+					return;
+
+				tb_show('', link.href);
+				tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' );
+			});
 
 			// Register buttons
 			ed.addButton('wp_more', {
@@ -86,49 +99,19 @@
 				cmd : 'WP_Adv'
 			});
 
-			// Add Media buttons
+			// Add Media button
 			ed.addButton('add_media', {
 				title : 'wordpress.add_media',
-				image : url + '/img/media.gif',
-				onclick : function() {
-					tb_show('', tinymce.DOM.get('add_media').href);
-					tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' );
-				}
-			});
-
-			ed.addButton('add_image', {
-				title : 'wordpress.add_image',
 				image : url + '/img/image.gif',
-				onclick : function() {
-					tb_show('', tinymce.DOM.get('add_image').href);
-					tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' );
-				}
-			});
-
-			ed.addButton('add_video', {
-				title : 'wordpress.add_video',
-				image : url + '/img/video.gif',
-				onclick : function() {
-					tb_show('', tinymce.DOM.get('add_video').href);
-					tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' );
-				}
-			});
-
-			ed.addButton('add_audio', {
-				title : 'wordpress.add_audio',
-				image : url + '/img/audio.gif',
-				onclick : function() {
-					tb_show('', tinymce.DOM.get('add_audio').href);
-					tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' );
-				}
+				cmd : 'WP_Medialib'
 			});
 
 			// Add Media buttons to fullscreen and handle align buttons for image captions
 			ed.onBeforeExecCommand.add(function(ed, cmd, ui, val, o) {
 				var DOM = tinymce.DOM, n, DL, DIV, cls, a, align;
 				if ( 'mceFullScreen' == cmd ) {
-					if ( 'mce_fullscreen' != ed.id && DOM.get('add_audio') && DOM.get('add_video') && DOM.get('add_image') && DOM.get('add_media') )
-						ed.settings.theme_advanced_buttons1 += ',|,add_image,add_video,add_audio,add_media';
+					if ( 'mce_fullscreen' != ed.id && DOM.select('a.thickbox').length )
+						ed.settings.theme_advanced_buttons1 += ',|,add_media';
 				}
 
 				if ( 'JustifyLeft' == cmd || 'JustifyRight' == cmd || 'JustifyCenter' == cmd ) {
@@ -253,7 +236,7 @@
 			ed.addShortcut('alt+shift+n', ed.getLang('spellchecker.desc'), 'mceSpellCheck');
 			ed.addShortcut('alt+shift+a', ed.getLang('link_desc'), 'mceLink');
 			ed.addShortcut('alt+shift+s', ed.getLang('unlink_desc'), 'unlink');
-			ed.addShortcut('alt+shift+m', ed.getLang('image_desc'), 'mceImage');
+			ed.addShortcut('alt+shift+m', ed.getLang('image_desc'), 'WP_Medialib');
 			ed.addShortcut('alt+shift+g', ed.getLang('fullscreen.desc'), 'mceFullScreen');
 			ed.addShortcut('alt+shift+z', ed.getLang('wp_adv_desc'), 'WP_Adv');
 			ed.addShortcut('alt+shift+h', ed.getLang('help_desc'), 'WP_Help');
diff --git a/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js b/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js
index 07733cb148..f95c3a726e 100644
--- a/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js
+++ b/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js
@@ -1 +1 @@
-(function(){var a=tinymce.DOM;tinymce.create("tinymce.plugins.WordPress",{mceTout:0,init:function(c,d){var e=this,h=c.getParam("wordpress_adv_toolbar","toolbar2"),g=0,f,b;f='<img src="'+d+'/img/trans.gif" class="mceWPmore mceItemNoResize" title="'+c.getLang("wordpress.wp_more_alt")+'" />';b='<img src="'+d+'/img/trans.gif" class="mceWPnextpage mceItemNoResize" title="'+c.getLang("wordpress.wp_page_alt")+'" />';if(getUserSetting("hidetb","0")=="1"){c.settings.wordpress_adv_hidden=0}c.onPostRender.add(function(){var i=c.controlManager.get(h);if(c.getParam("wordpress_adv_hidden",1)&&i){a.hide(i.id);e._resizeIframe(c,h,28)}});c.addCommand("WP_More",function(){c.execCommand("mceInsertContent",0,f)});c.addCommand("WP_Page",function(){c.execCommand("mceInsertContent",0,b)});c.addCommand("WP_Help",function(){c.windowManager.open({url:tinymce.baseURL+"/wp-mce-help.php",width:450,height:420,inline:1})});c.addCommand("WP_Adv",function(){var i=c.controlManager,j=i.get(h).id;if("undefined"==j){return}if(a.isHidden(j)){i.setActive("wp_adv",1);a.show(j);e._resizeIframe(c,h,-28);c.settings.wordpress_adv_hidden=0;setUserSetting("hidetb","1")}else{i.setActive("wp_adv",0);a.hide(j);e._resizeIframe(c,h,28);c.settings.wordpress_adv_hidden=1;setUserSetting("hidetb","0")}});c.addButton("wp_more",{title:"wordpress.wp_more_desc",cmd:"WP_More"});c.addButton("wp_page",{title:"wordpress.wp_page_desc",image:d+"/img/page.gif",cmd:"WP_Page"});c.addButton("wp_help",{title:"wordpress.wp_help_desc",cmd:"WP_Help"});c.addButton("wp_adv",{title:"wordpress.wp_adv_desc",cmd:"WP_Adv"});c.addButton("add_media",{title:"wordpress.add_media",image:d+"/img/media.gif",onclick:function(){tb_show("",tinymce.DOM.get("add_media").href);tinymce.DOM.setStyle(["TB_overlay","TB_window","TB_load"],"z-index","999999")}});c.addButton("add_image",{title:"wordpress.add_image",image:d+"/img/image.gif",onclick:function(){tb_show("",tinymce.DOM.get("add_image").href);tinymce.DOM.setStyle(["TB_overlay","TB_window","TB_load"],"z-index","999999")}});c.addButton("add_video",{title:"wordpress.add_video",image:d+"/img/video.gif",onclick:function(){tb_show("",tinymce.DOM.get("add_video").href);tinymce.DOM.setStyle(["TB_overlay","TB_window","TB_load"],"z-index","999999")}});c.addButton("add_audio",{title:"wordpress.add_audio",image:d+"/img/audio.gif",onclick:function(){tb_show("",tinymce.DOM.get("add_audio").href);tinymce.DOM.setStyle(["TB_overlay","TB_window","TB_load"],"z-index","999999")}});c.onBeforeExecCommand.add(function(p,m,s,l,j){var v=tinymce.DOM,k,i,r,u,t,q;if("mceFullScreen"==m){if("mce_fullscreen"!=p.id&&v.get("add_audio")&&v.get("add_video")&&v.get("add_image")&&v.get("add_media")){p.settings.theme_advanced_buttons1+=",|,add_image,add_video,add_audio,add_media"}}if("JustifyLeft"==m||"JustifyRight"==m||"JustifyCenter"==m){k=p.selection.getNode();if(k.nodeName=="IMG"){q=m.substr(7).toLowerCase();t="align"+q;i=p.dom.getParent(k,"dl.wp-caption");r=p.dom.getParent(k,"div.mceTemp");if(i&&r){u=p.dom.hasClass(i,t)?"alignnone":t;i.className=i.className.replace(/align[^ '"]+\s?/g,"");p.dom.addClass(i,u);if(u=="aligncenter"){p.dom.addClass(r,"mceIEcenter")}else{p.dom.removeClass(r,"mceIEcenter")}j.terminate=true;p.execCommand("mceRepaint")}else{if(p.dom.hasClass(k,t)){p.dom.addClass(k,"alignnone")}else{p.dom.removeClass(k,"alignnone")}}}}});c.onInit.add(function(i){i.onNodeChange.add(function(k,j,m){var l;if(m.nodeName=="IMG"){l=k.dom.getParent(m,"dl.wp-caption")}else{if(m.nodeName=="DIV"&&k.dom.hasClass(m,"mceTemp")){l=m.firstChild;if(!k.dom.hasClass(l,"wp-caption")){l=false}}}if(l){if(k.dom.hasClass(l,"alignleft")){j.setActive("justifyleft",1)}else{if(k.dom.hasClass(l,"alignright")){j.setActive("justifyright",1)}else{if(k.dom.hasClass(l,"aligncenter")){j.setActive("justifycenter",1)}}}}});if(i.id!="wp_mce_fullscreen"){i.dom.addClass(i.getBody(),"wp-editor")}i.onBeforeSetContent.add(function(j,k){if(k.content){k.content=k.content.replace(/<p>\s*<(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre|address)( [^>]*)?>/gi,"<$1$2>");k.content=k.content.replace(/<\/(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre|address)>\s*<\/p>/gi,"</$1>")}})});if("undefined"!=typeof(jQuery)){c.onKeyUp.add(function(j,l){var i=l.keyCode||l.charCode;if(i==g){return}if(13==i||8==g||46==g){jQuery(document).triggerHandler("wpcountwords",[j.getContent({format:"raw"})])}g=i})}c.onSaveContent.addToTop(function(i,j){j.content=j.content.replace(/<p>(<br ?\/?>|\u00a0|\uFEFF)?<\/p>/g,"<p>&nbsp;</p>")});c.onSaveContent.add(function(i,j){if(i.getParam("wpautop",true)&&typeof(switchEditors)=="object"){if(i.isHidden()){j.content=j.element.value}else{j.content=switchEditors.pre_wpautop(j.content)}}});e._handleMoreBreak(c,d);c.addShortcut("alt+shift+c",c.getLang("justifycenter_desc"),"JustifyCenter");c.addShortcut("alt+shift+r",c.getLang("justifyright_desc"),"JustifyRight");c.addShortcut("alt+shift+l",c.getLang("justifyleft_desc"),"JustifyLeft");c.addShortcut("alt+shift+j",c.getLang("justifyfull_desc"),"JustifyFull");c.addShortcut("alt+shift+q",c.getLang("blockquote_desc"),"mceBlockQuote");c.addShortcut("alt+shift+u",c.getLang("bullist_desc"),"InsertUnorderedList");c.addShortcut("alt+shift+o",c.getLang("numlist_desc"),"InsertOrderedList");c.addShortcut("alt+shift+d",c.getLang("striketrough_desc"),"Strikethrough");c.addShortcut("alt+shift+n",c.getLang("spellchecker.desc"),"mceSpellCheck");c.addShortcut("alt+shift+a",c.getLang("link_desc"),"mceLink");c.addShortcut("alt+shift+s",c.getLang("unlink_desc"),"unlink");c.addShortcut("alt+shift+m",c.getLang("image_desc"),"mceImage");c.addShortcut("alt+shift+g",c.getLang("fullscreen.desc"),"mceFullScreen");c.addShortcut("alt+shift+z",c.getLang("wp_adv_desc"),"WP_Adv");c.addShortcut("alt+shift+h",c.getLang("help_desc"),"WP_Help");c.addShortcut("alt+shift+t",c.getLang("wp_more_desc"),"WP_More");c.addShortcut("alt+shift+p",c.getLang("wp_page_desc"),"WP_Page");c.addShortcut("ctrl+s",c.getLang("save_desc"),function(){if("function"==typeof autosave){autosave()}});if(tinymce.isWebKit){c.addShortcut("alt+shift+b",c.getLang("bold_desc"),"Bold");c.addShortcut("alt+shift+i",c.getLang("italic_desc"),"Italic")}c.onInit.add(function(i){tinymce.dom.Event.add(i.getWin(),"scroll",function(j){i.plugins.wordpress._hideButtons()});tinymce.dom.Event.add(i.getBody(),"dragstart",function(j){i.plugins.wordpress._hideButtons()})});c.onBeforeExecCommand.add(function(i,k,j,l){i.plugins.wordpress._hideButtons()});c.onSaveContent.add(function(i,j){i.plugins.wordpress._hideButtons()});c.onMouseDown.add(function(i,j){if(j.target.nodeName!="IMG"){i.plugins.wordpress._hideButtons()}})},getInfo:function(){return{longname:"WordPress Plugin",author:"WordPress",authorurl:"http://wordpress.org",infourl:"http://wordpress.org",version:"3.0"}},_setEmbed:function(b){return b.replace(/\[embed\]([\s\S]+?)\[\/embed\][\s\u00a0]*/g,function(d,c){return'<img width="300" height="200" src="'+tinymce.baseURL+'/plugins/wordpress/img/trans.gif" class="wp-oembed mceItemNoResize" alt="'+c+'" title="'+c+'" />'})},_getEmbed:function(b){return b.replace(/<img[^>]+>/g,function(c){if(c.indexOf('class="wp-oembed')!=-1){var d=c.match(/alt="([^\"]+)"/);if(d[1]){c="[embed]"+d[1]+"[/embed]"}}return c})},_showButtons:function(f,d){var g=tinyMCE.activeEditor,i,h,b,j=tinymce.DOM,e,c;b=g.dom.getViewPort(g.getWin());i=j.getPos(g.getContentAreaContainer());h=g.dom.getPos(f);e=Math.max(h.x-b.x,0)+i.x;c=Math.max(h.y-b.y,0)+i.y;j.setStyles(d,{top:c+5+"px",left:e+5+"px",display:"block"});if(this.mceTout){clearTimeout(this.mceTout)}this.mceTout=setTimeout(function(){g.plugins.wordpress._hideButtons()},5000)},_hideButtons:function(){if(!this.mceTout){return}if(document.getElementById("wp_editbtns")){tinymce.DOM.hide("wp_editbtns")}if(document.getElementById("wp_gallerybtns")){tinymce.DOM.hide("wp_gallerybtns")}clearTimeout(this.mceTout);this.mceTout=0},_resizeIframe:function(c,e,b){var d=c.getContentAreaContainer().firstChild;a.setStyle(d,"height",d.clientHeight+b);c.theme.deltaHeight+=b},_handleMoreBreak:function(c,d){var e,b;e='<img src="'+d+'/img/trans.gif" alt="$1" class="mceWPmore mceItemNoResize" title="'+c.getLang("wordpress.wp_more_alt")+'" />';b='<img src="'+d+'/img/trans.gif" class="mceWPnextpage mceItemNoResize" title="'+c.getLang("wordpress.wp_page_alt")+'" />';c.onInit.add(function(){c.dom.loadCSS(d+"/css/content.css")});c.onPostRender.add(function(){if(c.theme.onResolveName){c.theme.onResolveName.add(function(f,g){if(g.node.nodeName=="IMG"){if(c.dom.hasClass(g.node,"mceWPmore")){g.name="wpmore"}if(c.dom.hasClass(g.node,"mceWPnextpage")){g.name="wppage"}}})}});c.onBeforeSetContent.add(function(f,g){if(g.content){g.content=g.content.replace(/<!--more(.*?)-->/g,e);g.content=g.content.replace(/<!--nextpage-->/g,b)}});c.onPostProcess.add(function(f,g){if(g.get){g.content=g.content.replace(/<img[^>]+>/g,function(i){if(i.indexOf('class="mceWPmore')!==-1){var h,j=(h=i.match(/alt="(.*?)"/))?h[1]:"";i="<!--more"+j+"-->"}if(i.indexOf('class="mceWPnextpage')!==-1){i="<!--nextpage-->"}return i})}});c.onNodeChange.add(function(g,f,h){f.setActive("wp_page",h.nodeName==="IMG"&&g.dom.hasClass(h,"mceWPnextpage"));f.setActive("wp_more",h.nodeName==="IMG"&&g.dom.hasClass(h,"mceWPmore"))})}});tinymce.PluginManager.add("wordpress",tinymce.plugins.WordPress)})();
\ No newline at end of file
+(function(){var a=tinymce.DOM;tinymce.create("tinymce.plugins.WordPress",{mceTout:0,init:function(c,d){var e=this,h=c.getParam("wordpress_adv_toolbar","toolbar2"),g=0,f,b;f='<img src="'+d+'/img/trans.gif" class="mceWPmore mceItemNoResize" title="'+c.getLang("wordpress.wp_more_alt")+'" />';b='<img src="'+d+'/img/trans.gif" class="mceWPnextpage mceItemNoResize" title="'+c.getLang("wordpress.wp_page_alt")+'" />';if(getUserSetting("hidetb","0")=="1"){c.settings.wordpress_adv_hidden=0}c.onPostRender.add(function(){var i=c.controlManager.get(h);if(c.getParam("wordpress_adv_hidden",1)&&i){a.hide(i.id);e._resizeIframe(c,h,28)}});c.addCommand("WP_More",function(){c.execCommand("mceInsertContent",0,f)});c.addCommand("WP_Page",function(){c.execCommand("mceInsertContent",0,b)});c.addCommand("WP_Help",function(){c.windowManager.open({url:tinymce.baseURL+"/wp-mce-help.php",width:450,height:420,inline:1})});c.addCommand("WP_Adv",function(){var i=c.controlManager,j=i.get(h).id;if("undefined"==j){return}if(a.isHidden(j)){i.setActive("wp_adv",1);a.show(j);e._resizeIframe(c,h,-28);c.settings.wordpress_adv_hidden=0;setUserSetting("hidetb","1")}else{i.setActive("wp_adv",0);a.hide(j);e._resizeIframe(c,h,28);c.settings.wordpress_adv_hidden=1;setUserSetting("hidetb","0")}});c.addCommand("WP_Medialib",function(){var j=c.getParam("wp_fullscreen_editor_id")||c.getParam("fullscreen_editor_id")||c.id,i=tinymce.DOM.select("#wp-"+j+"-media-buttons a.thickbox");if(i&&i[0]){i=i[0]}else{return}tb_show("",i.href);tinymce.DOM.setStyle(["TB_overlay","TB_window","TB_load"],"z-index","999999")});c.addButton("wp_more",{title:"wordpress.wp_more_desc",cmd:"WP_More"});c.addButton("wp_page",{title:"wordpress.wp_page_desc",image:d+"/img/page.gif",cmd:"WP_Page"});c.addButton("wp_help",{title:"wordpress.wp_help_desc",cmd:"WP_Help"});c.addButton("wp_adv",{title:"wordpress.wp_adv_desc",cmd:"WP_Adv"});c.addButton("add_media",{title:"wordpress.add_media",image:d+"/img/image.gif",cmd:"WP_Medialib"});c.onBeforeExecCommand.add(function(p,m,s,l,j){var v=tinymce.DOM,k,i,r,u,t,q;if("mceFullScreen"==m){if("mce_fullscreen"!=p.id&&v.select("a.thickbox").length){p.settings.theme_advanced_buttons1+=",|,add_media"}}if("JustifyLeft"==m||"JustifyRight"==m||"JustifyCenter"==m){k=p.selection.getNode();if(k.nodeName=="IMG"){q=m.substr(7).toLowerCase();t="align"+q;i=p.dom.getParent(k,"dl.wp-caption");r=p.dom.getParent(k,"div.mceTemp");if(i&&r){u=p.dom.hasClass(i,t)?"alignnone":t;i.className=i.className.replace(/align[^ '"]+\s?/g,"");p.dom.addClass(i,u);if(u=="aligncenter"){p.dom.addClass(r,"mceIEcenter")}else{p.dom.removeClass(r,"mceIEcenter")}j.terminate=true;p.execCommand("mceRepaint")}else{if(p.dom.hasClass(k,t)){p.dom.addClass(k,"alignnone")}else{p.dom.removeClass(k,"alignnone")}}}}});c.onInit.add(function(i){i.onNodeChange.add(function(k,j,m){var l;if(m.nodeName=="IMG"){l=k.dom.getParent(m,"dl.wp-caption")}else{if(m.nodeName=="DIV"&&k.dom.hasClass(m,"mceTemp")){l=m.firstChild;if(!k.dom.hasClass(l,"wp-caption")){l=false}}}if(l){if(k.dom.hasClass(l,"alignleft")){j.setActive("justifyleft",1)}else{if(k.dom.hasClass(l,"alignright")){j.setActive("justifyright",1)}else{if(k.dom.hasClass(l,"aligncenter")){j.setActive("justifycenter",1)}}}}});if(i.id!="wp_mce_fullscreen"){i.dom.addClass(i.getBody(),"wp-editor")}i.onBeforeSetContent.add(function(j,k){if(k.content){k.content=k.content.replace(/<p>\s*<(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre|address)( [^>]*)?>/gi,"<$1$2>");k.content=k.content.replace(/<\/(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre|address)>\s*<\/p>/gi,"</$1>")}})});if("undefined"!=typeof(jQuery)){c.onKeyUp.add(function(j,l){var i=l.keyCode||l.charCode;if(i==g){return}if(13==i||8==g||46==g){jQuery(document).triggerHandler("wpcountwords",[j.getContent({format:"raw"})])}g=i})}c.onSaveContent.addToTop(function(i,j){j.content=j.content.replace(/<p>(<br ?\/?>|\u00a0|\uFEFF)?<\/p>/g,"<p>&nbsp;</p>")});c.onSaveContent.add(function(i,j){if(i.getParam("wpautop",true)&&typeof(switchEditors)=="object"){if(i.isHidden()){j.content=j.element.value}else{j.content=switchEditors.pre_wpautop(j.content)}}});e._handleMoreBreak(c,d);c.addShortcut("alt+shift+c",c.getLang("justifycenter_desc"),"JustifyCenter");c.addShortcut("alt+shift+r",c.getLang("justifyright_desc"),"JustifyRight");c.addShortcut("alt+shift+l",c.getLang("justifyleft_desc"),"JustifyLeft");c.addShortcut("alt+shift+j",c.getLang("justifyfull_desc"),"JustifyFull");c.addShortcut("alt+shift+q",c.getLang("blockquote_desc"),"mceBlockQuote");c.addShortcut("alt+shift+u",c.getLang("bullist_desc"),"InsertUnorderedList");c.addShortcut("alt+shift+o",c.getLang("numlist_desc"),"InsertOrderedList");c.addShortcut("alt+shift+d",c.getLang("striketrough_desc"),"Strikethrough");c.addShortcut("alt+shift+n",c.getLang("spellchecker.desc"),"mceSpellCheck");c.addShortcut("alt+shift+a",c.getLang("link_desc"),"mceLink");c.addShortcut("alt+shift+s",c.getLang("unlink_desc"),"unlink");c.addShortcut("alt+shift+m",c.getLang("image_desc"),"WP_Medialib");c.addShortcut("alt+shift+g",c.getLang("fullscreen.desc"),"mceFullScreen");c.addShortcut("alt+shift+z",c.getLang("wp_adv_desc"),"WP_Adv");c.addShortcut("alt+shift+h",c.getLang("help_desc"),"WP_Help");c.addShortcut("alt+shift+t",c.getLang("wp_more_desc"),"WP_More");c.addShortcut("alt+shift+p",c.getLang("wp_page_desc"),"WP_Page");c.addShortcut("ctrl+s",c.getLang("save_desc"),function(){if("function"==typeof autosave){autosave()}});if(tinymce.isWebKit){c.addShortcut("alt+shift+b",c.getLang("bold_desc"),"Bold");c.addShortcut("alt+shift+i",c.getLang("italic_desc"),"Italic")}c.onInit.add(function(i){tinymce.dom.Event.add(i.getWin(),"scroll",function(j){i.plugins.wordpress._hideButtons()});tinymce.dom.Event.add(i.getBody(),"dragstart",function(j){i.plugins.wordpress._hideButtons()})});c.onBeforeExecCommand.add(function(i,k,j,l){i.plugins.wordpress._hideButtons()});c.onSaveContent.add(function(i,j){i.plugins.wordpress._hideButtons()});c.onMouseDown.add(function(i,j){if(j.target.nodeName!="IMG"){i.plugins.wordpress._hideButtons()}})},getInfo:function(){return{longname:"WordPress Plugin",author:"WordPress",authorurl:"http://wordpress.org",infourl:"http://wordpress.org",version:"3.0"}},_setEmbed:function(b){return b.replace(/\[embed\]([\s\S]+?)\[\/embed\][\s\u00a0]*/g,function(d,c){return'<img width="300" height="200" src="'+tinymce.baseURL+'/plugins/wordpress/img/trans.gif" class="wp-oembed mceItemNoResize" alt="'+c+'" title="'+c+'" />'})},_getEmbed:function(b){return b.replace(/<img[^>]+>/g,function(c){if(c.indexOf('class="wp-oembed')!=-1){var d=c.match(/alt="([^\"]+)"/);if(d[1]){c="[embed]"+d[1]+"[/embed]"}}return c})},_showButtons:function(f,d){var g=tinyMCE.activeEditor,i,h,b,j=tinymce.DOM,e,c;b=g.dom.getViewPort(g.getWin());i=j.getPos(g.getContentAreaContainer());h=g.dom.getPos(f);e=Math.max(h.x-b.x,0)+i.x;c=Math.max(h.y-b.y,0)+i.y;j.setStyles(d,{top:c+5+"px",left:e+5+"px",display:"block"});if(this.mceTout){clearTimeout(this.mceTout)}this.mceTout=setTimeout(function(){g.plugins.wordpress._hideButtons()},5000)},_hideButtons:function(){if(!this.mceTout){return}if(document.getElementById("wp_editbtns")){tinymce.DOM.hide("wp_editbtns")}if(document.getElementById("wp_gallerybtns")){tinymce.DOM.hide("wp_gallerybtns")}clearTimeout(this.mceTout);this.mceTout=0},_resizeIframe:function(c,e,b){var d=c.getContentAreaContainer().firstChild;a.setStyle(d,"height",d.clientHeight+b);c.theme.deltaHeight+=b},_handleMoreBreak:function(c,d){var e,b;e='<img src="'+d+'/img/trans.gif" alt="$1" class="mceWPmore mceItemNoResize" title="'+c.getLang("wordpress.wp_more_alt")+'" />';b='<img src="'+d+'/img/trans.gif" class="mceWPnextpage mceItemNoResize" title="'+c.getLang("wordpress.wp_page_alt")+'" />';c.onInit.add(function(){c.dom.loadCSS(d+"/css/content.css")});c.onPostRender.add(function(){if(c.theme.onResolveName){c.theme.onResolveName.add(function(f,g){if(g.node.nodeName=="IMG"){if(c.dom.hasClass(g.node,"mceWPmore")){g.name="wpmore"}if(c.dom.hasClass(g.node,"mceWPnextpage")){g.name="wppage"}}})}});c.onBeforeSetContent.add(function(f,g){if(g.content){g.content=g.content.replace(/<!--more(.*?)-->/g,e);g.content=g.content.replace(/<!--nextpage-->/g,b)}});c.onPostProcess.add(function(f,g){if(g.get){g.content=g.content.replace(/<img[^>]+>/g,function(i){if(i.indexOf('class="mceWPmore')!==-1){var h,j=(h=i.match(/alt="(.*?)"/))?h[1]:"";i="<!--more"+j+"-->"}if(i.indexOf('class="mceWPnextpage')!==-1){i="<!--nextpage-->"}return i})}});c.onNodeChange.add(function(g,f,h){f.setActive("wp_page",h.nodeName==="IMG"&&g.dom.hasClass(h,"mceWPnextpage"));f.setActive("wp_more",h.nodeName==="IMG"&&g.dom.hasClass(h,"mceWPmore"))})}});tinymce.PluginManager.add("wordpress",tinymce.plugins.WordPress)})();
\ No newline at end of file
diff --git a/wp-includes/js/tinymce/wp-tinymce.js.gz b/wp-includes/js/tinymce/wp-tinymce.js.gz
index 1b6c8ace22355f44ee83f5ba6e34b0c882fd5069..b4a21e551ecb89a66b27b7910130dfe1268b508a 100644
GIT binary patch
delta 6900
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

delta 6938
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

diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index 33f0a863b3..50ff6e5f26 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -86,7 +86,7 @@ function wp_default_scripts( &$scripts ) {
 
 	$scripts->add( 'editor', "/wp-admin/js/editor$suffix.js", array('utils','jquery'), '20110820', 1 );
 
-	$scripts->add( 'wp-fullscreen', "/wp-admin/js/wp-fullscreen$suffix.js", array('jquery'), '20110826', 1 );
+	$scripts->add( 'wp-fullscreen', "/wp-admin/js/wp-fullscreen$suffix.js", array('jquery'), '20110918', 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 bbf6786724..76b76f423e 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -18,7 +18,7 @@ $wp_db_version = 18541;
  *
  * @global string $tinymce_version
  */
-$tinymce_version = '345-20110917';
+$tinymce_version = '345-20110918';
 
 /**
  * Holds the cache manifest version