From 0852243376774f3558be418fa8ca1e8c28c49fb5 Mon Sep 17 00:00:00 2001 From: Dave Lasley Date: Sun, 2 Oct 2016 12:20:57 +0200 Subject: [PATCH] [FIX] web_widget_float_formula: Handle undefined and fix lint * Handle undefined, or otherwise non-string parseable formula * Fix lint issue on regex creation --- .../static/src/js/web_widget_float_formula.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/web_widget_float_formula/static/src/js/web_widget_float_formula.js b/web_widget_float_formula/static/src/js/web_widget_float_formula.js index a64617f2..76f5dd13 100644 --- a/web_widget_float_formula/static/src/js/web_widget_float_formula.js +++ b/web_widget_float_formula/static/src/js/web_widget_float_formula.js @@ -52,10 +52,15 @@ odoo.define('web_widget_float_formula', function(require) { }, _process_formula: function(formula) { - var clean_formula = formula.toString().replace(/^\s+|\s+$/g, ''); + try{ + formula = formula.toString(); + } catch (ex) { + return false; + } + var clean_formula = formula.replace(/^\s+|\s+$/g, ''); if (clean_formula[0] == '=') { clean_formula = clean_formula.substring(1); - var myreg = RegExp('[0-9]|\\s|\\.|,|\\(|\\)|\\+|\\-|\\*|\\/','g'); + var myreg = new RegExp('[0-9]|\\s|\\.|,|\\(|\\)|\\+|\\-|\\*|\\/', 'g'); if (clean_formula.replace(myreg, '') === '') { return clean_formula; }