Changeset 7503

Timestamp:

03/01/07 12:00:05 (18 months ago)

Author:

peller

Message:

References #2350. Change substituteParams to substitute

Location:

trunk

Files:

• src/string/extras.js (modified) (1 diff)
• src/widget/ComboBox.js (modified) (2 diffs)
• src/widget/Repeater.js (modified) (4 diffs)
• tests/string/test_extras.js (modified) (4 diffs)

trunk/src/string/extras.js

@@ -11 +11 @@
 // description:
 //      For example,
-//              dojo.string.substituteParams("File '${0}' is not found in directory '${1}'.",["foo.html","/temp"]);
-//              dojo.string.substituteParams("File '${name}' is not found in directory '${info.dir}'.",{name: "foo.html", info: {dir: "/temp"}});
+//              dojo.string.substitute("File '${0}' is not found in directory '${1}'.",["foo.html","/temp"]);
+//              dojo.string.substitute("File '${name}' is not found in directory '${info.dir}'.",{name: "foo.html", info: {dir: "/temp"}});
 //      both return
 //              "File 'foo.html' is not found in directory '/temp'."

trunk/src/widget/ComboBox.js

@@ -60 +60 @@
                         }
                         var tss = encodeURIComponent(searchStr);
-                        var realUrl = dojo.string.substituteParams(this.searchUrl, {"searchString": tss});
+dojo.debug("STARTSEARCH: url="+this.searchUrl+" searchString="+tss);
+                        var realUrl = dojo.string.substitute(this.searchUrl, {"searchString": tss});
+dojo.debug("realUrl="+typeof realUrl);
                         var _this = this;
-                        var request = this._lastRequest = dojo.io.bind({
+                        var request = (this._lastRequest = dojo.io.bind({
                                 url: realUrl,
                                 method: "get",
@@ -80 +82 @@
                                         }
                                 }
-                        });
+                        }));
                         this._inFlight = true;
                 }

trunk/src/widget/Repeater.js

@@ -77 +77 @@
                                                 var name = list[j].name;
                                                 var index=dojo.string.escape("regexp", this.pattern);
-                                                index = index.replace(/(%\\\{index\\\})/g,"%{index}");
-                                                var nameRegexp = dojo.string.substituteParams(index, {"index": "[0-9]*"});
-                                                var newName= dojo.string.substituteParams(this.pattern, {"index": "" + i});
+                                                index = index.replace(/($\\\{index\\\})/g,"${index}");
+                                                var nameRegexp = dojo.string.substitute(index, {"index": "[0-9]*"});
+                                                var newName= dojo.string.substitute(this.pattern, {"index": "" + i});
                                                 var re=new RegExp(nameRegexp,"g");
                                                 list[j].name = name.replace(re,newName);
@@ -89 +89 @@
                 onDeleteRow: function(e) {
                         var index=dojo.string.escape("regexp", this.pattern);
-                        index = index.replace(/%\\\{index\\\}/g,"\%{index}");
-                        var nameRegexp = dojo.string.substituteParams(index, {"index": "([0-9]*)"});
+                        index = index.replace(/$\\\{index\\\}/g,"\${index}");
+                        var nameRegexp = dojo.string.substitute(index, {"index": "([0-9]*)"});
                         var re=new RegExp(nameRegexp,"g");
                         this.deleteRow(re.exec(e.target.name)[1]);
@@ -133 +133 @@
                 },
                 setRow: function(/*string*/template, /*object*/myObject) {
-                        //template = dojo.string.substituteParams(template, {"index": "0"});
+                        //template = dojo.string.substitute(template, {"index": "0"});
                         template= template.replace(/\%\{(index)\}/g, "0");
                         this.rowTemplate=template;
@@ -160 +160 @@
                                         } else if (child.getAttribute("rowAction") != null) {
                                                 if(child.getAttribute("rowAction") == "delete") {
-                                                        child.name=dojo.string.substituteParams(this.pattern, {"index": "" + node.row})+".delete";
+                                                        child.name=dojo.string.substitute(this.pattern, {"index": "" + node.row})+".delete";
                                                         dojo.event.connect(child, "onclick", this, "onDeleteRow");
                                                 } // if

trunk/tests/string/test_extras.js

@@ -1 +1 @@
 dojo.require("dojo.string.extras");
 
-function test_string_substituteParams(){
-        var tpla = "This %{string} has %{parameters} %{toReplace}";
-        var ps0 = dojo.string.substituteParams(tpla, { string: "area", parameters: "foo", toReplace: "bar"});
+function test_string_substitute(){
+        var tpla = "This ${string} has ${parameters} ${toReplace}";
+        var ps0 = dojo.string.substitute(tpla, { string: "area", parameters: "foo", toReplace: "bar"});
         jum.assertEquals("test20", "This area has foo bar", ps0);
 
@@ -9 +9 @@
         try {
                 // Missing a required parameter
-                var ps1 = dojo.string.substituteParams(tpla, { string: "area", parameters: "foo", extra: "baz"});
+                var ps1 = dojo.string.substitute(tpla, { string: "area", parameters: "foo", extra: "baz"});
         }catch(e){
                 thrown = e; // exception must be thrown
@@ -15 +15 @@
         jum.assertTrue("test21", thrown);
 
-        var tplb = "Passed as arguments: %{0}, %{1}, %{2}.";
-        var ps2 = dojo.string.substituteParams(tplb, "zero", "one", "two");
+        var tplb = "Passed as arguments: ${0}, ${1}, ${2}.";
+        var ps2 = dojo.string.substitute(tplb, ["zero", "one", "two"]);
         jum.assertEquals("test22", "Passed as arguments: zero, one, two.", ps2);
 
         // Unused argument provided
-        var tplb = "Passed as arguments: %{0}, %{1}, %{2}.";
-        var ps3 = dojo.string.substituteParams(tplb, "zero", "one", "two", "three");
+        var ps3 = dojo.string.substitute(tplb, ["zero", "one", "two", "three"]);
         jum.assertEquals("test23", "Passed as arguments: zero, one, two.", ps2);
 
@@ -27 +26 @@
         try{
                 // Missing a required parameter
-                var ps4 = dojo.string.substituteParams(tplb, "zero", "one");
+                var ps4 = dojo.string.substitute(tplb, ["zero", "one"]);
         }catch(e){
                 thrown = e; // exception must be thrown