From 430d09eb55f2b3f18cb64ebf3a53e8c850076d5c Mon Sep 17 00:00:00 2001
From: Bart van den Eijnden <bartvde@opengeo.org>
Date: Wed, 21 Mar 2012 12:17:44 +0100
Subject: [PATCH] incorporate review by @marcjansen

---
 lib/OpenLayers/BaseTypes.js  |  3 ++-
 tests/BaseTypes.html         | 21 ++++++++++++++++-----
 tests/Format/SLD/v1_0_0.html |  4 ++--
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/lib/OpenLayers/BaseTypes.js b/lib/OpenLayers/BaseTypes.js
index 0d78335817..0856ad22a6 100644
--- a/lib/OpenLayers/BaseTypes.js
+++ b/lib/OpenLayers/BaseTypes.js
@@ -196,10 +196,11 @@ OpenLayers.String = {
      *     otherwise. 
      */
     numericIf: function(value, trimWhitespace) {
+        var originalValue = value;
         if (trimWhitespace === true) {
             value = value.replace(/^\s*|\s*$/g, "");
         }
-        return OpenLayers.String.isNumeric(value) ? parseFloat(value) : value;
+        return OpenLayers.String.isNumeric(value) ? parseFloat(value) : originalValue;
     }
 
 };
diff --git a/tests/BaseTypes.html b/tests/BaseTypes.html
index a8af69be2b..3f1f87cfd2 100644
--- a/tests/BaseTypes.html
+++ b/tests/BaseTypes.html
@@ -221,9 +221,18 @@
             {value: "1e", expect: "1e"},
             {value: "1+e", expect: "1+e"},
             {value: "1-e", expect: "1-e"},
-            {value: " 27 ", expect: " 27 "}
+            {value: " 27 ", expect: " 27 ", expectWithTrim: 27},
+            {value: " abc ", expect: " abc ", expectWithTrim: " abc "}
         ];
-        t.plan(cases.length + 1);
+        var count = 0;
+        for (var i=0, ii=cases.length; i<ii; ++i) {
+            if (cases[i].expectWithTrim !== undefined) {
+                count += 2;
+            } else {
+                count++;
+            }
+        }
+        t.plan(count);
         
         var func = OpenLayers.String.numericIf;
         var obj, val, got, exp;
@@ -233,10 +242,12 @@
             exp = obj.expect;
             got = func(val);
             t.eq(got, exp, "'" + val + "' returns " + exp);
+            if (obj.expectWithTrim !== undefined) {
+                got = func(val, true);
+                exp = obj.expectWithTrim;
+                t.eq(got, exp, "'" + val + "' returns " + exp + " with trimWhitespace true");
+            }
         }
-
-        // test the trimWhitespace option
-        t.eq(OpenLayers.String.numericIf(" 27 ", true), 27, "if trimWhitespace is true, we expect to get a Number");
     }
    
    
diff --git a/tests/Format/SLD/v1_0_0.html b/tests/Format/SLD/v1_0_0.html
index 1f50e4fa14..fbc18a6552 100644
--- a/tests/Format/SLD/v1_0_0.html
+++ b/tests/Format/SLD/v1_0_0.html
@@ -996,7 +996,7 @@
                                 <ogc:Literal>
 
 
-                                29.7
+                                	29.7
 
 
                             </ogc:Literal>
@@ -1005,7 +1005,7 @@
                                 <ogc:Literal>
 
 
-                                36.2
+                                 36.2
 
 
                             </ogc:Literal>