Upgrade TinyMCE

[citadel.git] / webcit / tiny_mce / plugins / style / js / props.js

diff --git a/webcit/tiny_mce/plugins/style/js/props.js b/webcit/tiny_mce/plugins/style/js/props.js
index cafd6b1cf7ead1fd5b2851edc4c9d5f714af2671..a8dd93dec5945263bb0faa5caef3f7696e5e2400 100644 (file)
--- a/webcit/tiny_mce/plugins/style/js/props.js
+++ b/webcit/tiny_mce/plugins/style/js/props.js
@@ -10,9 +10,9 @@ var defaultFonts = "" +
        "Geneva, Arial, Helvetica, sans-serif=Geneva, Arial, Helvetica, sans-serif";\r
 \r
 var defaultSizes = "9;10;12;14;16;18;24;xx-small;x-small;small;medium;large;x-large;xx-large;smaller;larger";\r
-var defaultMeasurement = "+pixels=px;points=pt;em;in;cm;mm;picas;ems;exs;%";\r
-var defaultSpacingMeasurement = "pixels=px;points=pt;in;cm;mm;picas;+ems;exs;%";\r
-var defaultIndentMeasurement = "pixels=px;+points=pt;in;cm;mm;picas;ems;exs;%";\r
+var defaultMeasurement = "+pixels=px;points=pt;inches=in;centimetres=cm;millimetres=mm;picas=pc;ems=em;exs=ex;%";\r
+var defaultSpacingMeasurement = "pixels=px;points=pt;inches=in;centimetres=cm;millimetres=mm;picas=pc;+ems=em;exs=ex;%";\r
+var defaultIndentMeasurement = "pixels=px;+points=pt;inches=in;centimetres=cm;millimetres=mm;picas=pc;ems=em;exs=ex;%";\r
 var defaultWeight = "normal;bold;bolder;lighter;100;200;300;400;500;600;700;800;900";\r
 var defaultTextStyle = "normal;italic;oblique";\r
 var defaultVariant = "normal;small-caps";\r
@@ -247,12 +247,12 @@ function setupFormData() {
 }\r
 \r
 function getMeasurement(s) {\r
-       return s.replace(/^([0-9]+)(.*)$/, "$2");\r
+       return s.replace(/^([0-9.]+)(.*)$/, "$2");\r
 }\r
 \r
 function getNum(s) {\r
-       if (new RegExp('^[0-9]+[a-z%]+$', 'gi').test(s))\r
-               return s.replace(/[^0-9]/g, '');\r
+       if (new RegExp('^(?:[0-9.]+)(?:[a-z%]+)$', 'gi').test(s))\r
+               return s.replace(/[^0-9.]/g, '');\r
 \r
        return s;\r
 }\r
@@ -478,7 +478,7 @@ function generateCSS() {
                ce.style.borderBottomWidth = f.border_width_bottom.value + (isNum(f.border_width_bottom.value) ? f.border_width_bottom_measurement.value : "");\r
                ce.style.borderLeftWidth = f.border_width_left.value + (isNum(f.border_width_left.value) ? f.border_width_left_measurement.value : "");\r
        } else\r
-               ce.style.borderWidth = f.border_width_top.value;\r
+               ce.style.borderWidth = f.border_width_top.value + (isNum(f.border_width_top.value) ? f.border_width_top_measurement.value : "");\r
 \r
        if (!f.border_color_same.checked) {\r
                ce.style.borderTopColor = f.border_color_top.value;\r