Changeset 4799

Timestamp:

01/25/2007 01:20:47 AM (18 years ago)

Author:

ryan

Message:

TinyMCE 2.0.9. fixes #3564

Location:

trunk/wp-includes

Files:

• js/tinymce/plugins/autosave/editor_plugin.js (modified) (1 diff)
• js/tinymce/plugins/directionality/editor_plugin.js (modified) (1 diff)
• js/tinymce/plugins/inlinepopups/editor_plugin.js (modified) (8 diffs)
• js/tinymce/plugins/paste/editor_plugin.js (modified) (1 diff)
• js/tinymce/themes/advanced/about.htm (modified) (1 diff)
• js/tinymce/themes/advanced/css/editor_ui.css (modified) (1 diff)
• js/tinymce/themes/advanced/editor_template.js (modified) (11 diffs)
• js/tinymce/themes/advanced/jscripts/source_editor.js (modified) (3 diffs)
• js/tinymce/tiny_mce.js (modified) (53 diffs)
• js/tinymce/utils/editable_selects.js (added)
• js/tinymce/utils/form_utils.js (modified) (1 diff)
• js/tinymce/utils/mclayer.js (modified) (1 diff)
• js/tinymce/utils/mctabs.js (modified) (1 diff)
• js/tinymce/utils/validate.js (modified) (1 diff)
• js/tinymce/wp-mce-help.php (modified) (1 diff)
• script-loader.php (modified) (1 diff)

trunk/wp-includes/js/tinymce/plugins/autosave/editor_plugin.js

@@ -1 +1 @@
 /**
- * $Id: editor_plugin_src.js 126 2006-10-22 16:19:55Z spocke $
+ * $Id: editor_plugin_src.js 162 2007-01-03 16:16:52Z spocke $
  *
  * @author Moxiecode
- * @copyright Copyright © 2004-2006, Moxiecode Systems AB, All rights reserved.
+ * @copyright Copyright © 2004-2007, Moxiecode Systems AB, All rights reserved.
  */
 

trunk/wp-includes/js/tinymce/plugins/directionality/editor_plugin.js

@@ -1 +1 @@
 /**
- * $Id: editor_plugin_src.js 126 2006-10-22 16:19:55Z spocke $
+ * $Id: editor_plugin_src.js 162 2007-01-03 16:16:52Z spocke $
  *
  * @author Moxiecode
- * @copyright Copyright © 2004-2006, Moxiecode Systems AB, All rights reserved.
+ * @copyright Copyright © 2004-2007, Moxiecode Systems AB, All rights reserved.
  */
 

trunk/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js

@@ -1 +1 @@
 /**
- * $Id: editor_plugin_src.js 126 2006-10-22 16:19:55Z spocke $
+ * $Id: editor_plugin_src.js 172 2007-01-09 11:37:11Z spocke $
  *
  * Moxiecode DHTML Windows script.
  *
  * @author Moxiecode
- * @copyright Copyright © 2004-2006, Moxiecode Systems AB, All rights reserved.
+ * @copyright Copyright © 2004-2007, Moxiecode Systems AB, All rights reserved.
  */
 
@@ -67 +67 @@
 
     var elm = document.getElementById(this.selectedInstance.editorId + '_parent');
-    var pos = tinyMCE.getAbsPosition(elm);
+
+    if (tinyMCE.hasPlugin('fullscreen') && this.selectedInstance.getData('fullscreen').enabled)
+        pos = { absLeft: 0, absTop: 0 };
+    else
+        pos = tinyMCE.getAbsPosition(elm);
 
     // Center div in editor area
@@ -73 +77 @@
     pos.absTop += Math.round((elm.firstChild.clientHeight / 2) - (height / 2));
 
-    url += tinyMCE.settings['imp_version'] ? (url.indexOf('?')==-1?'?':'&') + 'ver=' + tinyMCE.settings['imp_version'] : '';
+    url += tinyMCE.settings['imp_version'] ? (url.indexOf('?')==-1?'?':'&') + 'ver=' + tinyMCE.settings['imp_version'] : ''; // WordPress cache buster
 
     mcWindows.open(url, mcWindows.idCounter++, "modal=yes,width=" + width+ ",height=" + height + ",resizable=" + resizable + ",scrollbars=" + scrollbars + ",statusbar=" + resizable + ",left=" + pos.absLeft + ",top=" + pos.absTop);
@@ -112 +116 @@
     this.selectedWindow = null;
     this.lastSelectedWindow = null;
-    this.zindex = 100;
+    this.zindex = 1001;
     this.mouseDownScreenX = 0;
     this.mouseDownScreenY = 0;
