A few cleanups from the upgrade.

git-svn-id: http://svn.automattic.com/wordpress/trunk@2917 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-admin/admin-header.php

@@ -80,7 +80,7 @@ addLoadEvent(blurry);
 <script type="text/javascript" src="list-manipulation.js"></script>
 <?php if ( isset( $editing ) ) : ?>
 <?php if ( 'true' == get_user_option('rich_editing') ) :?>
-<script type="text/javascript" src="../wp-includes/js/tinymce/tiny_mce_src.js"></script>
+<script type="text/javascript" src="../wp-includes/js/tinymce/tiny_mce_gzip.php"></script>
 <script type="text/javascript">
 tinyMCE.init({
 	mode : "specific_textareas",
@@ -94,11 +94,13 @@ tinyMCE.init({
 	theme_advanced_toolbar_align : "left",
 	theme_advanced_path_location : "bottom",
 	theme_advanced_resizing : true,
+	browsers : "msie,gecko",
+	dialog_type : "modal",
 	theme_advanced_resize_horizontal : false,
 	entity_encoding : "raw",
 	relative_urls : false,
 	valid_elements : "a[href|title],strong/b,em/i,strike,u,p[class|align],ol,ul,li,br,img[class|src|alt|title|width|height|align],sub,sup,blockquote,table[border=0|cellspacing|cellpadding|width|height|class|align],tr[class|rowspan|width|height|align|valign],td[dir|class|colspan|rowspan|width|height|align|valign],div[dir|class|align],span[class|align],pre[class],address,h1[class|align],h2[class|align],h3[class|align],h4[class|align],h5[class|align],h6[class|align],hr",
-	plugins : ""
+	plugins : "autosave, contextmenu"
 	<?php do_action('mce_options'); ?>
 });
 </script>

wp-includes/js/tinymce/themes/advanced/css/editor_content.css

@@ -2,17 +2,11 @@
 /* You can extend this CSS by adding your own CSS file with the the content_css option */
 
 body {
-	background-color: #FFFFFF;
+	background-color: #fff;
 	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 10px;
+	font-size: 13px;
-	scrollbar-3dlight-color: #F0F0EE;
+	line-height: 130%;
-	scrollbar-arrow-color: #676662;
+	padding: 1em;
-	scrollbar-base-color: #F0F0EE;
-	scrollbar-darkshadow-color: #DDDDDD;
-	scrollbar-face-color: #E0E0DD;
-	scrollbar-highlight-color: #F0F0EE;
-	scrollbar-shadow-color: #F0F0EE;
-	scrollbar-track-color: #F5F5F5;
 }
 
 td {

wp-includes/js/tinymce/themes/advanced/editor_content.css

@@ -1,19 +0,0 @@
-body {
-	padding: .5em;
-	background: #fff;
-	color: #000;
-	font:  13px Verdana, Arial, Helvetica, sans-serif;
-	line-height: 130%;
-	scrollbar-3dlight-color: #F0F0EE;
-	scrollbar-arrow-color: #676662;
-	scrollbar-base-color: #F0F0EE;
-	scrollbar-darkshadow-color: #DDDDDD;
-	scrollbar-face-color: #E0E0DD;
-	scrollbar-highlight-color: #F0F0EE;
-	scrollbar-shadow-color: #F0F0EE;
-	scrollbar-track-color: #F5F5F5;
-}
-
-.mceVisualAid {
-	border: 1px dashed #bbb;
-}

wp-includes/js/tinymce/themes/advanced/editor_popup.css

@@ -1,108 +0,0 @@
-body, td {
-	background-color: #F0F0EE;
-	font: 13px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana;
-	margin: 1em;
-}
-
-
-input {
-	background: #FFFFFF;
-	border: 1px solid #cccccc;
-}
-
-input, select, textarea {
-	border: 1px solid #808080;
-}
-
-.input_noborder {
-	border: 0px solid #808080;
-}
-
-#insert {
-   font-weight: bold;
-}
-
-#cancel {
-   font-weight: bold;
-}
-
-#cancel:hover {
-	background-color: #c00;
-}
-
-.title {
-	font-size: 12px;
-	font-weight: bold;
-}
-
-table.charmap {
-	border-style: solid;
-	border-width: 1px;
-	border-color: #AAAAAA;
-}
-
-td.charmap, td.charmapOver {
-	color: #000000;
-	border-color: #AAAAAA;
-	border-style: solid;
-	border-width: 1px;
-	text-align: center;
-	font-size: 12px;
-}
-
-td.charmapOver {
-	background-color: #CCCCCC;
-	cursor: arrow;
-}
-
-a.charmap {
-	color: #000000;
-	text-decoration: none
-}
-
-.wordWrapCode {
-	vertical-align: middle;
-	border: 1px none #000000;
-	background-color: transparent;
-}
-
-input.radio {
-	border: 1px none #000000;
-	background-color: transparent;
-	vertical-align: middle;
-}
-
-input.checkbox {
-	border: 1px none #000000;
-	background-color: transparent;
-	vertical-align: middle;
-}
-
-.mceButtonNormal, .mceButtonOver, .mceButtonDown, .mceSeparator, .mceButtonDisabled, .mceButtonSelected {
-	margin-left: 1px;
-}
-
-.mceButtonNormal {
-	border-top: 1px solid;
-	border-left: 1px solid;
-	border-bottom: 1px solid;
-	border-right: 1px solid;
-	border-color: #F0F0EE;
-	cursor: arrow;
-}
-
-.mceButtonOver {
-	border: 1px solid #0A246A;
-	cursor: arrow;
-	background-color: #B6BDD2;
-}
-
-.mceButtonDown {
-	cursor: arrow;
-	border: 1px solid #0A246A;
-	background-color: #8592B5;
-}
-
-legend {
-	font-weight: bold;
-}

