Changeset 15708

Timestamp:

11/15/08 19:28:02 (8 weeks ago)

Author:

peller

Message:

Normalize whitespace/nbsp handling for currency. Refs #8036

Files:

• dojo/trunk/number.js (modified) (2 diffs)

dojo/trunk/number.js

@@ -340 +340 @@
         if(isCurrency){
                 // substitute the currency symbol for the placeholder in the pattern
-                re = re.replace(/(\s*)(\u00a4{1,3})(\s*)/g, function(match, before, target, after){
+                re = re.replace(/([\s\xa0]*)(\u00a4{1,3})([\s\xa0]*)/g, function(match, before, target, after){
                         var prop = ["symbol", "currency", "displayName"][target.length-1];
                         var symbol = dojo.regexp.escapeString(options[prop] || options.currency || "");
-                        before = before ? "\\s" : "";
-                        after = after ? "\\s" : "";
+                        before = before ? "[\\s\\xa0]" : "";
+                        after = after ? "[\\s\\xa0]" : "";
                         if(!options.strict){
                                 if(before){before += "*";}
                                 if(after){after += "*";}
+                                console.log( "(?:"+before+symbol+after+")?");
                                 return "(?:"+before+symbol+after+")?";
                         }
@@ -393 +394 @@
         //              A string representation of a Number
         var info = dojo.number._parseInfo(options);
+console.log(info.regexp);
         var results = (new RegExp("^"+info.regexp+"$")).exec(expression);
         if(!results){