Merged with WordPress 2.5, unstable, only for testing

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1218 7be80a69-a1ef-0310-a953-fb0f7c49ff36

5 files changed, 45 insertions, 56 deletions

diff --git a/wp-includes/js/tinymce/utils/editable_selects.js b/wp-includes/js/tinymce/utils/editable_selects.js
index e723365..9b40922 100644
--- a/wp-includes/js/tinymce/utils/editable_selects.js
+++ b/wp-includes/js/tinymce/utils/editable_selects.js
@@ -1,10 +1,10 @@
 /**

- * $Id: editable_selects.js 162 2007-01-03 16:16:52Z spocke $

+ * $Id: editable_selects.js 520 2008-01-07 16:30:32Z spocke $

  *

  * Makes select boxes editable.

  *

  * @author Moxiecode

- * @copyright Copyright © 2004-2007, Moxiecode Systems AB, All rights reserved.

+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.

  */

 

 var TinyMCE_EditableSelects = {

@@ -20,13 +20,13 @@ var TinyMCE_EditableSelects = {
 				o.className = 'mceAddSelectValue';

 

 				nl[i].options[nl[i].options.length] = o;

-				nl[i].setAttribute('onchange', 'TinyMCE_EditableSelects.onChangeEditableSelect(this);');

+				nl[i].onchange = TinyMCE_EditableSelects.onChangeEditableSelect;

 			}

 		}

 	},

 

-	onChangeEditableSelect : function(se) {

-		var d = document, ne;

+	onChangeEditableSelect : function(e) {

+		var d = document, ne, se = window.event ? window.event.srcElement : e.target;

 

 		if (se.options[se.selectedIndex].value == '__mce_add_custom__') {

 			ne = d.createElement("input");

@@ -34,7 +34,7 @@ var TinyMCE_EditableSelects = {
 			ne.name = se.name + "_custom";

 			ne.type = "text";

 

-			ne.style.width = se.clientWidth;

+			ne.style.width = se.offsetWidth + 'px';

 			se.parentNode.insertBefore(ne, se);

 			se.style.display = 'none';

 			ne.focus();

diff --git a/wp-includes/js/tinymce/utils/form_utils.js b/wp-includes/js/tinymce/utils/form_utils.js
index ec9dbb3..c1f1409 100644
--- a/wp-includes/js/tinymce/utils/form_utils.js
+++ b/wp-includes/js/tinymce/utils/form_utils.js
@@ -1,33 +1,23 @@
 /**

- * $Id: form_utils.js 162 2007-01-03 16:16:52Z spocke $

+ * $Id: form_utils.js 673 2008-03-06 13:26:20Z spocke $

  *

  * Various form utilitiy functions.

  *

  * @author Moxiecode

- * @copyright Copyright © 2004-2007, Moxiecode Systems AB, All rights reserved.

+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.

  */

 

-var themeBaseURL = tinyMCE.baseURL + '/themes/' + tinyMCE.getParam("theme");

+var themeBaseURL = tinyMCEPopup.editor.baseURI.toAbsolute('themes/' + tinyMCEPopup.getParam("theme"));

 

 function getColorPickerHTML(id, target_form_element) {

 	var h = "";

 

-	h += '<a id="' + id + '_link" href="javascript:void(0);" onkeydown="pickColor(event,\'' + target_form_element +'\');" onmousedown="pickColor(event,\'' + target_form_element +'\');return false;">';

-	h += '<img id="' + id + '" src="' + themeBaseURL + '/images/color.gif"';

-	h += ' onmouseover="this.className=\'mceButtonOver\'"';

-	h += ' onmouseout="this.className=\'mceButtonNormal\'"';

-	h += ' onmousedown="this.className=\'mceButtonDown\'"';

-	h += ' width="20" height="16" border="0" title="' + tinyMCE.getLang('lang_browse') + '"';

-	h += ' class="mceButtonNormal" alt="' + tinyMCE.getLang('lang_browse') + '" /></a>';

+	h += '<a id="' + id + '_link" href="javascript:;" onclick="tinyMCEPopup.pickColor(event,\'' + target_form_element +'\');" onmousedown="return false;" class="pickcolor">';

+	h += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '"></span></a>';

 

 	return h;

 }

 

-function pickColor(e, target_form_element) {

-	if ((e.keyCode == 32 || e.keyCode == 13) || e.type == "mousedown")

-		tinyMCEPopup.pickColor(e, target_form_element);

-}

-

 function updateColor(img_id, form_element_id) {

 	document.getElementById(img_id).style.backgroundColor = document.forms[0].elements[form_element_id].value;

 }

@@ -40,34 +30,32 @@ function setBrowserDisabled(id, state) {
 		if (state) {

 			lnk.setAttribute("realhref", lnk.getAttribute("href"));

 			lnk.removeAttribute("href");

-			tinyMCE.switchClass(img, 'mceButtonDisabled', true);

+			tinyMCEPopup.dom.addClass(img, 'disabled');

 		} else {

-			lnk.setAttribute("href", lnk.getAttribute("realhref"));

-			tinyMCE.switchClass(img, 'mceButtonNormal', false);

+			if (lnk.getAttribute("realhref"))

+				lnk.setAttribute("href", lnk.getAttribute("realhref"));

+

+			tinyMCEPopup.dom.removeClass(img, 'disabled');

 		}

 	}

 }

 

 function getBrowserHTML(id, target_form_element, type, prefix) {

-	var option = prefix + "_" + type + "_browser_callback";

-	var cb = tinyMCE.getParam(option, tinyMCE.getParam("file_browser_callback"));

-	if (cb == null)

-		return "";

+	var option = prefix + "_" + type + "_browser_callback", cb, html;

 

-	var html = "";

+	cb = tinyMCEPopup.getParam(option, tinyMCEPopup.getParam("file_browser_callback"));

 

-	html += '<a id="' + id + '_link" href="javascript:openBrower(\'' + id + '\',\'' + target_form_element + '\', \'' + type + '\',\'' + option + '\');" onmousedown="return false;">';

-	html += '<img id="' + id + '" src="' + themeBaseURL + '/images/browse.gif"';

-	html += ' onmouseover="this.className=\'mceButtonOver\';"';

-	html += ' onmouseout="this.className=\'mceButtonNormal\';"';

-	html += ' onmousedown="this.className=\'mceButtonDown\';"';

-	html += ' width="20" height="18" border="0" title="' + tinyMCE.getLang('lang_browse') + '"';

-	html += ' class="mceButtonNormal" alt="' + tinyMCE.getLang('lang_browse') + '" /></a>';

+	if (!cb)

+		return "";

+

+	html = "";

+	html += '<a id="' + id + '_link" href="javascript:openBrowser(\'' + id + '\',\'' + target_form_element + '\', \'' + type + '\',\'' + option + '\');" onmousedown="return false;" class="browse">';

+	html += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '"></span></a>';

 

 	return html;

 }

 

-function openBrower(img_id, target_form_element, type, option) {

+function openBrowser(img_id, target_form_element, type, option) {

 	var img = document.getElementById(img_id);

 

 	if (img.className != "mceButtonDisabled")

@@ -119,8 +107,8 @@ function addSelectValue(form_obj, field_name, name, value) {
 function addClassesToList(list_id, specific_option) {

 	// Setup class droplist

 	var styleSelectElm = document.getElementById(list_id);

-	var styles = tinyMCE.getParam('theme_advanced_styles', false);

-	styles = tinyMCE.getParam(specific_option, styles);

+	var styles = tinyMCEPopup.getParam('theme_advanced_styles', false);

+	styles = tinyMCEPopup.getParam(specific_option, styles);

 

 	if (styles) {

 		var stylesAr = styles.split(';');

@@ -136,10 +124,9 @@ function addClassesToList(list_id, specific_option) {
 			}

 		}

 	} else {

-		// Use auto impored classes

-		var csses = tinyMCE.getCSSClasses(tinyMCE.getWindowArg('editor_id'));

-		for (var i=0; i<csses.length; i++)

-			styleSelectElm.options[styleSelectElm.length] = new Option(csses[i], csses[i]);

+		tinymce.each(tinyMCEPopup.editor.dom.getClasses(), function(o) {

+			styleSelectElm.options[styleSelectElm.length] = new Option(o.title || o['class'], o['class']);

+		});

 	}

 }

 

@@ -183,7 +170,7 @@ function convertHexToRGB(col) {
 }

 

 function trimSize(size) {

-	return size.replace(new RegExp('[^0-9%]', 'gi'), '');

+	return size.replace(/([0-9\.]+)px|(%|in|cm|mm|em|ex|pt|pc)/, '$1$2');

 }

 

 function getCSSSize(size) {

@@ -192,11 +179,15 @@ function getCSSSize(size) {
 	if (size == "")

 		return "";

 

-	return size.indexOf('%') != -1 ? size : size + "px";

+	// Add px

+	if (/^[0-9]+$/.test(size))

+		size += 'px';

+

+	return size;

 }

 

 function getStyle(elm, attrib, style) {

-	var val = tinyMCE.getAttrib(elm, attrib);

+	var val = tinyMCEPopup.dom.getAttrib(elm, attrib);

 

 	if (val != '')

 		return '' + val;

@@ -204,7 +195,5 @@ function getStyle(elm, attrib, style) {
 	if (typeof(style) == 'undefined')

 		style = attrib;

 

-	val = eval('elm.style.' + style);

-

-	return val == null ? '' : '' + val;

+	return tinyMCEPopup.dom.getStyle(elm, style);

 }

diff --git a/wp-includes/js/tinymce/utils/mclayer.js b/wp-includes/js/tinymce/utils/mclayer.js
index 1b347f7..41aabcf 100644
--- a/wp-includes/js/tinymce/utils/mclayer.js
+++ b/wp-includes/js/tinymce/utils/mclayer.js
@@ -1,10 +1,10 @@
 /**

- * $Id: mclayer.js 162 2007-01-03 16:16:52Z spocke $

+ * $Id: mclayer.js 520 2008-01-07 16:30:32Z spocke $

  *

  * Moxiecode floating layer script.

  *

  * @author Moxiecode

- * @copyright Copyright © 2004-2007, Moxiecode Systems AB, All rights reserved.

+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.

  */

 

 function MCLayer(id) {

diff --git a/wp-includes/js/tinymce/utils/mctabs.js b/wp-includes/js/tinymce/utils/mctabs.js
index fae038d..1ece6d2 100644
--- a/wp-includes/js/tinymce/utils/mctabs.js
+++ b/wp-includes/js/tinymce/utils/mctabs.js
@@ -1,10 +1,10 @@
 /**

- * $Id: mctabs.js 162 2007-01-03 16:16:52Z spocke $

+ * $Id: mctabs.js 520 2008-01-07 16:30:32Z spocke $

  *

  * Moxiecode DHTML Tabs script.

  *

  * @author Moxiecode

- * @copyright Copyright © 2004-2007, Moxiecode Systems AB, All rights reserved.

+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.

  */

 

 function MCTabs() {

diff --git a/wp-includes/js/tinymce/utils/validate.js b/wp-includes/js/tinymce/utils/validate.js
index b8931f4..26d426a 100644
--- a/wp-includes/js/tinymce/utils/validate.js
+++ b/wp-includes/js/tinymce/utils/validate.js
@@ -1,10 +1,10 @@
 /**

- * $Id: validate.js 162 2007-01-03 16:16:52Z spocke $

+ * $Id: validate.js 673 2008-03-06 13:26:20Z spocke $

  *

  * Various form validation methods.

  *

  * @author Moxiecode

- * @copyright Copyright © 2004-2007, Moxiecode Systems AB, All rights reserved.

+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.

  */

 

 /**

@@ -31,7 +31,7 @@ var Validator = {
 	},

 

 	isSize : function(s) {

-		return this.test(s, '^[0-9]+(px|%)?$');

+		return this.test(s, '^[0-9]+(%|in|cm|mm|em|ex|pt|pc|px)?$');

 	},

 

 	isId : function(s) {