wp-includes/js/tinymce/themes/advanced/editor_ui.css

@@ -1,174 +0,0 @@
-/* This file contains the CSS data for the editor UI of TinyMCE instances */
-
-.mceButtonNormal, .mceButtonOver, .mceButtonDown, .mceSeparator, .mceButtonDisabled, .mceButtonSelected {
-	margin-top: 1px;
-	margin-left: 1px;
-}
-
-.mceButtonNormal {
-	border-top: 1px solid;
-	border-left: 1px solid;
-	border-bottom: 1px solid;
-	border-right: 1px solid;
-	border-color: #F0F0EE;
-	cursor: arrow;
-}
-
-.mceButtonOver {
-	border: 1px solid #0A246A;
-	cursor: arrow;
-	background-color: #B6BDD2;
-}
-
-.mceButtonDown {
-	cursor: arrow;
-	border: 1px solid #0A246A;
-	background-color: #8592B5;
-}
-
-.mceButtonSelected {
-	border: 1px solid;
-	border-color: #C0C0BB;
-	cursor: arrow;
-}
-
-.mceButtonDisabled {
-	filter:progid:DXImageTransform.Microsoft.Alpha(opacity=30);
-	-moz-opacity:0.3;
-	opacity: 0.3;
-	border-top: 1px solid;
-	border-left: 1px solid;
-	border-bottom: 1px solid;
-	border-right: 1px solid;
-	border-color: #F0F0EE;
-	cursor: arrow;
-}
-
-.mceSeparator {
-	border-top: 1px solid buttonhighlight;
-	border-left: 1px solid buttonhighlight;
-	border-bottom: 1px solid buttonshadow;
-	border-right: 1px solid buttonshadow;
-	margin-right: 2px;
-	margin-left: 2px;
-}
-
-.mceSeparatorLine {
-	margin:2px;
-	margin-left: 4px;
-	background-color: #F0F0EE;
-	border-top: 1px solid buttonshadow;
-	border-left: 1px solid buttonshadow;
-	border-bottom: 1px solid buttonhighlight;
-	border-right: 1px solid buttonhighlight;
-	width: 0px;
-	height: 15px;
-}
-
-.mceSelectList {
-	font-family: "MS Sans Serif";
-	font-size: 7pt;
-	font-weight: normal;
-	margin-top: 3px;
-	padding: 0px;
-	display: inline;
-	vertical-align: top;
-	background-color: #F0F0EE
-}
-
-.mceLabel, .mceLabelDisabled {
-	font-family: "MS Sans Serif";
-	font-size: 9pt;
-}
-
-.mceLabel {
-	color: #000000;
-}
-
-.mceLabelDisabled {
-	cursor: text;
-	color: #999999;
-}
-
-.mceEditor {
-	background: #F0F0EE;
-	border: 1px solid #cccccc;
-	padding: 0px;
-	margin: 0px;
-}
-
-.mceEditorArea {
-	font-family: "MS Sans Serif";
-	background: #FFFFFF;
-	padding: 0px;
-	margin: 0px;
-}
-
-.mceToolbarTop, .mceToolbarBottom {
-	background: #F0F0EE;
-}
-
-.mceToolbarTop {
-	border-bottom: 1px solid #cccccc;
-}
-
-.mceToolbarBottom {
-	border-top: 1px solid #cccccc;
-}
-
-.mceStatusbarTop, .mceStatusbarBottom, .mceStatusbar {
-	height: 20px;
-}
-
-.mceStatusbarTop .mceStatusbarPathText, .mceStatusbarBottom .mceStatusbarPathText, .mceStatusbar .mceStatusbarPathText {
-	font-family: "MS Sans Serif";
-	font-size: 9pt;
-	padding: 2px;
-	line-height: 16px;
-	overflow: visible;
-}
-
-.mceStatusbarTop {
-	border-bottom: 1px solid #cccccc;
-}
-
-.mceStatusbarBottom {
-	border-top: 1px solid #cccccc;
-}
-
-.mceStatusbar {
-	border-bottom: 1px solid #cccccc;
-}
-
-.mcePathItem, .mcePathItem:link, .mcePathItem:visited, .mcePathItem:hover {
-	text-decoration: none;
-	font-family: "MS Sans Serif";
-	font-size: 9pt;
-	color: #000000;
-}
-
-.mcePathItem:hover {
-	text-decoration: underline;
-}
-
-.mceStatusbarPathText {
-	float: left;
-}
-
-.mceStatusbarResize {
-	float: right;
-	background-image: url('images/statusbar_resize.gif');
-	background-repeat: no-repeat;
-	width: 11px;
-	height: 20px;
-	cursor: se-resize;
-}
-
-.mceResizeBox {
-	width: 10px;
-	height: 10px;
-	display: none;
-	border: 1px dotted gray;
-	margin: 0px;
-	padding: 0px;
-}

wp-includes/js/tinymce/themes/advanced/source_editor.htm

@@ -1,6 +1,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<title>{$lang_theme_code_title}</title>
 	<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
 	<script language="javascript" type="text/javascript" src="jscripts/source_editor.js"></script>

wp-includes/js/tinymce/tiny_mce_gzip.php

@@ -5,7 +5,7 @@
 	 * $Date: 2005/06/14 18:55:34 $
 	 *
 	 * @author Moxiecode
-	 * @copyright Copyright  2004, Moxiecode Systems AB, All rights reserved.
+	 * @copyright Copyright © 2004, Moxiecode Systems AB, All rights reserved.
 	 *
 	 * This file compresses the TinyMCE JavaScript using GZip and
 	 * enables the browser to do two requests instead of one for each .js file.
@@ -16,7 +16,7 @@
 	 */
 
 	// General options
-	$suffix = "_src";							// Set to "_src" to use source version
+	$suffix = "";							// Set to "_src" to use source version
 	$expiresOffset = 3600 * 24 * 10;		// 10 days util client cache expires
 
 	// Get data to load