Changeset 7529

Timestamp:

03/06/07 07:11:03 (22 months ago)

Author:

peller

Message:

add a transform to substitute() for things like encoding (dijit parser)

Files:

• trunk/src/string/extras.js (modified) (2 diffs)

trunk/src/string/extras.js

@@ -5 +5 @@
 dojo.require("dojo.lang.array");
 
-dojo.string.substitute = function(/*String*/template, /*Object or Array*/map, /*Object?*/thisObject){
+dojo.string.substitute = function(/*String*/template, /*Object or Array*/map, /*Function?*/transform, /*Object?*/thisObject){
 // summary:
 //      Performs parameterized substitutions on a string. Throws an exception if any parameter is unmatched.
@@ -18 +18 @@
 // template: a string with expressions in the form ${key} to be replaced or ${key:format} which specifies a format function.  NOTE syntax has changed from %{key}
 // map: where to look for substitutions
-// thisObject: where to look for optional format function
+// transform: a function to process all parameters before substitution takes place, e.g. dojo.string.encodeXML
+// thisObject: where to look for optional format function; default to the global namespace
 
         return template.replace(/\$\{([^\s\:]+)(?:\:(\S+))?\}/g, function(match, key, format){
-                var value = dojo.getObject(key,false,map);
-                if(typeof(value) == "undefined"){
-                        dojo.raise("Missing key: " + key);
-                }
-                return format ? dojo.getObject(format,false,thisObject)(value) : value;
+                var value = dojo.getObject(key,false,map).toString();
+                if(format){ value = dojo.getObject(format,false,thisObject)(value);}
+                if(transform){ value = transform(value); }
+                return value;
         }); // string
 };