diff options
| author | Jiten (OpenERP) <jra@tinyerp.com> | 2011-10-25 11:43:27 +0530 |
|---|---|---|
| committer | Jiten (OpenERP) <jra@tinyerp.com> | 2011-10-25 11:43:27 +0530 |
| commit | 417cae1645d11ee173bbb2dcebe112009b520cd7 (patch) | |
| tree | 501bb01b6d8688258155661577669d85fe887879 /addons/web/static/lib | |
| parent | 27598512e3e267d92a863c7df41974208ea8b554 (diff) | |
| parent | f097e140b8b51437258ae03000b37f1677f6098b (diff) | |
[Merge] Merge from openerp-web
bzr revid: bth@tinyerp.com-20111020062457-h4v2ud105ver5u5y
bzr revid: jra@tinyerp.com-20111025061327-v676oxmsx3xz66s3
Diffstat (limited to 'addons/web/static/lib')
| -rw-r--r-- | addons/web/static/lib/qweb/qweb2.js | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/addons/web/static/lib/qweb/qweb2.js b/addons/web/static/lib/qweb/qweb2.js index 621ea39c74f..34457ade4fd 100644 --- a/addons/web/static/lib/qweb/qweb2.js +++ b/addons/web/static/lib/qweb/qweb2.js @@ -207,6 +207,7 @@ QWeb2.Engine = (function() { this.reserved_words = QWeb2.RESERVED_WORDS.slice(0); this.actions_precedence = QWeb2.ACTIONS_PRECEDENCE.slice(0); this.word_replacement = QWeb2.tools.extend({}, QWeb2.WORD_REPLACEMENT); + this.format_text_node = null; for (var i = 0; i < arguments.length; i++) { this.add_template(arguments[i]); } @@ -317,12 +318,14 @@ QWeb2.Engine = (function() { " dict = dict || {};\n" + " dict['__template__'] = '" + template + "';\n" + " var r = [];\n" + - " /* START TEMPLATE */ try {\n" + + " /* START TEMPLATE */" + + (this.debug ? "" : " try {\n") + (e.compile()) + "\n" + - " /* END OF TEMPLATE */ } catch(error) {\n" + + " /* END OF TEMPLATE */" + + (this.debug ? "" : " } catch(error) {\n" + " if (console && console.exception) console.exception(error);\n" + - " context.engine.tools.exception('Runtime Error: ' + error, context);\n" + - " }\n" + + " context.engine.tools.exception('Runtime Error: ' + error, context);\n") + + (this.debug ? "" : " }\n") + " return r.join('');"; }, render : function(template, dict) { @@ -486,12 +489,16 @@ QWeb2.Element = (function() { }, _compile : function() { switch (this.node.nodeType) { - case 3: - case 4: - this.top_string(this.node.data); + case 3: + case 4: + var text = this.node.data; + if (this.engine.format_text_node) { + text = this.engine.format_text_node.call(this, text); + } + this.top_string(text); break; - case 1: - this.compile_element(); + case 1: + this.compile_element(); } var r = this._top.join(''); if (this.process_children) { |