diff options
| author | Khoi Nguyen <bng@odoo.com> | 2017-10-18 13:32:16 +0200 |
|---|---|---|
| committer | Khoi Nguyen <bng@odoo.com> | 2017-10-18 16:52:41 +0200 |
| commit | 3f962dbe631ac26e71d4df8263771594b01359ce (patch) | |
| tree | 46448ab0a4c08bea0939834eb926999b68ac97bb /addons/web/static/src | |
| parent | 28491aac45dc912696c1fcc57a50e3ec98906336 (diff) | |
[FIX] web,*: replace core.debug by config.debug
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/chrome/web_client.js | 4 | ||||
| -rw-r--r-- | addons/web/static/src/js/report/client_action.js | 3 | ||||
| -rw-r--r-- | addons/web/static/src/js/services/config.js | 3 | ||||
| -rw-r--r-- | addons/web/static/src/js/services/core.js | 6 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/kanban/kanban_record.js | 3 | ||||
| -rw-r--r-- | addons/web/static/src/js/widgets/debug_manager.js | 3 |
6 files changed, 10 insertions, 12 deletions
diff --git a/addons/web/static/src/js/chrome/web_client.js b/addons/web/static/src/js/chrome/web_client.js index 800277cfae8..e725aaee8f6 100644 --- a/addons/web/static/src/js/chrome/web_client.js +++ b/addons/web/static/src/js/chrome/web_client.js @@ -2,7 +2,7 @@ odoo.define('web.WebClient', function (require) { "use strict"; var AbstractWebClient = require('web.AbstractWebClient'); -var core = require('web.core'); +var config = require('web.config'); var data_manager = require('web.data_manager'); var framework = require('web.framework'); var Menu = require('web.Menu'); @@ -16,7 +16,7 @@ return AbstractWebClient.extend({ 'click .oe_logo img': function(ev) { ev.preventDefault(); return this.clear_uncommitted_changes().then(function() { - framework.redirect("/web" + (core.debug ? "?debug" : "")); + framework.redirect("/web" + (config.debug ? "?debug" : "")); }); }, }, diff --git a/addons/web/static/src/js/report/client_action.js b/addons/web/static/src/js/report/client_action.js index 60265c0a49d..cf6f4c94dfe 100644 --- a/addons/web/static/src/js/report/client_action.js +++ b/addons/web/static/src/js/report/client_action.js @@ -1,6 +1,7 @@ odoo.define('report.client_action', function (require) { 'use strict'; +var config = require('web.config'); var core = require('web.core'); var ControlPanelMixin = require('web.ControlPanelMixin'); var session = require('web.session'); @@ -108,7 +109,7 @@ var ReportAction = Widget.extend(ControlPanelMixin, { _update_control_panel_buttons: function () { this.$buttons.filter('div.o_report_edit_mode').toggle(this.in_edit_mode); this.$buttons.filter('div.o_report_no_edit_mode').toggle(! this.in_edit_mode); - this.$buttons.filter('div.o_edit_mode_available').toggle(core.debug && this.edit_mode_available && ! this.in_edit_mode); + this.$buttons.filter('div.o_edit_mode_available').toggle(config.debug && this.edit_mode_available && ! this.in_edit_mode); }, /** diff --git a/addons/web/static/src/js/services/config.js b/addons/web/static/src/js/services/config.js index 4cd60638113..04002b1b381 100644 --- a/addons/web/static/src/js/services/config.js +++ b/addons/web/static/src/js/services/config.js @@ -10,8 +10,6 @@ odoo.define('web.config', function (require) { * this file someday. */ -var core = require('web.core'); - var config = { /** * debug is a boolean flag. It is only considered true if the flag is set @@ -79,7 +77,6 @@ function _updateSizeProps() { if (sc !== config.device.size_class) { config.device.size_class = sc; config.device.isMobile = config.device.size_class <= config.device.SIZES.XS; - core.bus.trigger('size_class', sc); } } diff --git a/addons/web/static/src/js/services/core.js b/addons/web/static/src/js/services/core.js index f90b0e7c677..73071a2a65d 100644 --- a/addons/web/static/src/js/services/core.js +++ b/addons/web/static/src/js/services/core.js @@ -3,6 +3,7 @@ odoo.define('web.core', function (require) { var Bus = require('web.Bus'); var Class = require('web.Class'); +var config = require('web.config'); var QWeb = require('web.QWeb'); var Registry = require('web.Registry'); var translation = require('web.translation'); @@ -12,8 +13,6 @@ var translation = require('web.translation'); * * @type Boolean */ -var debug = $.deparam($.param.querystring()).debug !== undefined; - var bus = new Bus (); _.each('click,dblclick,keydown,keypress,keyup'.split(','), function(evtype) { @@ -28,8 +27,7 @@ _.each('resize,scroll'.split(','), function(evtype) { }); return { - debug: debug, - qweb: new QWeb(debug), + qweb: new QWeb(config.debug), // core classes and functions Class: Class, diff --git a/addons/web/static/src/js/views/kanban/kanban_record.js b/addons/web/static/src/js/views/kanban/kanban_record.js index 495f98b28ee..67279306581 100644 --- a/addons/web/static/src/js/views/kanban/kanban_record.js +++ b/addons/web/static/src/js/views/kanban/kanban_record.js @@ -6,6 +6,7 @@ odoo.define('web.KanbanRecord', function (require) { * a Kanban view. */ +var config = require('web.config'); var core = require('web.core'); var Domain = require('web.Domain'); var field_utils = require('web.field_utils'); @@ -193,7 +194,7 @@ var KanbanRecord = Widget.extend({ if (Widget) { widget = self._processWidget($field, field_name, Widget); self.subWidgets[field_name] = widget; - } else if (core.debug) { + } else if (config.debug) { // the widget is not implemented $field.replaceWith($('<span>', { text: _.str.sprintf(_t('[No widget %s]'), field_widget), diff --git a/addons/web/static/src/js/widgets/debug_manager.js b/addons/web/static/src/js/widgets/debug_manager.js index fe8c0ae0f3b..a0edf9dba28 100644 --- a/addons/web/static/src/js/widgets/debug_manager.js +++ b/addons/web/static/src/js/widgets/debug_manager.js @@ -3,6 +3,7 @@ odoo.define('web.DebugManager', function (require) { var ActionManager = require('web.ActionManager'); var dialogs = require('web.view_dialogs'); +var config = require('web.config'); var core = require('web.core'); var Dialog = require('web.Dialog'); var field_utils = require('web.field_utils'); @@ -770,7 +771,7 @@ var RequestDetails = Widget.extend({ } }); -if (core.debug) { +if (config.debug) { SystrayMenu.Items.push(DebugManager); WebClient.include({ |
