diff options
| author | Jiten (OpenERP) <jra@tinyerp.com> | 2011-09-13 16:47:54 +0530 |
|---|---|---|
| committer | Jiten (OpenERP) <jra@tinyerp.com> | 2011-09-13 16:47:54 +0530 |
| commit | 47cdc8d62d3627d3d03e5d0963a5104e7dff9d7e (patch) | |
| tree | 6b6a28e30a036024c18b35e25a75aaa11faf1fa5 /addons/web/static/lib/qweb | |
| parent | 655d615f52fabf821d354f0399a792ac595de88e (diff) | |
| parent | a6b981eca52e04678b74acedeba21c2f4c2c5155 (diff) | |
[MERGE] Merge from openerp-web.
bzr revid: jra@tinyerp.com-20110913111754-zk57t5dqc22s98vm
Diffstat (limited to 'addons/web/static/lib/qweb')
| -rw-r--r-- | addons/web/static/lib/qweb/qweb2.js | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/addons/web/static/lib/qweb/qweb2.js b/addons/web/static/lib/qweb/qweb2.js index 473e80d1229..621ea39c74f 100644 --- a/addons/web/static/lib/qweb/qweb2.js +++ b/addons/web/static/lib/qweb/qweb2.js @@ -259,6 +259,9 @@ QWeb2.Engine = (function() { if (req) { // TODO: third parameter is async : https://developer.mozilla.org/en/XMLHttpRequest#open() // do an on_ready in QWeb2{} that could be passed to add_template + if (this.debug) { + s += '?debug=' + (new Date()).getTime(); // TODO fme: do it properly in case there's already url parameters + } req.open('GET', s, false); req.send(null); if (req.responseXML) { @@ -325,13 +328,13 @@ QWeb2.Engine = (function() { render : function(template, dict) { var ndict = QWeb2.tools.extend({}, this.default_dict); QWeb2.tools.extend(ndict, dict); - if (this.debug && window['console'] !== undefined) { + /*if (this.debug && window['console'] !== undefined) { console.time("QWeb render template " + template); - } + }*/ var r = this._render(template, ndict); - if (this.debug && window['console'] !== undefined) { + /*if (this.debug && window['console'] !== undefined) { console.timeEnd("QWeb render template " + template); - } + }*/ return r; }, _render : function(template, dict) { |