diff options
| author | Aaron Bohy <aab@odoo.com> | 2016-06-09 11:44:31 +0200 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2016-06-16 13:48:18 +0200 |
| commit | 2e29f388c5f636b5a40775a086283d4f6980c3bf (patch) | |
| tree | 1e4887758d79e571e59226613b945e23382189a8 /addons/web/static/src/js/abstract_web_client.js | |
| parent | d632679a7272c39cb374d3845f40c7d626875cf3 (diff) | |
[FIX] calendar,pos,web: show_application should return a deferred
Also remove unused options dict from WebClient (especially action_post_login)
Diffstat (limited to 'addons/web/static/src/js/abstract_web_client.js')
| -rw-r--r-- | addons/web/static/src/js/abstract_web_client.js | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/addons/web/static/src/js/abstract_web_client.js b/addons/web/static/src/js/abstract_web_client.js index 6436f49dc7c..121ac43bdad 100644 --- a/addons/web/static/src/js/abstract_web_client.js +++ b/addons/web/static/src/js/abstract_web_client.js @@ -31,13 +31,10 @@ var WebClient = Widget.extend({ this.toggle_fullscreen(event.data.fullscreen); }, }, - init: function(parent, client_options) { + init: function(parent) { this.client_options = {}; this._super(parent); this.origin = undefined; - if (client_options) { - _.extend(this.client_options, client_options); - } this._current_state = null; this.menu_dm = new utils.DropMisordered(); this.action_mutex = new utils.Mutex(); @@ -65,13 +62,7 @@ var WebClient = Widget.extend({ // though it has no valid session return $.when(); } - }).then(function () { - if (self.client_options.action) { - self.do_action(self.client_options.action); - delete(self.client_options.action); - } - core.bus.trigger('web_client_ready'); - }); + }).then(core.bus.trigger.bind(core.bus, 'web_client_ready')); }, bind_events: function() { var self = this; |
