X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=webcit%2Ftiny_mce%2Futils%2Fform_utils.js;h=59da01399e1e7c2fe9025f20db26b300ecf06015;hp=2617a26edb2b0a60f2fc986c586214a6e3fa56bb;hb=b05f4eef4014db3885787ef15107cba93c932ac9;hpb=b347fec899815ec89b2738a0877880ee81e74b59
diff --git a/webcit/tiny_mce/utils/form_utils.js b/webcit/tiny_mce/utils/form_utils.js
index 2617a26ed..59da01399 100644
--- a/webcit/tiny_mce/utils/form_utils.js
+++ b/webcit/tiny_mce/utils/form_utils.js
@@ -11,10 +11,14 @@
var themeBaseURL = tinyMCEPopup.editor.baseURI.toAbsolute('themes/' + tinyMCEPopup.getParam("theme"));
function getColorPickerHTML(id, target_form_element) {
- var h = "";
+ var h = "", dom = tinyMCEPopup.dom;
- h += '';
- h += ' ';
+ if (label = dom.select('label[for=' + target_form_element + ']')[0]) {
+ label.id = label.id || dom.uniqueId();
+ }
+
+ h += '';
+ h += ' ' + tinyMCEPopup.getLang('browse') + '';
return h;
}
@@ -67,6 +71,9 @@ function selectByValue(form_obj, field_name, value, add_custom, ignore_case) {
if (!form_obj || !form_obj.elements[field_name])
return;
+ if (!value)
+ value = "";
+
var sel = form_obj.elements[field_name];
var found = false;
@@ -171,7 +178,7 @@ function convertHexToRGB(col) {
}
function trimSize(size) {
- return size.replace(/([0-9\.]+)px|(%|in|cm|mm|em|ex|pt|pc)/, '$1$2');
+ return size.replace(/([0-9\.]+)(px|%|in|cm|mm|em|ex|pt|pc)/i, '$1$2');
}
function getCSSSize(size) {
@@ -183,6 +190,9 @@ function getCSSSize(size) {
// Add px
if (/^[0-9]+$/.test(size))
size += 'px';
+ // Sanity check, IE doesn't like broken values
+ else if (!(/^[0-9\.]+(px|%|in|cm|mm|em|ex|pt|pc)$/i.test(size)))
+ return "";
return size;
}