Ticket #1133: string_format_improved.diff

/mnt/d/eclipse/workspace/openlayers/lib/OpenLayers/BaseTypes.js

@@ -87 +87 @@
-            camelizedString += s.charAt(0).toUpperCase() + s.substring(1);
-        }
-        return camelizedString;
+    },
+
+    /**
+     * APIFunction: OpenLayers.String.format
+     * Given a string with tokens in the form ${token}, return a string
+     *     with tokens replaced with properties from the given context
+     *     object.  Represent a literal "${" by doubling it, e.g. "${${".
+     *
+     * Parameters:
+     * template - {String} A string with tokens to be replaced.  A template
+     *     has the form "literal ${token}" where the token will be replaced
+     *     by the value of context["token"].
+     * context - {Object} An optional object with properties corresponding
+     *     to the tokens in the format string.  If no context is sent, the
+     *     window object will be used.
+     *
+     * Returns:
+     * {String} A string with tokens replaced from the context object.
+     */
+    format: function(template, context) {
+        if(!context) {
+            context = window;
+        }
+        var tokens = template.split("${");
+        var last;
+        for(var i=1; i<tokens.length; i++) { 
+            var last = tokens[i].indexOf("}"); 
+            if(last != -1) { 
+                tokens[i] = context[tokens[i].substring(0, last)] +
+                            tokens[i].substring(++last); 
+            } else {
+                if (tokens[i]) {
+                    tokens[i] = tokens[i] + "}";
+                } else {
+                    tokens[i] = "${" + tokens[i];
+                }
+            }
+        }
+        return tokens.join("");
-    }
+
-};
-
-if (!String.prototype.startsWith) {