6 files changed, 8 insertions, 9 deletions

diff --git a/public/javascripts/tiny_mce/plugins/style/css/props.css b/public/javascripts/tiny_mce/plugins/style/css/props.css
index eb1f264..eb1f264 100755..100644
--- a/public/javascripts/tiny_mce/plugins/style/css/props.css
+++ b/public/javascripts/tiny_mce/plugins/style/css/props.css
diff --git a/public/javascripts/tiny_mce/plugins/style/editor_plugin.js b/public/javascripts/tiny_mce/plugins/style/editor_plugin.js
index 6ebaa91..cab2153 100755..100644
--- a/public/javascripts/tiny_mce/plugins/style/editor_plugin.js
+++ b/public/javascripts/tiny_mce/plugins/style/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create('tinymce.plugins.StylePlugin',{init:function(ed,url){ed.addCommand('mceStyleProps',function(){ed.windowManager.open({file:url+'/props.htm',width:480+parseInt(ed.getLang('style.delta_width',0)),height:320+parseInt(ed.getLang('style.delta_height',0)),inline:1},{plugin_url:url,style_text:ed.selection.getNode().style.cssText});});ed.addCommand('mceSetElementStyle',function(ui,v){if(e=ed.selection.getNode()){ed.dom.setAttrib(e,'style',v);ed.execCommand('mceRepaint');}});ed.onNodeChange.add(function(ed,cm,n){cm.setDisabled('styleprops',n.nodeName==='BODY');});ed.addButton('styleprops',{title:'style.desc',cmd:'mceStyleProps'});},getInfo:function(){return{longname:'Style',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/style',version:tinymce.majorVersion+"."+tinymce.minorVersion};}});tinymce.PluginManager.add('style',tinymce.plugins.StylePlugin);})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.StylePlugin",{init:function(a,b){a.addCommand("mceStyleProps",function(){a.windowManager.open({file:b+"/props.htm",width:480+parseInt(a.getLang("style.delta_width",0)),height:320+parseInt(a.getLang("style.delta_height",0)),inline:1},{plugin_url:b,style_text:a.selection.getNode().style.cssText})});a.addCommand("mceSetElementStyle",function(d,c){if(e=a.selection.getNode()){a.dom.setAttrib(e,"style",c);a.execCommand("mceRepaint")}});a.onNodeChange.add(function(d,c,f){c.setDisabled("styleprops",f.nodeName==="BODY")});a.addButton("styleprops",{title:"style.desc",cmd:"mceStyleProps"})},getInfo:function(){return{longname:"Style",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/style",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("style",tinymce.plugins.StylePlugin)})();
\ No newline at end of file
diff --git a/public/javascripts/tiny_mce/plugins/style/editor_plugin_src.js b/public/javascripts/tiny_mce/plugins/style/editor_plugin_src.js
index 6c817ce..6c817ce 100755..100644
--- a/public/javascripts/tiny_mce/plugins/style/editor_plugin_src.js
+++ b/public/javascripts/tiny_mce/plugins/style/editor_plugin_src.js
diff --git a/public/javascripts/tiny_mce/plugins/style/js/props.js b/public/javascripts/tiny_mce/plugins/style/js/props.js
index cafd6b1..a8dd93d 100755..100644
--- a/public/javascripts/tiny_mce/plugins/style/js/props.js
+++ b/public/javascripts/tiny_mce/plugins/style/js/props.js
@@ -10,9 +10,9 @@ var defaultFonts = "" +
         "Geneva, Arial, Helvetica, sans-serif=Geneva, Arial, Helvetica, sans-serif";

 

 var defaultSizes = "9;10;12;14;16;18;24;xx-small;x-small;small;medium;large;x-large;xx-large;smaller;larger";

-var defaultMeasurement = "+pixels=px;points=pt;em;in;cm;mm;picas;ems;exs;%";

-var defaultSpacingMeasurement = "pixels=px;points=pt;in;cm;mm;picas;+ems;exs;%";

-var defaultIndentMeasurement = "pixels=px;+points=pt;in;cm;mm;picas;ems;exs;%";

+var defaultMeasurement = "+pixels=px;points=pt;inches=in;centimetres=cm;millimetres=mm;picas=pc;ems=em;exs=ex;%";

+var defaultSpacingMeasurement = "pixels=px;points=pt;inches=in;centimetres=cm;millimetres=mm;picas=pc;+ems=em;exs=ex;%";

+var defaultIndentMeasurement = "pixels=px;+points=pt;inches=in;centimetres=cm;millimetres=mm;picas=pc;ems=em;exs=ex;%";

 var defaultWeight = "normal;bold;bolder;lighter;100;200;300;400;500;600;700;800;900";

 var defaultTextStyle = "normal;italic;oblique";

 var defaultVariant = "normal;small-caps";

@@ -247,12 +247,12 @@ function setupFormData() {
 }

 

 function getMeasurement(s) {

-        return s.replace(/^([0-9]+)(.*)$/, "$2");

+        return s.replace(/^([0-9.]+)(.*)$/, "$2");

 }

 

 function getNum(s) {

-        if (new RegExp('^[0-9]+[a-z%]+$', 'gi').test(s))

-                return s.replace(/[^0-9]/g, '');

+        if (new RegExp('^(?:[0-9.]+)(?:[a-z%]+)$', 'gi').test(s))

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

 

         return s;

 }

@@ -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 : "");

                 ce.style.borderLeftWidth = f.border_width_left.value + (isNum(f.border_width_left.value) ? f.border_width_left_measurement.value : "");

         } else

-                ce.style.borderWidth = f.border_width_top.value;

+                ce.style.borderWidth = f.border_width_top.value + (isNum(f.border_width_top.value) ? f.border_width_top_measurement.value : "");

 

         if (!f.border_color_same.checked) {

                 ce.style.borderTopColor = f.border_color_top.value;

diff --git a/public/javascripts/tiny_mce/plugins/style/langs/en_dlg.js b/public/javascripts/tiny_mce/plugins/style/langs/en_dlg.js
index 5026313..5026313 100755..100644
--- a/public/javascripts/tiny_mce/plugins/style/langs/en_dlg.js
+++ b/public/javascripts/tiny_mce/plugins/style/langs/en_dlg.js
diff --git a/public/javascripts/tiny_mce/plugins/style/props.htm b/public/javascripts/tiny_mce/plugins/style/props.htm
index 54538e3..3a1582c 100755..100644
--- a/public/javascripts/tiny_mce/plugins/style/props.htm
+++ b/public/javascripts/tiny_mce/plugins/style/props.htm
@@ -8,7 +8,6 @@
         <script type="text/javascript" src="../../utils/form_utils.js"></script>
         <script type="text/javascript" src="js/props.js"></script>
         <link href="css/props.css" rel="stylesheet" type="text/css" />
-        <base target="_self" />
 </head>
 
 <body id="styleprops" style="display: none">