@@ -324 +328 @@
 // Blocks the document events by placing a image over the whole document
 TinyMCE_Windows.prototype.setDocumentLock = function(state) {
+    var elm = document.getElementById('mcWindowEventBlocker');
+
     if (state) {
-        var elm = document.getElementById('mcWindowEventBlocker');
         if (elm == null) {
             elm = document.createElement("div");
@@ -349 +354 @@
         elm.style.zIndex = mcWindows.zindex-1;
         elm.style.display = "block";
-    } else {
-        var elm = document.getElementById('mcWindowEventBlocker');
-
+    } else if (elm != null) {
         if (mcWindows.windows.length == 0)
             elm.parentNode.removeChild(elm);
@@ -560 +563 @@
     mcWindows.setDocumentLock(false);
 
-    tinyMCE.selectedInstance.getWin().focus();
+    tinyMCE.selectedInstance.getWin().focus(); // WordPress: focus on the editor after closing a popup
 };
 
@@ -579 +582 @@
             height = height < 100 ? 100 : height;
 
-            this.wrapperIFrameElement.style.width = width+2;
-            this.wrapperIFrameElement.style.height = height+2;
+            this.wrapperIFrameElement.style.width = (width+2) + 'px';
+            this.wrapperIFrameElement.style.height = (height+2) + 'px';
             this.wrapperIFrameElement.width = width+2;
             this.wrapperIFrameElement.height = height+2;
-            this.winElement.style.width = width;
-            this.winElement.style.height = height;
+            this.winElement.style.width = width + 'px';
+            this.winElement.style.height = height + 'px';
 
             height = height - this.deltaHeight;
 
-            this.containerElement.style.width = width;
-
-            this.iframeElement.style.width = width;
-            this.iframeElement.style.height = height;
-            this.bodyElement.style.width = width;
-            this.bodyElement.style.height = height;
-            this.headElement.style.width = width;
-            //this.statusElement.style.width = width;
+            this.containerElement.style.width = width + 'px';
+            this.iframeElement.style.width = width + 'px';
+            this.iframeElement.style.height = height + 'px';
+            this.bodyElement.style.width = width + 'px';
+            this.bodyElement.style.height = height + 'px';
+            this.headElement.style.width = width + 'px';
+            //this.statusElement.style.width = width + 'px';
 
             mcWindows.cancelEvent(e);

trunk/wp-includes/js/tinymce/plugins/paste/editor_plugin.js

@@ -1 +1 @@
 /**
- * $Id: editor_plugin_src.js 126 2006-10-22 16:19:55Z spocke $
+ * $Id: editor_plugin_src.js 162 2007-01-03 16:16:52Z spocke $
  *
  * @author Moxiecode
- * @copyright Copyright © 2004-2006, Moxiecode Systems AB, All rights reserved.
+ * @copyright Copyright © 2004-2007, Moxiecode Systems AB, All rights reserved.
  */
 

trunk/wp-includes/js/tinymce/themes/advanced/about.htm

@@ -22 +22 @@
                 <p>TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor control released as Open Source under <a href="../../license.txt" target="_blank">LGPL</a>
                 by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.</p>
-                <p>Copyright &copy; 2003-2006, <a href="http://www.moxiecode.com" target="_blank">Moxiecode Systems AB</a>, All rights reserved.</p>
+                <p>Copyright &copy; 2003-2007, <a href="http://www.moxiecode.com" target="_blank">Moxiecode Systems AB</a>, All rights reserved.</p>
                 <p>For more information about this software visit the <a href="http://tinymce.moxiecode.com" target="_blank">TinyMCE website</a>.</p>
 

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

@@ -1 +1 @@
 /* This file contains the CSS data for the editor UI of TinyMCE instances */
 
-.mceToolbarTop a, .mceToolbarTop a:visited, .mceToolbarTop a:hover, .mceToolbarBottom a, .mceToolbarBottom a:visited, .mceToolbarBottom a:hover {border: 0;  margin: 0;  padding: 0;  background: transparent;}
+.mceToolbarTop a, .mceToolbarTop a:visited, .mceToolbarTop a:hover, .mceToolbarBottom a, .mceToolbarBottom a:visited, .mceToolbarBottom a:hover {border: 0; margin: 0; padding: 0; background: transparent;}
 .mceSeparatorLine {border: 0; padding: 0; margin-left: 4px; margin-right: 2px;}
 .mceSelectList {font-family: 'MS Sans Serif', sans-serif, Verdana, Arial; font-size: 7pt !important; font-weight: normal; margin-top: 3px; padding: 0; display: inline; vertical-align: top; background-color: #F0F0EE;}
 .mceLabel, .mceLabelDisabled {font-family: 'MS Sans Serif', sans-serif, Verdana, Arial; font-size: 9pt;}
 .mceLabel {color: #000000;}
-.mceLabelDisabled {cursor: text;  color: #999999;}
-.mceEditor {background: #F0F0EE;  border: 1px solid #cccccc;  padding: 0;  margin: 0;}
-.mceEditorArea { font-family: 'MS Sans Serif', sans-serif, Verdana, Arial;  background: #FFFFFF;  padding: 0;  margin: 0;  }
-.mceToolbarTop, .mceToolbarBottom {background: #F0F0EE;  line-height: 1px;  font-size: 1px;}
+.mceLabelDisabled {cursor: text; color: #999999;}
+.mceEditor {background: #F0F0EE; border: 1px solid #cccccc; padding: 0; margin: 0;}
+.mceEditorArea { font-family: 'MS Sans Serif', sans-serif, Verdana, Arial; background: #FFFFFF; padding: 0; margin: 0; }
+.mceToolbarTop, .mceToolbarBottom {background: #F0F0EE; line-height: 1px; font-size: 1px;}
 .mceToolbarTop {border-bottom: 1px solid #cccccc; padding-bottom: 1px;}
 .mceToolbarBottom {border-top: 1px solid #cccccc;}
-.mceToolbarContainer {position: relative;  left: 0;  top: 0;  display: block;}
+.mceToolbarContainer {position: relative; left: 0; top: 0; display: block;}
 .mceStatusbarTop, .mceStatusbarBottom, .mceStatusbar {height: 20px;}
-.mceStatusbarTop .mceStatusbarPathText, .mceStatusbarBottom .mceStatusbarPathText, .mceStatusbar .mceStatusbarPathText {font-family: 'MS Sans Serif', sans-serif, Verdana, Arial;  font-size: 9pt;  padding: 2px;  line-height: 16px;  overflow: visible;}
+.mceStatusbarTop .mceStatusbarPathText, .mceStatusbarBottom .mceStatusbarPathText, .mceStatusbar .mceStatusbarPathText {font-family: 'MS Sans Serif', sans-serif, Verdana, Arial; 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', sans-serif, Verdana, Arial;  font-size: 9pt;  color: #000000;}
+.mcePathItem, .mcePathItem:link, .mcePathItem:visited, .mcePathItem:hover {text-decoration: none; font-family: 'MS Sans Serif', sans-serif, Verdana, Arial; 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: 0;  padding: 0;}
+.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: 0; padding: 0;}
 .mceEditorIframe {border: 0;}
 
 /* Button CSS rules */
 
-a.mceButtonDisabled img, a.mceButtonNormal img, a.mceButtonSelected img {width: 20px;  height: 20px;  cursor: default;  margin-top: 1px;  margin-left: 1px;}
+a.mceButtonDisabled img, a.mceButtonNormal img, a.mceButtonSelected img {width: 20px; height: 20px; cursor: default; margin-top: 1px; margin-left: 1px;}
 a.mceButtonDisabled img {border: 0 !important;}
 a.mceButtonNormal img, a.mceButtonSelected img {border: 1px solid #F0F0EE !important;}
-a.mceButtonSelected img {border: 1px solid #6779AA !important;  background-color: #D4D5D8;}
-a.mceButtonNormal img:hover, a.mceButtonSelected img:hover {border: 1px solid #0A246A !important;  cursor: default;  background-color: #B6BDD2;}
-a.mceButtonDisabled img {-moz-opacity:0.3;  opacity: 0.3;  border: 1px solid #F0F0EE !important;  cursor: default;}
-a.mceTiledButton img {background-image: url('../images/buttons.gif');  background-repeat: no-repeat;}
+a.mceButtonSelected img {border: 1px solid #6779AA !important; background-color: #D4D5D8;}
+a.mceButtonNormal img:hover, a.mceButtonSelected img:hover {border: 1px solid #0A246A !important; cursor: default; background-color: #B6BDD2;}
+a.mceButtonDisabled img {-moz-opacity:0.3; opacity: 0.3; border: 1px solid #F0F0EE !important; cursor: default;}
+a.mceTiledButton img {background-image: url('../images/buttons.gif'); background-repeat: no-repeat;}
 
 /* Menu button CSS rules */
 
-span.mceMenuButton img, span.mceMenuButtonSelected img {border: 1px solid #F0F0EE;  margin-left: 1px;}
-span.mceMenuButtonSelected img {border: 1px solid #6779AA;  background-color: #B6BDD2;}
-span.mceMenuButtonSelected img.mceMenuButton {border: 1px solid #F0F0EE;  background-color: transparent;}
-span.mceMenuButton img.mceMenuButton, span.mceMenuButtonSelected img.mceMenuButton {border-left: 0;  margin-left: 0;}
-span.mceMenuButton:hover img, span.mceMenuButtonSelected:hover img {border: 1px solid #0A246A;  background-color: #B6BDD2;}
+span.mceMenuButton img, span.mceMenuButtonSelected img {border: 1px solid #F0F0EE; margin-left: 1px;}
+span.mceMenuButtonSelected img {border: 1px solid #6779AA; background-color: #B6BDD2;}
+span.mceMenuButtonSelected img.mceMenuButton {border: 1px solid #F0F0EE; background-color: transparent;}
+span.mceMenuButton img.mceMenuButton, span.mceMenuButtonSelected img.mceMenuButton {border-left: 0; margin-left: 0;}
+span.mceMenuButton:hover img, span.mceMenuButtonSelected:hover img {border: 1px solid #0A246A; background-color: #B6BDD2;}
 span.mceMenuButton:hover img.mceMenuButton, span.mceMenuButtonSelected:hover img.mceMenuButton {border-left: 0;}
-span.mceMenuButtonFocus img {border: 1px solid gray;  border-right: 0;  margin-left: 1px;  background-color: #F5F4F2;}
-span.mceMenuButtonFocus img.mceMenuButton {border: 1px solid gray;  border-left: 1px solid #F5F4F2;  margin-left: 0;}
-span.mceMenuHover img {border: 1px solid #0A246A;  background-color: #B6BDD2;}
-span.mceMenuButtonSelected.mceMenuHover img.mceMenuButton {border: 1px solid #0A246A;  background-color: #B6BDD2;  border-left: 0;}
+span.mceMenuButtonFocus img {border: 1px solid gray; border-right: 0; margin-left: 1px; background-color: #F5F4F2;}
+span.mceMenuButtonFocus img.mceMenuButton {border: 1px solid gray; border-left: 1px solid #F5F4F2; margin-left: 0;}
+span.mceMenuHover img {border: 1px solid #0A246A; background-color: #B6BDD2;}
+span.mceMenuButtonSelected.mceMenuHover img.mceMenuButton {border: 1px solid #0A246A; background-color: #B6BDD2; border-left: 0;}
 
 /* Menu */
 
-.mceMenu {position: absolute;  left: 0;  top: 0;  display: none;  z-index: 100;  background-color: white;  border: 1px solid gray;  font-weight: normal;}
-.mceMenu a, .mceMenuTitle, .mceMenuDisabled {display: block;  width: 100%;  text-decoration: none;  background-color: white;  font-family: Tahoma, Verdana, Arial, Helvetica;  font-size: 11px;  line-height: 20px;  color: black;}
-.mceMenu a:hover {background-color: #B6BDD2;  color: black;  text-decoration: none !important;}
-.mceMenu span {padding-left: 10px;  padding-right: 10px;  display: block;  line-height: 20px;}
-.mceMenuSeparator {border-bottom: 1px solid gray;  background-color: gray;  height: 1px;}
+.mceMenu {position: absolute; left: 0; top: 0; display: none; z-index: 100; background-color: white; border: 1px solid gray; font-weight: normal;}
+.mceMenu a, .mceMenuTitle, .mceMenuDisabled {display: block; width: 100%; text-decoration: none; background-color: white; font-family: Tahoma, Verdana, Arial, Helvetica; font-size: 11px; line-height: 20px; color: black;}
+.mceMenu a:hover {background-color: #B6BDD2; color: black; text-decoration: none !important;}
+.mceMenu span {padding-left: 10px; padding-right: 10px; display: block; line-height: 20px;}
+.mceMenuSeparator {border-bottom: 1px solid gray; background-color: gray; height: 1px;}
 .mceMenuTitle span {padding-left: 5px;}
-.mceMenuTitle {background-color: #DDDDDD;  font-weight: bold;}
+.mceMenuTitle {background-color: #DDDDDD; font-weight: bold;}
 .mceMenuDisabled {color: gray;}
-span.mceMenuSelectedItem {background-image: url('../images/menu_check.gif');  background-repeat: no-repeat;  background-position: 5px 8px;  padding-left: 20px;}
+span.mceMenuSelectedItem {background-image: url('../images/menu_check.gif'); background-repeat: no-repeat; background-position: 5px 8px; padding-left: 20px;}
 span.mceMenuCheckItem {padding-left: 20px;}
-span.mceMenuLine {display: block;  position: absolute;  left: 0;  top: -1px;  background-color: #F5F4F2;  width: 30px;  height: 1px;  overflow: hidden;  padding-left: 0;  padding-right: 0;}
-.mceColors table, .mceColors td {margin: 0;  padding: 2px;}
-a.mceMoreColors {width: 130px;  margin: 0;  padding: 0;  margin-left: 3px;  margin-bottom: 3px;  text-align: center;  border: 1px solid white;}
-.mceColorPreview {position: absolute;  left: 0;  top: 0;  margin-left: 3px;  margin-top: 15px;  width: 16px;  height: 4px;  background-color: red;}
+span.mceMenuLine {display: block; position: absolute; left: 0; top: -1px; background-color: #F5F4F2; width: 30px; height: 1px; overflow: hidden; padding-left: 0; padding-right: 0;}
+.mceColors table, .mceColors td {margin: 0; padding: 2px;}
+a.mceMoreColors {width: 130px; margin: 0; padding: 0; margin-left: 3px; margin-bottom: 3px; text-align: center; border: 1px solid white;}
+.mceColorPreview {position: absolute; overflow:hidden; left: 0; top: 0; margin-left: 3px; margin-top: 15px; width: 16px; height: 4px; background-color: red;}
 a.mceMoreColors:hover {border: 1px solid #0A246A;}
-.mceColors td a {width: 9px;  height: 9px;  overflow: hidden;  border: 1px solid #808080;}
+.mceColors td a {width: 9px; height: 9px; overflow: hidden; border: 1px solid #808080;}
 
 /* MSIE 6 specific rules */
 
-* html a.mceButtonNormal img, * html a.mceButtonSelected img, * html a.mceButtonDisabled img {border: 0 !important;  margin-top: 2px;  margin-bottom: 1px;}
-* html a.mceButtonDisabled img {filter:progid:DXImageTransform.Microsoft.Alpha(opacity=30);  border: 0 !important;}
+* html a.mceButtonNormal img, * html a.mceButtonSelected img, * html a.mceButtonDisabled img {border: 0 !important; margin-top: 2px; margin-bottom: 1px;}
+* html a.mceButtonDisabled img {filter:progid:DXImageTransform.Microsoft.Alpha(opacity=30); border: 0 !important;}
 * html a.mceButtonDisabled {border: 1px solid #F0F0EE !important;}
-* html a.mceButtonNormal, * html a.mceButtonSelected {border: 1px solid #F0F0EE !important;  cursor: default;}
-* html a.mceButtonSelected {border: 1px solid #6779AA !important;  background-color: #D4D5D8;}
-* html a.mceButtonNormal:hover, * html a.mceButtonSelected:hover {border: 1px solid #0A246A !important;  background-color: #B6BDD2;  cursor: default;}
+* html a.mceButtonNormal, * html a.mceButtonSelected {border: 1px solid #F0F0EE !important; cursor: default;}
+* html a.mceButtonSelected {border: 1px solid #6779AA !important; background-color: #D4D5D8;}
+* html a.mceButtonNormal:hover, * html a.mceButtonSelected:hover {border: 1px solid #0A246A !important; background-color: #B6BDD2; cursor: default;}
 * html .mceSelectList {margin-top: 2px;}
-* html span.mceMenuButton, * html span.mceMenuButtonFocus {position: relative;  left: 0;  top: 0;}
-* html span.mceMenuButton img, * html span.mceMenuButtonSelected img, * html span.mceMenuButtonFocus img {position: relative;  top: 1px;}
+* html span.mceMenuButton, * html span.mceMenuButtonFocus {position: relative; left: 0; top: 0;}
+* html span.mceMenuButton img, * html span.mceMenuButtonSelected img, * html span.mceMenuButtonFocus img {position: relative; top: 1px;}
 * html a.mceMoreColors {width: 132px;}
-* html .mceColors td a {width: 10px;  height: 10px;}
-* html .mceColorPreview {margin-left: 2px;  margin-top: 14px;}
+* html .mceColors td a {width: 10px; height: 10px;}
+* html .mceColorPreview {margin-left: 2px; margin-top: 14px;}
 
 /* MSIE 7 specific rules */
 
-*:first-child+html a.mceButtonNormal img, *:first-child+html a.mceButtonSelected img, *:first-child+html a.mceButtonDisabled img {border: 0 !important;  margin-top: 2px;  margin-bottom: 1px;}
-*:first-child+html a.mceButtonDisabled img {filter:progid:DXImageTransform.Microsoft.Alpha(opacity=30);  border: 0 !important;}
+*:first-child+html a.mceButtonNormal img, *:first-child+html a.mceButtonSelected img, *:first-child+html a.mceButtonDisabled img {border: 0 !important; margin-top: 2px; margin-bottom: 1px;}
+*:first-child+html a.mceButtonDisabled img {filter:progid:DXImageTransform.Microsoft.Alpha(opacity=30); border: 0 !important;}
 *:first-child+html a.mceButtonDisabled {border: 1px solid #F0F0EE !important;}
-*:first-child+html a.mceButtonNormal, *:first-child+html a.mceButtonSelected {border: 1px solid #F0F0EE !important;  cursor: default;}
-*:first-child+html a.mceButtonSelected {border: 1px solid #6779AA !important;  background-color: #D4D5D8;}
-*:first-child+html a.mceButtonNormal:hover, *:first-child+html a.mceButtonSelected:hover {border: 1px solid #0A246A !important;  background-color: #B6BDD2;  cursor: default;}
+*:first-child+html a.mceButtonNormal, *:first-child+html a.mceButtonSelected {border: 1px solid #F0F0EE !important; cursor: default;}
+*:first-child+html a.mceButtonSelected {border: 1px solid #6779AA !important; background-color: #D4D5D8;}
+*:first-child+html a.mceButtonNormal:hover, *:first-child+html a.mceButtonSelected:hover {border: 1px solid #0A246A !important; background-color: #B6BDD2; cursor: default;}
 *:first-child+html .mceSelectList {margin-top: 2px;}
-*:first-child+html span.mceMenuButton, *:first-child+html span.mceMenuButtonFocus {position: relative;  left: 0;  top: 0;}
-*:first-child+html span.mceMenuButton img, *:first-child+html span.mceMenuButtonSelected img, *:first-child+html span.mceMenuButtonFocus img {position: relative;  top: 1px;}
+*:first-child+html span.mceMenuButton, *:first-child+html span.mceMenuButtonFocus {position: relative; left: 0; top: 0;}
+*:first-child+html span.mceMenuButton img, *:first-child+html span.mceMenuButtonSelected img, *:first-child+html span.mceMenuButtonFocus img {position: relative; top: 1px;}
 *:first-child+html a.mceMoreColors {width: 132px;}
-*:first-child+html .mceColors td a {width: 10px;  height: 10px;}
-*:first-child+html .mceColorPreview {margin: 0; padding-left: 4px;  margin-top: 14px; width: 14px;}
+*:first-child+html .mceColors td a {width: 10px; height: 10px;}
+*:first-child+html .mceColorPreview {margin: 0; padding-left: 4px; margin-top: 14px; width: 14px;}

trunk/wp-includes/js/tinymce/themes/advanced/editor_template.js

@@ -1 +1 @@
 /**
- * $Id: editor_template_src.js 129 2006-10-23 09:45:17Z spocke $
+ * $Id: editor_template_src.js 166 2007-01-05 10:31:50Z spocke $
  *
  * @author Moxiecode
- * @copyright Copyright © 2004-2006, Moxiecode Systems AB, All rights reserved.
+ * @copyright Copyright © 2004-2007, Moxiecode Systems AB, All rights reserved.
  */
 
@@ -714 +714 @@
 
         template['html'] = tinyMCE.replaceVar(template['html'], 'style_select_options', styleSelectHTML);
-        template['delta_width'] = 0;
-        template['delta_height'] = deltaHeight;
+
+        // Set to default values
+        if (!template['delta_width'])
+            template['delta_width'] = 0;
+
+        if (!template['delta_height'])
+            template['delta_height'] = deltaHeight;
 
         return template;
@@ -733 +738 @@
     },
 
+    removeInstance : function(inst) {
+        var fcm = new TinyMCE_Layer(inst.editorId + '_fcMenu');
+
+        fcm.remove();
+    },
+
     _handleMenuEvent : function(e) {
         var te = tinyMCE.isMSIE ? window.event.srcElement : e.target;
@@ -781 +792 @@
 
             return false;
-        };
-
-        function getAttrib(elm, name) {
-            return elm.getAttribute(name) ? elm.getAttribute(name) : "";
         };
 
@@ -840 +847 @@
                     if (st != "") {
                         st = tinyMCE.serializeStyle(tinyMCE.parseStyle(st));
-                        nodeData += "style: " + st + " ";
+                        nodeData += "style: " + tinyMCE.xmlEncode(st) + " ";
                     }
                 }
@@ -850 +857 @@
                     var face = tinyMCE.getAttrib(path[i], "face");
                     if (face != "")
-                        nodeData += "font: " + face + " ";
+                        nodeData += "font: " + tinyMCE.xmlEncode(face) + " ";
 
                     var size = tinyMCE.getAttrib(path[i], "size");
                     if (size != "")
-                        nodeData += "size: " + size + " ";
+                        nodeData += "size: " + tinyMCE.xmlEncode(size) + " ";
 
                     var color = tinyMCE.getAttrib(path[i], "color");
                     if (color != "")
-                        nodeData += "color: " + color + " ";
-                }
-
-                if (getAttrib(path[i], 'id') != "") {
+                        nodeData += "color: " + tinyMCE.xmlEncode(color) + " ";
+                }
+
+                if (tinyMCE.getAttrib(path[i], 'id') != "") {
                     nodeData += "id: " + path[i].getAttribute('id') + " ";
                 }
@@ -869 +876 @@
                     nodeData += "class: " + className + " ";
 
-                if (getAttrib(path[i], 'src') != "") {
+                if (tinyMCE.getAttrib(path[i], 'src') != "") {
                     var src = tinyMCE.getAttrib(path[i], "mce_src");
 
@@ -875 +882 @@
                          src = tinyMCE.getAttrib(path[i], "src");
 
-                    nodeData += "src: " + src + " ";
-                }
-
-                if (path[i].nodeName == 'A' && getAttrib(path[i], 'href') != "") {
+                    nodeData += "src: " + tinyMCE.xmlEncode(src) + " ";
+                }
+
+                if (path[i].nodeName == 'A' && tinyMCE.getAttrib(path[i], 'href') != "") {
                     var href = tinyMCE.getAttrib(path[i], "mce_href");
 
@@ -884 +891 @@
                          href = tinyMCE.getAttrib(path[i], "href");
 
-                    nodeData += "href: " + href + " ";
+                    nodeData += "href: " + tinyMCE.xmlEncode(href) + " ";
                 }
 
@@ -895 +902 @@
                 if (nodeName == "a" && (anchor = tinyMCE.getAttrib(path[i], "name")) != "") {
                     nodeName = "a";
-                    nodeName += "#" + anchor;
+                    nodeName += "#" + tinyMCE.xmlEncode(anchor);
                     nodeData = "";
                 }
 
-                if (getAttrib(path[i], 'name').indexOf("mce_") != 0) {
+                if (tinyMCE.getAttrib(path[i], 'name').indexOf("mce_") != 0) {
                     var className = tinyMCE.getVisualAidClass(tinyMCE.getAttrib(path[i], "class"), false);
                     if (className != "" && className.indexOf('mceItem') == -1) {
@@ -1125 +1132 @@
 
                 case "IMG":
-                if (getAttrib(node, 'name').indexOf('mce_') != 0 && tinyMCE.getAttrib(node, 'class').indexOf('mceItem') == -1) {
+                if (tinyMCE.getAttrib(node, 'name').indexOf('mce_') != 0 && tinyMCE.getAttrib(node, 'class').indexOf('mceItem') == -1) {
                     tinyMCE.switchClass(editor_id + '_image', 'mceButtonSelected');
                 }

trunk/wp-includes/js/tinymce/themes/advanced/jscripts/source_editor.js

@@ -26 +26 @@
     s.wrap = val;
 
-    if (tinyMCE.isGecko) {
+    if (tinyMCE.isGecko || tinyMCE.isOpera) {
         var v = s.value;
         var n = s.cloneNode(false);
@@ -48 +48 @@
 
     if (!tinyMCE.isMSIE) {
-         wHeight = self.innerHeight-80;
-         wWidth = self.innerWidth-16;
+         wHeight = self.innerHeight - 60;
+         wWidth = self.innerWidth - 16;
     } else {
-         wHeight = document.body.clientHeight - 80;
+         wHeight = document.body.clientHeight - 60;
          wWidth = document.body.clientWidth - 16;
     }
@@ -58 +58 @@
     el.style.width  = Math.abs(wWidth) + 'px';
 }
-

trunk/wp-includes/js/tinymce/tiny_mce.js

@@ -6 +6 @@
 
     this.majorVersion = "2";
-    this.minorVersion = "0.8";
-    this.releaseDate = "2006-10-23";
+    this.minorVersion = "0.9";
+    this.releaseDate = "2007-01-09";
 
     this.instances = new Array();
@@ -193 +193 @@
         this._def("display_tab_class", '');
         this._def("gecko_spellcheck", false);
+        this._def("hide_selects_on_submit", true);
 
         // Force strict loading mode to false on non Gecko browsers
@@ -243 +244 @@
         this.uniqueURL = 'javascript:TINYMCE_UNIQUEURL();'; // Make unique URL non real URL
         this.uniqueTag = '<div id="mceTMPElement" style="display: none">TMP</div>';
-        this.callbacks = new Array('onInit', 'getInfo', 'getEditorTemplate', 'setupContent', 'onChange', 'onPageLoad', 'handleNodeChange', 'initInstance', 'execCommand', 'getControlHTML', 'handleEvent', 'cleanup');
+        this.callbacks = new Array('onInit', 'getInfo', 'getEditorTemplate', 'setupContent', 'onChange', 'onPageLoad', 'handleNodeChange', 'initInstance', 'execCommand', 'getControlHTML', 'handleEvent', 'cleanup', 'removeInstance');
 
         // Theme url
@@ -339 +340 @@
             }
         }
+
+        // Setup XML encoding regexps
+        this.xmlEncodeAposRe = new RegExp('[<>&"\']', 'g');
+        this.xmlEncodeRe = new RegExp('[<>&"]', 'g');
+//      this.xmlEncodeEnts = {'&':'&amp;','"':'&quot;',"'":'&#39;','<':'&lt;','>':'&gt;'};
     },
 
@@ -570 +576 @@
         tinyMCE.undoLevels = n;
         tinyMCE.undoIndex = n.length;
+
+        // Dispatch remove instance call
+        tinyMCE.dispatchCallback(ti, 'remove_instance_callback', 'removeInstance', ti);
 
         return ti;
@@ -837 +846 @@
         }
 
+        tinyMCE.selectedInstance = inst;
         inst.switchSettings();
 
@@ -1016 +1026 @@
     storeAwayURLs : function(s) {
         // Remove all mce_src, mce_href and replace them with new ones
-    //  s = s.replace(new RegExp('mce_src\\s*=\\s*\"[^ >\"]*\"', 'gi'), '');
-    //  s = s.replace(new RegExp('mce_href\\s*=\\s*\"[^ >\"]*\"', 'gi'), '');
+        // s = s.replace(new RegExp('mce_src\\s*=\\s*\"[^ >\"]*\"', 'gi'), '');
+        // s = s.replace(new RegExp('mce_href\\s*=\\s*\"[^ >\"]*\"', 'gi'), '');
 
         if (!s.match(/(mce_src|mce_href)/gi, s)) {
@@ -1039 +1049 @@
     },
 
+    removeTinyMCEFormElements : function(form_obj) {
+        var i, elementId;
+
+        // Skip form element removal
+        if (!tinyMCE.getParam('hide_selects_on_submit'))
+            return;
+
+        // Check if form is valid
+        if (typeof(form_obj) == "undefined" || form_obj == null)
+            return;
+
+        // If not a form, find the form
+        if (form_obj.nodeName != "FORM") {
+            if (form_obj.form)
+                form_obj = form_obj.form;
+            else
+                form_obj = tinyMCE.getParentElement(form_obj, "form");
+        }
+
+        // Still nothing
+        if (form_obj == null)
+            return;
+
+        // Disable all UI form elements that TinyMCE created
+        for (i=0; i<form_obj.elements.length; i++) {
+            elementId = form_obj.elements[i].name ? form_obj.elements[i].name : form_obj.elements[i].id;
+
+            if (elementId.indexOf('mce_editor_') == 0)
+                form_obj.elements[i].disabled = true;
+        }
+    },
+
     handleEvent : function(e) {
         var inst = tinyMCE.selectedInstance;
@@ -1087 +1129 @@
 
             case "submit":
+                tinyMCE.removeTinyMCEFormElements(tinyMCE.isMSIE ? window.event.srcElement : e.target);
                 tinyMCE.triggerSave();
                 tinyMCE.isNotDirty = true;
@@ -1434 +1477 @@
 
     submitPatch : function() {
+        tinyMCE.removeTinyMCEFormElements(this);
         tinyMCE.triggerSave();
         tinyMCE.isNotDirty = true;
@@ -1650 +1694 @@
 
     triggerNodeChange : function(focus, setup_content) {
+        var elm, inst, editorId, undoIndex = -1, undoLevels = -1, doc, anySelection = false;
+
         if (tinyMCE.selectedInstance) {
-            var inst = tinyMCE.selectedInstance;
-            var editorId = inst.editorId;
-            var elm = (typeof(setup_content) != "undefined" && setup_content) ? tinyMCE.selectedElement : inst.getFocusElement();
-            var undoIndex = -1, doc;
-            var undoLevels = -1;
-            var anySelection = false;
-            var selectedText = inst.selection.getSelectedText();
+            inst = tinyMCE.selectedInstance;
+            elm = (typeof(setup_content) != "undefined" && setup_content) ? tinyMCE.selectedElement : inst.getFocusElement();
+
+/*          if (elm == inst.lastTriggerEl)
+                return;
+
+            inst.lastTriggerEl = elm;*/
+
+            editorId = inst.editorId;
+            selectedText = inst.selection.getSelectedText();
 
             if (tinyMCE.settings.auto_resize)
@@ -1754 +1803 @@
     openWindow : function(template, args) {
         var html, width, height, x, y, resizable, scrollbars, url;
+
+        args = !args ? {} : args;
 
         args['mce_template_file'] = template['file'];
@@ -2257 +2308 @@
 
     evalFunc : function(f, idx, a, o) {
-        var s = '(', i;
-
-        for (i=idx; i<a.length; i++) {
-            s += 'a[' + i + ']';
-
-            if (i < a.length-1)
-                s += ',';
-        }
-
-        s += ');';
-
-        return o ? eval("o." + f + s) : eval("f" + s);
+        o = !o ? window : o;
+        f = typeof(f) == 'function' ? f : o[f];
+
+        return f.apply(o, Array.prototype.slice.call(a, idx));
     },
 
@@ -2290 +2333 @@
         l = tinyMCE.getParam(p, '');
 
-        if (l != '' && (v = tinyMCE.evalFunc(typeof(l) == "function" ? l : eval(l), 3, a)) == s && m > 0)
+        if (l != '' && (v = tinyMCE.evalFunc(l, 3, a)) == s && m > 0)
             return true;
 
@@ -2313 +2356 @@
     },
 
-    xmlEncode : function(s) {
-        return s ? ('' + s).replace(new RegExp('[<>&"\']', 'g'), function (c, b) {
+    xmlEncode : function(s, skip_apos) {
+        return s ? ('' + s).replace(!skip_apos ? this.xmlEncodeAposRe : this.xmlEncodeRe, function (c, b) {
             switch (c) {
                 case '&':
@@ -2399 +2442 @@
         entity_encoding : s.entity_encoding,
         debug : s.cleanup_debug,
-        url_converter : 'TinyMCE_Cleanup.prototype._urlConverter',
         indent : s.apply_source_formatting,
         invalid_elements : s.invalid_elements,
         verify_html : s.verify_html,
-        fix_content_duplication : s.fix_content_duplication
+        fix_content_duplication : s.fix_content_duplication,
+        convert_fonts_to_spans : s.convert_fonts_to_spans
     });
 
@@ -2594 +2637 @@
 
     handleShortcut : function(e) {
-        var i, s = this.shortcuts, o;
+        var i, s, o;
+
+        // Normal key press, then ignore it
+        if (!e.altKey && !e.ctrlKey)
+            return false;
+
+        s = this.shortcuts;
 
         for (i=0; i<s.length; i++) {
@@ -2703 +2752 @@
         this.contentDocument = doc; // <-- Strange, unless this is applied Mozilla 1.3 breaks
 
-        if (tinyMCE.execCommandCallback(this, 'execcommand_callback', 'execCommand', this.editorId, this.getBody(), command, user_interface, value))
-            return;
+        // Don't dispatch key commands
+        if (!/mceStartTyping|mceEndTyping/.test(command)) {
+            if (tinyMCE.execCommandCallback(this, 'execcommand_callback', 'execCommand', this.editorId, this.getBody(), command, user_interface, value))
+                return;
+        }
 
         // Fix align on images
@@ -2814 +2866 @@
                     focusElm = tinyMCE.getParentElement(focusElm, 'A');
 
-                    if (focusElm && this.getRng(0).endOffset > 0 && this.getRng(0).endOffset != focusElm.innerHTML.length)
+                    if (focusElm && this.getRng(0).endOffset > 0 && this.getRng(0).endOffset != focusElm.innerHTML.length) // WordPress mod to prevent unlinking if caret at start/end of link
                         this.selection.selectNode(focusElm, false);
                 }
@@ -2825 +2877 @@
 
                 return true;
-
-            case "FormatBlock":
-                if (!this.cleanup.isValid(value))
-                    return true;
-
-                this.getDoc().execCommand(command, user_interface, value);
-                tinyMCE.triggerNodeChange();
-                break;
 
             case "InsertUnorderedList":
@@ -2858 +2902 @@
                         this.execCommand("mceRemoveNode", false, elm);
                 } else {
+                    if (!this.cleanup.isValid(value))
+                        return true;
+
                     if (tinyMCE.isGecko && new RegExp('<(div|blockquote|code|dt|dd|dl|samp)>', 'gi').test(value))
                         value = value.replace(/[^a-z]/gi, '');
@@ -2916 +2963 @@
                 break;
 
+            case "mceSetStyleInfo":
             case "SetStyleInfo":
                 var rng = this.getRng();
@@ -3247 +3295 @@
 
             case "mceSetCSSClass":
-                this.execCommand("SetStyleInfo", false, {command : "setattrib", name : "class", value : value});
+                this.execCommand("mceSetStyleInfo", false, {command : "setattrib", name : "class", value : value});
             break;
 
@@ -3479 +3527 @@
                 break;
 
+            case "RemoveFormat":
             case "removeformat":
                 var text = this.selection.getSelectedText();
@@ -3495 +3544 @@
                     }
 
-                    this.execCommand("SetStyleInfo", false, {command : "removeformat"});
+                    this.execCommand("mceSetStyleInfo", false, {command : "removeformat"});
                 } else {
                     this.getDoc().execCommand(command, user_interface, value);
 
-                    this.execCommand("SetStyleInfo", false, {command : "removeformat"});
+                    this.execCommand("mceSetStyleInfo", false, {command : "removeformat"});
                 }
 
@@ -3998 +4047 @@
                 val = tinyMCE.convertRGBToHex(val, true);
 
+            val = val.replace(/\"/g, '\'');
+
             if (val != "url('')")
                 str += key.toLowerCase() + ": " + val + "; ";
@@ -4044 +4095 @@
     var sizes = tinyMCE.getParam('font_size_style_values').replace(/\s+/, '').split(',');
 
-    var h = doc.body.innerHTML;
+    /*var h = doc.body.innerHTML;
     h = h.replace(/<span/gi, '<font');
     h = h.replace(/<\/span/gi, '</font');
-    tinyMCE.setInnerHTML(doc.body, h);
-
-    var s = doc.getElementsByTagName("font");
+    tinyMCE.setInnerHTML(doc.body, h);*/
+
+    var s = tinyMCE.selectElements(doc, 'span,font');
     for (var i=0; i<s.length; i++) {
         var size = tinyMCE.trim(s[i].style.fontSize).toLowerCase();
@@ -4083 +4134 @@
     var sizes = tinyMCE.getParam('font_size_style_values').replace(/\s+/, '').split(',');
 
-    var h = doc.body.innerHTML;
+/*  var h = doc.body.innerHTML;
     h = h.replace(/<font/gi, '<span');
     h = h.replace(/<\/font/gi, '</span');
-    tinyMCE.setInnerHTML(doc.body, h);
+    tinyMCE.setInnerHTML(doc.body, h);*/
 
     var fsClasses = tinyMCE.getParam('font_size_classes');
@@ -4094 +4145 @@
         fsClasses = null;
 
-    var s = doc.getElementsByTagName("span");
+    var s = tinyMCE.selectElements(doc, 'span,font');
     for (var i=0; i<s.length; i++) {
         var fSize, fFace, fColor;
@@ -4183 +4234 @@
         n = nl[i];
 
-        if ((p = tinyMCE.getParentElement(n, 'p,div,h1,h2,h3,h4,h5,h6')) != null) {
+        if ((p = tinyMCE.getParentElement(n, 'p,h1,h2,h3,h4,h5,h6')) != null) {
             np = p.cloneNode(false);
             np.removeAttribute('id');
@@ -4381 +4432 @@
         this.fillStr = s.entity_encoding == "named" ? "&nbsp;" : "&#160;";
         this.idCount = 0;
+        this.xmlEncodeRe = new RegExp('[\u007F-\uFFFF<>&"]', 'g');
+        this.xmlEncodeAposRe = new RegExp('[\u007F-\uFFFF<>&"\']', 'g');
     },
 
@@ -4404 +4457 @@
     isValid : function(n) {
         this._setupRules(); // Will initialize cleanup rules
+
+        // Empty is true since it removes formatting
+        if (!n)
+            return true;
 
         // Clean the name up a bit
@@ -4607 +4664 @@
         var xd, el, i, l, cn, at, no, hc = false;
 
-        if (this._isDuplicate(n))
+        if (tinyMCE.isRealIE && this._isDuplicate(n))
             return;
 
@@ -4650 +4707 @@
 
     serializeNodeAsHTML : function(n, inn) {
-        var en, no, h = '', i, l, t, st, r, cn, va = false, f = false, at, hc, cr;
+        var en, no, h = '', i, l, t, st, r, cn, va = false, f = false, at, hc, cr, nn;
 
         this._setupRules(); // Will initialize cleanup rules
 
-        if (this._isDuplicate(n))
+        if (tinyMCE.isRealIE && this._isDuplicate(n))
             return '';
 
@@ -4678 +4735 @@
                     break;
 
-                if (this.vElementsRe.test(n.nodeName) && (!this.iveRe || !this.iveRe.test(n.nodeName)) && !inn) {
+                nn = n.nodeName;
+
+                // Convert fonts to spans
+                if (this.settings.convert_fonts_to_spans) {
+                    // On get content FONT -> SPAN
+                    if (this.settings.on_save && nn == 'FONT')
+                        nn = 'SPAN';
+
+                    // On insert content SPAN -> FONT
+                    if (!this.settings.on_save && nn == 'SPAN')
+                        nn = 'FONT';
+                }
+
+                if (this.vElementsRe.test(nn) && (!this.iveRe || !this.iveRe.test(nn)) && !inn) {
                     va = true;
 
-                    r = this.rules[n.nodeName];
+                    r = this.rules[nn];
                     if (!r) {
                         at = this.rules;
                         for (no in at) {
-                            if (at[no] && at[no].validRe.test(n.nodeName)) {
+                            if (at[no] && at[no].validRe.test(nn)) {
                                 r = at[no];
                                 break;
@@ -4692 +4762 @@
                     }
 
-                    en = r.isWild ? n.nodeName.toLowerCase() : r.oTagName;
+                    en = r.isWild ? nn.toLowerCase() : r.oTagName;
                     f = r.fill;
 
@@ -4729 +4799 @@
 
                     // Close these
-                    if (t != null && this.closeElementsRe.test(n.nodeName))
+                    if (t != null && this.closeElementsRe.test(nn))
                         return t + ' />';
 
@@ -4735 +4805 @@
                         h += t + '>';
 
-                    if (this.isIE && this.codeElementsRe.test(n.nodeName))
+                    if (this.isIE && this.codeElementsRe.test(nn))
                         h += n.innerHTML;
                 }
@@ -4797 +4867 @@
 
         if (os && av.length != 0 && this.settings.url_converter.length != 0 && /^(src|href|longdesc)$/.test(an))
-            av = eval(this.settings.url_converter + '(this, n, av)');
+            av = this._urlConverter(this, n, av);
 
         if (av.length != 0 && r.validAttribValues && r.validAttribValues[an] && !r.validAttribValues[an].test(av))
@@ -4807 +4877 @@
         if (av.length != 0) {
             if (an.indexOf('on') != 0)
-                av = this.xmlEncode(av);
+                av = this.xmlEncode(av, 1);
 
             return " " + an + "=" + '"' + av + '"';
@@ -4853 +4923 @@
     },
 
-    xmlEncode : function(s) {
-        var cl = this;
+    xmlEncode : function(s, skip_apos) {
+        var cl = this, re = !skip_apos ? this.xmlEncodeAposRe : this.xmlEncodeRe;
 
         this._setupEntities(); // Will intialize lookup table
@@ -4860 +4930 @@
         switch (this.settings.entity_encoding) {
             case "raw":
-                return tinyMCE.xmlEncode(s);
+                return tinyMCE.xmlEncode(s, skip_apos);
 
             case "named":
-                return s.replace(new RegExp('[\u007F-\uFFFF<>&"\']', 'g'), function (c, b) {
+                return s.replace(re, function (c, b) {
                     b = cl.entities[c.charCodeAt(0)];
 
@@ -4870 +4940 @@
 
             case "numeric":
-                return s.replace(new RegExp('[\u007F-\uFFFF<>&"\']', 'g'), function (c, b) {
+                return s.replace(re, function (c, b) {
                     return b ? '&#' + c.charCodeAt(0) + ';' : c;
                 });
@@ -4899 +4969 @@
 
     _getAttrib : function(e, n, d) {
+        var v, ex, nn;
+
         if (typeof(d) == "undefined")
             d = "";
@@ -4905 +4977 @@
             return d;
 
-        var v = e.getAttribute(n, 0);
+        try {
+            v = e.getAttribute(n, 0);
+        } catch (ex) {
+            // IE 7 may cast exception on invalid attributes
+            v = e.getAttribute(n, 2);
+        }
 
         if (n == "class" && !v)
             v = e.className;
 
-        if (this.isIE && n == "http-equiv")
-            v = e.httpEquiv;
-
-        if (this.isIE && e.nodeName == "FORM" && n == "enctype" && v == "application/x-www-form-urlencoded")
-            v = "";
-
-        if (this.isIE && e.nodeName == "INPUT" && n == "size" && v == "20")
-            v = "";
-
-        if (this.isIE && e.nodeName == "INPUT" && n == "maxlength" && v == "2147483647")
-            v = "";
-
-        if (n == "style" && !tinyMCE.isOpera)
-            v = e.style.cssText;
-
-        if (n == 'style')
+        if (this.isIE) {
+            if (n == "http-equiv")
+                v = e.httpEquiv;
+
+            nn = e.nodeName;
+
+            // Skip the default values that IE returns
+            if (nn == "FORM" && n == "enctype" && v == "application/x-www-form-urlencoded")
+                v = "";
+
+            if (nn == "INPUT" && n == "size" && v == "20")
+                v = "";
+
+            if (nn == "INPUT" && n == "maxlength" && v == "2147483647")
+                v = "";
+        }
+
+        if (n == 'style' && v) {
+            if (!tinyMCE.isOpera)
+                v = e.style.cssText;
+
             v = tinyMCE.serializeStyle(tinyMCE.parseStyle(v));
+        }
 
         if (this.settings.on_save && n.indexOf('on') != -1 && this.settings.on_save && v && v != "")
@@ -4937 +5020 @@
         if (!c.settings.on_save)
             return tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings.base_href, v);
-        else if (tinyMCE.getParam('convert_urls'))
-            return eval(tinyMCE.settings.urlconverter_callback + "(v, n, true);");
+        else if (tinyMCE.getParam('convert_urls')) {
+            if (!this.urlConverter)
+                this.urlConverter = eval(tinyMCE.settings.urlconverter_callback);
+
+            return this.urlConverter(v, n, true);
+        }
 
         return v;
@@ -5226 +5313 @@
         return dv;
 
-    v = elm.getAttribute(name);
+    try {
+        v = elm.getAttribute(name, 0);
+    } catch (ex) {
+        // IE 7 may cast exception on invalid attributes
+        v = elm.getAttribute(name, 2);
+    }
 
     // Try className for class attrib
@@ -5877 +5969 @@
             f(doc, ot[i], tinyMCE.handleEvent);
 
-        eval('try { doc.designMode = "On"; } catch(e) {}'); // Force designmode
+        // Force designmode
+        try {
+            doc.designMode = "On";
+        } catch (e) {
+            // Ignore
+        }
     }
 };
@@ -6048 +6145 @@
 
         // When editing always use fonts internaly
-        if (tinyMCE.getParam("convert_fonts_to_spans"))
-            tinyMCE.convertSpansToFonts(inst.getDoc());
+        //if (tinyMCE.getParam("convert_fonts_to_spans"))
+        //  tinyMCE.convertSpansToFonts(inst.getDoc());
 
         return h;
@@ -6252 +6349 @@
 
         if (tinyMCE.isGecko || tinyMCE.isOpera) {
+            if (!sel)
+                return false;
+
             if (bookmark.rng) {
                 sel.removeAllRanges();
@@ -6463 +6563 @@
             return '' + window.getSelection();
 
-        return s.getRangeAt(0);
+        if (s.rangeCount > 0)
+            return s.getRangeAt(0);
+
+        return null;
+    },
+
+    isCollapsed : function() {
+        var r = this.getRng();
+
+        if (r.item)
+            return false;
+
+        return r.boundingWidth == 0 || this.getSel().isCollapsed;
+    },
+
+    collapse : function(b) {
+        var r = this.getRng(), s = this.getSel();
+
+        if (r.select) {
+            r.collapse(b);
+            r.select();
+        } else {
+            if (b)
+                s.collapseToStart();
+            else
+                s.collapseToEnd();
+        }
     },
 
@@ -7118 +7244 @@
 
         return parseInt(s);
+    },
+
+    remove : function() {
+        var e = this.getElement(), b = this.getBlocker();
+
+        if (e)
+            e.parentNode.removeChild(e);
+
+        if (b)
+            b.parentNode.removeChild(b);
     }
 
@@ -7209 +7345 @@
 
                 default:
-                    h += '<tr><td><a href="#" onclick="return tinyMCE.cancelEvent(event);" onmousedown="return tinyMCE.cancelEvent(event);" onmouseup="' + tinyMCE.xmlEncode(m[i].js) + ';return tinyMCE.cancelEvent(event);"><span' + c +'>' + t + '</span></a>';
+                    h += '<tr><td><a href="' + tinyMCE.xmlEncode(m[i].js) + '" onmousedown="' + tinyMCE.xmlEncode(m[i].js) + ';return tinyMCE.cancelEvent(event);" onclick="return tinyMCE.cancelEvent(event);" onmouseup="return tinyMCE.cancelEvent(event);"><span' + c +'>' + t + '</span></a>';
             }
 

trunk/wp-includes/js/tinymce/utils/form_utils.js

@@ -1 +1 @@
 /**
- * $Id: form_utils.js 43 2006-08-08 16:10:07Z spocke $
+ * $Id: form_utils.js 162 2007-01-03 16:16:52Z spocke $
  *
  * Various form utilitiy functions.
  *
  * @author Moxiecode
- * @copyright Copyright © 2004-2006, Moxiecode Systems AB, All rights reserved.
+ * @copyright Copyright © 2004-2007, Moxiecode Systems AB, All rights reserved.
  */
 

trunk/wp-includes/js/tinymce/utils/mclayer.js

@@ -1 +1 @@
 /**
- * $Id: mclayer.js 18 2006-06-29 14:11:23Z spocke $
+ * $Id: mclayer.js 162 2007-01-03 16:16:52Z spocke $
  *
  * Moxiecode floating layer script.
  *
  * @author Moxiecode
- * @copyright Copyright © 2004-2006, Moxiecode Systems AB, All rights reserved.
+ * @copyright Copyright © 2004-2007, Moxiecode Systems AB, All rights reserved.
  */
 

trunk/wp-includes/js/tinymce/utils/mctabs.js

@@ -1 +1 @@
 /**
- * $Id: mctabs.js 18 2006-06-29 14:11:23Z spocke $
+ * $Id: mctabs.js 162 2007-01-03 16:16:52Z spocke $
  *
  * Moxiecode DHTML Tabs script.
  *
  * @author Moxiecode
- * @copyright Copyright © 2004-2006, Moxiecode Systems AB, All rights reserved.
+ * @copyright Copyright © 2004-2007, Moxiecode Systems AB, All rights reserved.
  */
 

trunk/wp-includes/js/tinymce/utils/validate.js

@@ -1 +1 @@
 /**
- * $Id: validate.js 65 2006-08-24 15:54:55Z spocke $
+ * $Id: validate.js 162 2007-01-03 16:16:52Z spocke $
  *
  * Various form validation methods.
  *
  * @author Moxiecode
- * @copyright Copyright © 2004-2006, Moxiecode Systems AB, All rights reserved.
+ * @copyright Copyright © 2004-2007, Moxiecode Systems AB, All rights reserved.
  */
 

trunk/wp-includes/js/tinymce/wp-mce-help.php

@@ -165 +165 @@
 <div id="content4" class="hidden">
     <h2><?php _e('About TinyMCE'); ?></h2>
-    <p><?php printf(__('Version: %s'), '2.0.8') ?></p>
+    <p><?php printf(__('Version: %s'), '2.0.9') ?></p>
     <p><?php printf(__('TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor control released as Open Source under %sLGPL</a> by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.'), '<a href="'.get_bloginfo('home').'/wp-includes/js/tinymce/license.txt" target="_blank" title="'.__('GNU Library General Public Licence').'">') ?></p>
     <p><?php _e('Copyright &copy; 2005, <a href="http://www.moxiecode.com" target="_blank">Moxiecode Systems AB</a>, All rights reserved.') ?></p>

trunk/wp-includes/script-loader.php

@@ -16 +16 @@
         $this->add( 'quicktags', '/wp-includes/js/quicktags.js', false, '3517' );
         $this->add( 'colorpicker', '/wp-includes/js/colorpicker.js', false, '3517' );
-        $this->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_gzip.php', false, '20061113' );
+        $this->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_gzip.php', false, '20070124' );
         $mce_config = apply_filters('tiny_mce_config_url', '/wp-includes/js/tinymce/tiny_mce_config.php');
-        $this->add( 'wp_tiny_mce', $mce_config, array('tiny_mce'), '20061113' );
+        $this->add( 'wp_tiny_mce', $mce_config, array('tiny_mce'), '20070124' );
         $this->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.5.0');
         $this->add( 'autosave', '/wp-includes/js/autosave-js.php', array('prototype', 'sack'), '20070116');