From 9ff67a46b4ffc21bd89f47e30c009971de0aa6b1 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sun, 23 Mar 2008 16:37:06 +0000
Subject: [PATCH] Maintain toolbar state. Props azaozz. fixes #6360

git-svn-id: http://svn.automattic.com/wordpress/trunk@7489 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 .../plugins/wordpress/editor_plugin.js        | 36 +++++++++++--------
 wp-includes/js/tinymce/tiny_mce_config.php    |  2 +-
 wp-includes/script-loader.php                 |  2 +-
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js b/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js
index c059249961..2d5cb3dee1 100644
--- a/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js
+++ b/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js
@@ -14,6 +14,9 @@
             var moreHTML = '<img src="' + url + '/img/trans.gif" class="mceWPmore mceItemNoResize" title="'+ed.getLang('wordpress.wp_more_alt')+'" />';
             var nextpageHTML = '<img src="' + url + '/img/trans.gif" class="mceWPnextpage mceItemNoResize" title="'+ed.getLang('wordpress.wp_page_alt')+'" />';
 
+			if ( tinymce.util.Cookie.get('kitchenSink') == '1' )
+				ed.settings.wordpress_adv_hidden = 0;
+
 			// Hides the specified toolbar and resizes the iframe
 			ed.onPostRender.add(function() {
 				if ( ed.getParam('wordpress_adv_hidden', 1) ) {
@@ -41,21 +44,26 @@
 				});
 			
 			ed.addCommand('WP_Adv', function() {
-					var id = ed.controlManager.get(tbId).id, cm = ed.controlManager;
+				var id = ed.controlManager.get(tbId).id, cm = ed.controlManager, cook = tinymce.util.Cookie, date;
+
+				date = new Date();
+        		date.setTime(date.getTime()+(10*365*24*60*60*1000));
+				
+				if (DOM.isHidden(id)) {
+					cm.setActive('wp_adv', 1);
+					DOM.show(id);
+					t._resizeIframe(ed, tbId, -28);
+					ed.settings.wordpress_adv_hidden = 0;
+					cook.set('kitchenSink', '1', date);
+				} else {
+					cm.setActive('wp_adv', 0);
+					DOM.hide(id);
+					t._resizeIframe(ed, tbId, 28);
+					ed.settings.wordpress_adv_hidden = 1;
+					cook.set('kitchenSink', '0', date);
+				}
+			});
 
-					if (DOM.isHidden(id)) {
-						cm.setActive('wp_adv', 1);
-						DOM.show(id);
-						t._resizeIframe(ed, tbId, -28);
-						ed.settings.wordpress_adv_hidden = 0;
-					} else {
-						cm.setActive('wp_adv', 0);
-						DOM.hide(id);
-						t._resizeIframe(ed, tbId, 28);
-						ed.settings.wordpress_adv_hidden = 1;
-					}
-				});
-			
 			// Register buttons
 			ed.addButton('wp_more', {
 				title : 'wordpress.wp_more_desc',
diff --git a/wp-includes/js/tinymce/tiny_mce_config.php b/wp-includes/js/tinymce/tiny_mce_config.php
index 22b7a999dd..51461f3597 100644
--- a/wp-includes/js/tinymce/tiny_mce_config.php
+++ b/wp-includes/js/tinymce/tiny_mce_config.php
@@ -228,7 +228,7 @@ if ( $compress && isset($_SERVER['HTTP_ACCEPT_ENCODING']) ) {
 // Setup cache info
 if ( $disk_cache ) {
 
-	$cacheKey = apply_filters('tiny_mce_version', '20080321');
+	$cacheKey = apply_filters('tiny_mce_version', '20080323');
 
 	foreach ( $initArray as $v )
 		$cacheKey .= $v;
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index 139518c890..1ef6477ef7 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -36,7 +36,7 @@ class WP_Scripts {
 		$this->add( 'editor_functions', '/wp-admin/js/editor.js', false, '20080321' );
 
 		// Modify this version when tinyMCE plugins are changed.
-		$mce_version = apply_filters('tiny_mce_version', '20080321');
+		$mce_version = apply_filters('tiny_mce_version', '20080323');
 		$this->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_config.php', array('editor_functions'), $mce_version );
 
 		$this->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.6');