kivi.parse_amount: bei ungültigen mathematischen Ausdrücken 0 zurückliefern

Ansonsten würde eine Exception geworfen, was ein anderes Verhalten als
bei der Perl-Variante wäre.

diff --git a/js/kivi.js b/js/kivi.js
index dbf5a0e..c6b7074 100644 (file)
--- a/js/kivi.js
+++ b/js/kivi.js
@@ -66,7 +66,11 @@ namespace("kivi", function(ns) {
       return 0;
 
     /* jshint -W061 */
-    return eval(amount);
+    try {
+      return eval(amount);
+    } catch (err) {
+      return 0;
+    }
   };
 
   ns.round_amount = function(amount, places) {

diff --git a/js/t/kivi/parse_amount.js b/js/t/kivi/parse_amount.js
index 1ef2b11..1c267c4 100644 (file)
--- a/js/t/kivi/parse_amount.js
+++ b/js/t/kivi/parse_amount.js
@@ -115,3 +115,9 @@ QUnit.test("kivi.parse_amount function German number style with thousand separat
 
   assert.equal(kivi.parse_amount('iuh !@#$% 10,00'), 0, 'iuh !@#$% 10,00');
 });
+
+QUnit.test("kivi.parse_amount function German number style with thousand separator & invalid math expression", function( assert ) {
+  kivi.setup_formats({ numbers: '1.000,00' });
+
+  assert.equal(kivi.parse_amount('54--42'), 0, '54--42');
+});