mirror of https://github.com/OCA/web.git
[FIX] web_widget_float_formula: Handle undefined and fix lint
* Handle undefined, or otherwise non-string parseable formula * Fix lint issue on regex creationpull/432/head
parent
ca31c73684
commit
0852243376
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue