Changeset 1591

Timestamp:

2010-07-05 08:47:57 (3 years ago)

Author:

freya

Message:

refactoring: add getDecimalSeparator and getThousandSeparator to core

Location:

trunk/modules

Files:

• kauri-forms/kauri-forms-framework/src/main/kauri/static-{build}.key/kauri.forms/basic-formatters.js (modified) (3 diffs)
• kauri-jquery/src/main/kauri/static-{build}.key/kauri.util/core.js (modified) (1 diff)

trunk/modules/kauri-forms/kauri-forms-framework/src/main/kauri/static-{build}.key/kauri.forms/basic-formatters.js

@@ -15 +15 @@
 
     var STRIP_REGEX = new RegExp("[\\s-_()+\\/\\\\|#@$%]", "gi");
-    
-    function getDecimalSeparator() {
-        var n = 1.1;
-        n = n.toLocaleString().substring(1, 2);
-       return n;
-    }
-
-    function getThousandSeparator() {
-        var n = 1000;
-        n = n.toLocaleString().substring(1, 2);
-       return n;
-    }
     
     formatters.putAll( {
@@ -72 +60 @@
                     return val.toLocaleString();
                 } else {
-                    return val.toLocaleString().split(getDecimalSeparator())[0];    
+                    return val.toLocaleString().split($.getDecimalSeparator())[0];    
                 }
             },
@@ -81 +69 @@
                     valstr = $.trim(valstr);
                     // remove thousands-separator
-                    var thousandSep = getThousandSeparator();
-                    var decimalSep = getDecimalSeparator();
+                    var thousandSep = $.getThousandSeparator();
+                    var decimalSep = $.getDecimalSeparator();
                     var regex = new RegExp("^([0-9]{1,3}("+thousandSep+"[0-9]{3})*(\\"+decimalSep+"[0-9]+)?|\\"+decimalSep+"[0-9]+)$");
 
                     var match = regex.exec(valstr);
                     if(match && match.length > 0){
-                        var parts = valstr.split(getThousandSeparator());
+                        var parts = valstr.split(thousandSep);
                         valstr = parts.join("");
                     }
 
                     // replace decimal-separator with '.'
-                    valstr = valstr.replace(getDecimalSeparator(), ".");
+                    valstr = valstr.replace(decimalSep, ".");
                     if (valstr.length == 0)
                         return undefined;

trunk/modules/kauri-jquery/src/main/kauri/static-{build}.key/kauri.util/core.js

@@ -122 +122 @@
         return base + relativ;
     }
+    
+   /**
+    * Get the decimal separator
+    */  
+   $.getDecimalSeparator = function() {
+       var n = 1.1;
+       n = n.toLocaleString().substring(1, 2);
+       return n;
+   }
+
+   /**
+    * Gets the thousands separator
+    */
+   $.getThousandSeparator = function() {
+       var n = 1000;
+       n = n.toLocaleString().substring(1, 2);
+       return n;
+   }