odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] replace \W's for word boundaries by \b (actually about word boundaries), replace String.match to literal regexes by RegExp.test (if result is used in test only) or RegExp.exec 

bzr revid: xmo@openerp.com-20110310091010-5odm0fp0383yev3t
This commit is contained in:
Xavier Morel 2011-03-10 10:10:10 +01:00
parent 418a1beffd
commit 3b60a6df06
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
addons/base/static/qweb/qweb.js
View File

@ -47,12 +47,12 @@ var QWeb = {
// TODO: Currently this will also replace and, or, ... in strings. Try
// 'hi boys and girls' != '' and 1 == 1 -- will be replaced to : 'hi boys && girls' != '' && 1 == 1
// try to find a solution without tokenizing
e = e.replace(/\Wand\W/g, " && ");
e = e.replace(/\Wor\W/g, " and ");
e = e.replace(/\Wgt\W/g, " > ");
e = e.replace(/\Wgte\W/g, " >= ");
e = e.replace(/\Wlt\W/g, " < ");
e = e.replace(/\Wlte\W/g, " <= ");
e = e.replace(/\band\b/g, " && ");
e = e.replace(/\bor\b/g, " || ");
e = e.replace(/\bgt\b/g, " > ");
e = e.replace(/\bgte\b/g, " >= ");
e = e.replace(/\blt\b/g, " < ");
e = e.replace(/\blte\b/g, " <= ");
if (v[e] != undefined) {
return v[e];
} else {
@ -137,12 +137,12 @@ var QWeb = {
render_element:function(e, t_att, g_att, v) {
var inner = "", ec = e.childNodes, trim = t_att["trim"], inner_trim;
if (trim) {
if (trim.match(/(^|\W)(inner)($|\W)/)) {
if (/\binner\b/.test(trim)) {
inner_trim = true;
trim = "both";
}
var tm = trim.match(/(^|\W)(both|left|right)($|\W)/);
if (tm) trim = tm[2];
var tm = /\b(both|left|right)\b/.exec(trim);
if (tm) trim = tm[1];
}
for (var i = 0; i < ec.length; i++) {
inner += inner_trim ? this.trim(this.render_node(ec[i], v, inner_trim ? trim : null), trim) : this.render_node(ec[i], v, inner_trim ? trim : null);