upgrade to TinyMCE v2.0.8

5 files changed, 219 insertions, 56 deletions

diff --git a/program/js/tiny_mce/utils/editable_selects.js b/program/js/tiny_mce/utils/editable_selects.js
index 81c99eb5c..5f300b49b 100644
--- a/program/js/tiny_mce/utils/editable_selects.js
+++ b/program/js/tiny_mce/utils/editable_selects.js
@@ -1,7 +1,5 @@
 /**

- * $RCSfile: editable_selects.js,v $

- * $Revision: 1.1 $

- * $Date: 2006/04/10 09:30:19 $

+ * $Id: editable_selects.js 18 2006-06-29 14:11:23Z spocke $

  *

  * Makes select boxes editable.

  *

diff --git a/program/js/tiny_mce/utils/form_utils.js b/program/js/tiny_mce/utils/form_utils.js
index f1e935809..c502943d2 100644
--- a/program/js/tiny_mce/utils/form_utils.js
+++ b/program/js/tiny_mce/utils/form_utils.js
@@ -1,7 +1,5 @@
 /**

- * $RCSfile: form_utils.js,v $

- * $Revision: 1.11 $

- * $Date: 2006/04/07 15:53:12 $

+ * $Id: form_utils.js 43 2006-08-08 16:10:07Z spocke $

  *

  * Various form utilitiy functions.

  *

@@ -9,18 +7,20 @@
  * @copyright Copyright © 2004-2006, Moxiecode Systems AB, All rights reserved.

  */

 

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

