diff options
| author | Christophe Simonis <chs@openerp.com> | 2012-08-14 17:29:00 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2012-08-14 17:29:00 +0200 |
| commit | 63e4d9b572f27a5cdfa347e159ebc7e39f240ce1 (patch) | |
| tree | 61c80f5ba834928af433e15bc2831b1100e3b231 /addons/web/static/src/js/coresetup.js | |
| parent | 8c43267c4a6f8705b4e0c75b00e5131eb7f909f7 (diff) | |
[IMP] sed -i '' -e 's/connection/session/g'
bzr revid: chs@openerp.com-20120814152900-8r84kyz0qy1hwkvz
Diffstat (limited to 'addons/web/static/src/js/coresetup.js')
| -rw-r--r-- | addons/web/static/src/js/coresetup.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js index 44e2d3aba78..d5b87d8a81d 100644 --- a/addons/web/static/src/js/coresetup.js +++ b/addons/web/static/src/js/coresetup.js @@ -514,7 +514,7 @@ $.async_when = function() { // special tweak for the web client var old_async_when = $.async_when; $.async_when = function() { - if (instance.connection.synch) + if (instance.session.synch) return $.when.apply(this, arguments); else return old_async_when.apply(this, arguments); @@ -559,7 +559,7 @@ instance.web.unblockUI = function() { } /** Setup default session */ -instance.connection = new instance.web.Session(); +instance.session = new instance.web.Session(); /** Configure default qweb */ instance.web._t = new instance.web.TranslationDataBase().build_translation_function(); @@ -578,8 +578,8 @@ instance.web._lt = function (s) { return {toString: function () { return instance.web._t(s); }} }; instance.web.qweb = new QWeb2.Engine(); -instance.web.qweb.default_dict['__debug__'] = instance.connection.debug; // Which one ? -instance.web.qweb.debug = instance.connection.debug; +instance.web.qweb.default_dict['__debug__'] = instance.session.debug; // Which one ? +instance.web.qweb.debug = instance.session.debug; instance.web.qweb.default_dict = { '_' : _, '_t' : instance.web._t @@ -636,7 +636,7 @@ var _t = instance.web._t; _t('%d years ago'); } -instance.connection.on('module_loaded', this, function () { +instance.session.on('module_loaded', this, function () { // provide timeago.js with our own translator method $.timeago.settings.translator = instance.web._t; }); |
