From 99897b7c4e52a5ff026c3828b84653f460f571f0 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 09 Feb 2011 07:46:46 -0500
Subject: [PATCH] - Merged r4512, r4514, r4515
---
program/js/tiny_mce/utils/validate.js | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/program/js/tiny_mce/utils/validate.js b/program/js/tiny_mce/utils/validate.js
index b8931f4..a6fcf97 100644
--- a/program/js/tiny_mce/utils/validate.js
+++ b/program/js/tiny_mce/utils/validate.js
@@ -1,10 +1,11 @@
/**
- * $Id: validate.js 162 2007-01-03 16:16:52Z spocke $
+ * validate.js
*
- * Various form validation methods.
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
*
- * @author Moxiecode
- * @copyright Copyright � 2004-2007, Moxiecode Systems AB, All rights reserved.
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
*/
/**
@@ -31,7 +32,7 @@
},
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) {
@@ -110,7 +111,7 @@
},
reset : function(e) {
- var t = new Array('label', 'input', 'select', 'textarea');
+ var t = ['label', 'input', 'select', 'textarea'];
var i, j, nl, s = this.settings;
if (e == null)
--
Gitblit v1.9.1