diff options
| author | Paramjit Singh Sahota <psa@tinyerp.com> | 2013-05-17 11:01:30 +0530 |
|---|---|---|
| committer | Paramjit Singh Sahota <psa@tinyerp.com> | 2013-05-17 11:01:30 +0530 |
| commit | a031c86d68ad3ebaad2ea8381c8667ae92b14e19 (patch) | |
| tree | f0bfa73ebe69ebc42fcf04ebe58976bc0239b571 /addons/web/static/src/js/coresetup.js | |
| parent | 876c7900775baa7a653983ba1049355497dcd439 (diff) | |
| parent | ee262e156a19bceb961f62ea3912e362a11ddad3 (diff) | |
[MERGE] Merged lp:openerp-web/7.0
bzr revid: bth@tinyerp.com-20130417073823-qh3hzbj2j70kt6c6
bzr revid: psa@tinyerp.com-20130517053130-09k6t1os2x6g8i0j
Diffstat (limited to 'addons/web/static/src/js/coresetup.js')
| -rw-r--r-- | addons/web/static/src/js/coresetup.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js index dedb4a49710..6fc837333b6 100644 --- a/addons/web/static/src/js/coresetup.js +++ b/addons/web/static/src/js/coresetup.js @@ -555,19 +555,19 @@ instance.web.qweb.default_dict = { instance.web.qweb.preprocess_node = function() { // Note that 'this' is the Qweb Node switch (this.node.nodeType) { - case 3: - case 4: + case Node.TEXT_NODE: + case Node.CDATA_SECTION_NODE: // Text and CDATAs var translation = this.node.parentNode.attributes['t-translation']; if (translation && translation.value === 'off') { return; } - var match = /^(\s*)(.+?)(\s*)$/.exec(this.node.data); + var match = /^(\s*)([\s\S]+?)(\s*)$/.exec(this.node.data); if (match) { this.node.data = match[1] + instance.web._t(match[2]) + match[3]; } break; - case 1: + case Node.ELEMENT_NODE: // Element var attr, attrs = ['label', 'title', 'alt', 'placeholder']; while (attr = attrs.pop()) { |