+

 function getColorPickerHTML(id, target_form_element) {

-	var html = "";

+	var h = "";

 

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

-	html += '<img id="' + id + '" src="../../themes/' + tinyMCE.getParam("theme") + '/images/color.gif"';

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

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

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

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

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

+	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>';

 

-	return html;

+	return h;

 }

 

 function pickColor(e, target_form_element) {

@@ -57,7 +57,7 @@ function getBrowserHTML(id, target_form_element, type, prefix) {
 	var html = "";

 

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

-	html += '<img id="' + id + '" src="../../themes/' + tinyMCE.getParam("theme") + '/images/browse.gif"';

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

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

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

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

diff --git a/program/js/tiny_mce/utils/mclayer.js b/program/js/tiny_mce/utils/mclayer.js
index 0a7837b28..deac8b74d 100644
--- a/program/js/tiny_mce/utils/mclayer.js
+++ b/program/js/tiny_mce/utils/mclayer.js
@@ -1,7 +1,5 @@
 /**

- * $RCSfile: mclayer.js,v $

- * $Revision: 1.2 $

- * $Date: 2006/02/06 20:11:09 $

+ * $Id: mclayer.js 18 2006-06-29 14:11:23Z spocke $

  *

  * Moxiecode floating layer script.

  *

@@ -209,4 +207,4 @@ MCLayer.prototype = {
 

 		return parseInt(s);

 	}

-}
\ No newline at end of file
+}

diff --git a/program/js/tiny_mce/utils/mctabs.js b/program/js/tiny_mce/utils/mctabs.js
index c159360c0..354186e89 100644
--- a/program/js/tiny_mce/utils/mctabs.js
+++ b/program/js/tiny_mce/utils/mctabs.js
@@ -1,7 +1,5 @@
 /**

- * $RCSfile: mctabs.js,v $

- * $Revision: 1.2 $

- * $Date: 2006/02/06 20:11:09 $

+ * $Id: mctabs.js 18 2006-06-29 14:11:23Z spocke $

  *

  * Moxiecode DHTML Tabs script.

  *

diff --git a/program/js/tiny_mce/utils/validate.js b/program/js/tiny_mce/utils/validate.js
index 747b62bb6..f329b13ed 100644
--- a/program/js/tiny_mce/utils/validate.js
+++ b/program/js/tiny_mce/utils/validate.js
@@ -1,7 +1,5 @@
 /**

- * $RCSfile: validate.js,v $

- * $Revision: 1.3 $

- * $Date: 2006/02/06 20:11:09 $

+ * $Id: validate.js 65 2006-08-24 15:54:55Z spocke $

  *

  * Various form validation methods.

  *

@@ -9,42 +7,213 @@
  * @copyright Copyright © 2004-2006, Moxiecode Systems AB, All rights reserved.

  */

 

-function testRegExp(form_name, element_name, re) {

-	return new RegExp(re).test(document.forms[form_name].elements[element_name].value);

-}

+/**

+	// String validation:

+

+	if (!Validator.isEmail('myemail'))

+		alert('Invalid email.');

+

+	// Form validation:

+

+	var f = document.forms['myform'];

+

+	if (!Validator.isEmail(f.myemail))

+		alert('Invalid email.');

+*/

+

+var Validator = {

+	isEmail : function(s) {

+		return this.test(s, '^[-!#$%&\'*+\\./0-9=?A-Z^_`a-z{|}~]+@[-!#$%&\'*+\\/0-9=?A-Z^_`a-z{|}~]+\.[-!#$%&\'*+\\./0-9=?A-Z^_`a-z{|}~]+$');

+	},

+

+	isAbsUrl : function(s) {

+		return this.test(s, '^(news|telnet|nttp|file|http|ftp|https)://[-A-Za-z0-9\\.]+\\/?.*$');

+	},

+

+	isSize : function(s) {

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

+	},

+

+	isId : function(s) {

+		return this.test(s, '^[A-Za-z_]([A-Za-z0-9_])*$');

+	},

+

+	isEmpty : function(s) {

+		var nl, i;

+

+		if (s.nodeName == 'SELECT' && s.selectedIndex < 1)

+			return true;

+

+		if (s.type == 'checkbox' && !s.checked)

+			return true;

+

+		if (s.type == 'radio') {

+			for (i=0, nl = s.form.elements; i<nl.length; i++) {

+				if (nl[i].type == "radio" && nl[i].name == s.name && nl[i].checked)

+					return false;

+			}

+

+			return true;

+		}

+

+		return new RegExp('^\\s*$').test(s.nodeType == 1 ? s.value : s);

+	},

+

+	isNumber : function(s, d) {

+		return !isNaN(s.nodeType == 1 ? s.value : s) && (!d || !this.test(s, '^-?[0-9]*\\.[0-9]*$'));

+	},

+

+	test : function(s, p) {

+		s = s.nodeType == 1 ? s.value : s;

+

+		return s == '' || new RegExp(p).test(s);

+	}

+};

+

+var AutoValidator = {

+	settings : {

+		id_cls : 'id',

+		int_cls : 'int',

+		url_cls : 'url',

+		number_cls : 'number',

+		email_cls : 'email',

+		size_cls : 'size',

+		required_cls : 'required',

+		invalid_cls : 'invalid',

+		min_cls : 'min',

+		max_cls : 'max'

+	},

+

+	init : function(s) {

+		var n;

+

+		for (n in s)

+			this.settings[n] = s[n];

+	},

+

+	validate : function(f) {

+		var i, nl, s = this.settings, c = 0;

+

+		nl = this.tags(f, 'label');

+		for (i=0; i<nl.length; i++)

+			this.removeClass(nl[i], s.invalid_cls);

+

+		c += this.validateElms(f, 'input');

+		c += this.validateElms(f, 'select');

+		c += this.validateElms(f, 'textarea');

+

+		return c == 3;

+	},

+

+	invalidate : function(n) {

+		this.mark(n.form, n);

+	},

+

+	reset : function(e) {

+		var t = new Array('label', 'input', 'select', 'textarea');

+		var i, j, nl, s = this.settings;

+

+		if (e == null)

+			return;

+

+		for (i=0; i<t.length; i++) {

+			nl = this.tags(e.form ? e.form : e, t[i]);

+			for (j=0; j<nl.length; j++)

+				this.removeClass(nl[j], s.invalid_cls);

+		}

+	},

+

+	validateElms : function(f, e) {

+		var nl, i, n, s = this.settings, st = true, va = Validator, v;

+

+		nl = this.tags(f, e);

+		for (i=0; i<nl.length; i++) {

+			n = nl[i];

+

+			this.removeClass(n, s.invalid_cls);

+

+			if (this.hasClass(n, s.required_cls) && va.isEmpty(n))

+				st = this.mark(f, n);

+

+			if (this.hasClass(n, s.number_cls) && !va.isNumber(n))

+				st = this.mark(f, n);

+

+			if (this.hasClass(n, s.int_cls) && !va.isNumber(n, true))

+				st = this.mark(f, n);

+

+			if (this.hasClass(n, s.url_cls) && !va.isAbsUrl(n))

+				st = this.mark(f, n);

+

+			if (this.hasClass(n, s.email_cls) && !va.isEmail(n))

+				st = this.mark(f, n);

+

+			if (this.hasClass(n, s.size_cls) && !va.isSize(n))

+				st = this.mark(f, n);

+

+			if (this.hasClass(n, s.id_cls) && !va.isId(n))

+				st = this.mark(f, n);

+

+			if (this.hasClass(n, s.min_cls, true)) {

+				v = this.getNum(n, s.min_cls);

+

+				if (isNaN(v) || parseInt(n.value) < parseInt(v))

+					st = this.mark(f, n);

+			}

+

+			if (this.hasClass(n, s.max_cls, true)) {

+				v = this.getNum(n, s.max_cls);

+

+				if (isNaN(v) || parseInt(n.value) > parseInt(v))

+					st = this.mark(f, n);

+			}

+		}

+

+		return st;

+	},

+

+	hasClass : function(n, c, d) {

+		return new RegExp('\\b' + c + (d ? '[0-9]+' : '') + '\\b', 'g').test(n.className);

+	},

+

+	getNum : function(n, c) {

+		c = n.className.match(new RegExp('\\b' + c + '([0-9]+)\\b', 'g'))[0];

+		c = c.replace(/[^0-9]/g, '');

+

+		return c;

+	},

 

-function validateString(form_name, element_name) {

-	return (document.forms[form_name].elements[element_name].value.length > 0);

-}

+	addClass : function(n, c, b) {

+		var o = this.removeClass(n, c);

+		n.className = b ? c + (o != '' ? (' ' + o) : '') : (o != '' ? (o + ' ') : '') + c;

+	},

 

-function validateSelection(form_name, element_name) {

-	return (document.forms[form_name].elements[element_name].selectedIndex > 0);

-}

+	removeClass : function(n, c) {

+		c = n.className.replace(new RegExp("(^|\\s+)" + c + "(\\s+|$)"), ' ');

+		return n.className = c != ' ' ? c : '';

+	},

 

-function validateCheckBox(form_name, element_name) {

-	return document.forms[form_name].elements[element_name].checked;

-}

+	tags : function(f, s) {

+		return f.getElementsByTagName(s);

+	},

 

-function validateCleanString(form_name, element_name) {

-	return testRegExp(form_name, element_name, '^[A-Za-z0-9_]+$');

-}

+	mark : function(f, n) {

+		var s = this.settings;

 

-function validateEmail(form_name, element_name) {

-	return testRegExp(form_name, element_name, '^[-!#$%&\'*+\\./0-9=?A-Z^_`a-z{|}~]+@[-!#$%&\'*+\\/0-9=?A-Z^_`a-z{|}~]+\.[-!#$%&\'*+\\./0-9=?A-Z^_`a-z{|}~]+$');

-}

+		this.addClass(n, s.invalid_cls);

+		this.markLabels(f, n, s.invalid_cls);

 

-function validateAbsUrl(form_name, element_name) {

-	return testRegExp(form_name, element_name, '^(news|telnet|nttp|file|http|ftp|https)://[-A-Za-z0-9\\.]+$');

-}

+		return false;

+	},

 

-function validateNumber(form_name, element_name, allow_blank) {

-	return (!allow_blank && value == '') ? false : testRegExp(form_name, element_name, '^-?[0-9]*\\.?[0-9]*$');

-}

+	markLabels : function(f, n, ic) {

+		var nl, i;

 

-function validateSize(form_name, element_name,) {

-	return testRegExp(form_name, element_name, '^[0-9]+(px|%)?$');

-}

+		nl = this.tags(f, "label");

+		for (i=0; i<nl.length; i++) {

+			if (nl[i].getAttribute("for") == n.id || nl[i].htmlFor == n.id)

+				this.addClass(nl[i], ic);

+		}

 

-function validateID(form_name, element_name,) {

-	return testRegExp(form_name, element_name, '^[A-Za-z_]([A-Za-z0-9_])*$');

-}

+		return null;

+	}

+};