Changeset 6553

Timestamp:

03/19/08 15:23:15 (6 months ago)

Author:

tschaub

Message:

Fixing OpenLayers.Style.createLiteral to work with all strings. r=ahocevar (closes #1439)

Files:

• trunk/openlayers/lib/OpenLayers/Style.js (modified) (1 diff)
• trunk/openlayers/tests/test_Style.html (modified) (1 diff)

trunk/openlayers/lib/OpenLayers/Style.js

@@ -332 +332 @@
-    if (typeof value == "string" && value.indexOf("${") != -1) {
-        value = OpenLayers.String.format(value, context, [feature]);
-isNaN(
+(isNaN(value) || !
-    }
-    return value;

trunk/openlayers/tests/test_Style.html

@@ -156 +156 @@
-        t.eq(typeof propertyStyles.pointRadius, "undefined", "correctly detected pointRadius as non-property style");
-    }
+    
+    function test_createLiteral(t) {
+        t.plan(6);
+        
+        var value, context, feature, result, expected;
+        var func = OpenLayers.Style.createLiteral;
+
+        // without templates
+        value = "foo";
+        expected = value;
+        result = func(value);
+        t.eq(result, expected, "(no template) preserves literal");
+        
+        // with templates
+        value = "${foo}"
+        expected = "bar";
+        context = {foo: expected};
+        result = func(value, context);
+        t.eq(result, expected, "(template) preserves literal");
+        
+        expected = "";
+        context = {foo: expected};
+        result = func(value, context);
+        t.eq(result, expected, "(template) preserves empty string");
+        
+        expected = "16/03/2008";
+        context = {foo: expected};
+        result = func(value, context);
+        t.eq(result, expected, "(template) preserves string with numbers");
+        
+        expected = 16;
+        context = {foo: expected + ""};
+        result = func(value, context);
+        t.eq(result, expected, "(template) casts integer in a string");
+
+        expected = 16;
+        context = {foo: " " + expected + " "};
+        result = func(value, context);
+        t.eq(result, expected, "(template) casts integer in a space padded string");
+
+    }
-
-    function test_Style_destroy(t) {