summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js
diff options
context:
space:
mode:
authorqsm-odoo <qsm@odoo.com>2017-09-29 14:04:48 +0200
committerqsm-odoo <qsm@odoo.com>2017-09-29 14:41:41 +0200
commit87f1e360a89eb7617d5fd60cad58a143bea441df (patch)
tree3b8203b8d38d71b3286ef301a4886595341b7c7a /addons/web/static/src/js
parent34a7d9a1fb00cf369cebdddfa7ffe217d603542f (diff)
[FIX] web, mail, base: config's `isMobile` definition
The `isMobile` variable was defined at the right place (`config.device`) but was set at the wrong place (`config`). Thank you for making me author of all the `isMobile` lines by the way... :)
Diffstat (limited to 'addons/web/static/src/js')
-rw-r--r--addons/web/static/src/js/services/config.js2
-rw-r--r--addons/web/static/src/js/views/kanban/kanban_column.js4
-rw-r--r--addons/web/static/src/js/views/kanban/kanban_renderer_mobile.js2
-rw-r--r--addons/web/static/src/js/views/kanban/kanban_view.js6
-rw-r--r--addons/web/static/src/js/widgets/switch_company_menu.js2
5 files changed, 8 insertions, 8 deletions
diff --git a/addons/web/static/src/js/services/config.js b/addons/web/static/src/js/services/config.js
index f892801a593..4cd60638113 100644
--- a/addons/web/static/src/js/services/config.js
+++ b/addons/web/static/src/js/services/config.js
@@ -78,7 +78,7 @@ function _updateSizeProps() {
var sc = _getSizeClass();
if (sc !== config.device.size_class) {
config.device.size_class = sc;
- config.isMobile = config.device.size_class <= config.device.SIZES.XS;
+ 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/views/kanban/kanban_column.js b/addons/web/static/src/js/views/kanban/kanban_column.js
index ddfc16eaca2..0b5178f5ed3 100644
--- a/addons/web/static/src/js/views/kanban/kanban_column.js
+++ b/addons/web/static/src/js/views/kanban/kanban_column.js
@@ -99,7 +99,7 @@ var KanbanColumn = Widget.extend({
}
this.$header.find('.o_kanban_header_title').tooltip();
- if (!config.isMobile && this.draggable !== false) {
+ if (!config.device.isMobile && this.draggable !== false) {
// deactivate sortable in mobile mode. It does not work anyway,
// and it breaks horizontal scrolling in kanban views. Someday, we
// should find a way to use the touch events to make sortable work.
@@ -239,7 +239,7 @@ var KanbanColumn = Widget.extend({
this.$header.find('.o_column_title').text(title);
this.$header.find('.o-kanban-count').text(this.records.length);
- this.$el.toggleClass('o_column_folded', this.folded && !config.isMobile);
+ this.$el.toggleClass('o_column_folded', this.folded && !config.device.isMobile);
var tooltip = this.size + _t(' records');
tooltip = '<p>' + tooltip + '</p>' + this.tooltipInfo;
this.$header.find('.o_kanban_header_title').tooltip({html: true}).attr('data-original-title', tooltip);
diff --git a/addons/web/static/src/js/views/kanban/kanban_renderer_mobile.js b/addons/web/static/src/js/views/kanban/kanban_renderer_mobile.js
index e89d5c4b9a2..e2b08fc0da9 100644
--- a/addons/web/static/src/js/views/kanban/kanban_renderer_mobile.js
+++ b/addons/web/static/src/js/views/kanban/kanban_renderer_mobile.js
@@ -14,7 +14,7 @@ var KanbanRenderer = require('web.KanbanRenderer');
var qweb = core.qweb;
-if (!config.isMobile) {
+if (!config.device.isMobile) {
return;
}
diff --git a/addons/web/static/src/js/views/kanban/kanban_view.js b/addons/web/static/src/js/views/kanban/kanban_view.js
index adb363695c7..17c183a8573 100644
--- a/addons/web/static/src/js/views/kanban/kanban_view.js
+++ b/addons/web/static/src/js/views/kanban/kanban_view.js
@@ -35,7 +35,7 @@ var KanbanView = BasicView.extend({
this.loadParams.limit = this.loadParams.limit || 40;
// in mobile, columns are lazy-loaded, so set 'openGroupByDefault' to
// false so that they will won't be loaded by the initial load
- this.loadParams.openGroupByDefault = config.isMobile ? false : true;
+ this.loadParams.openGroupByDefault = config.device.isMobile ? false : true;
this.loadParams.type = 'list';
this.loadParams.groupBy = arch.attrs.default_group_by ? [arch.attrs.default_group_by] : (params.groupBy || []);
var progressBar;
@@ -62,7 +62,7 @@ var KanbanView = BasicView.extend({
this.rendererParams.column_options = {
editable: activeActions.group_edit,
deletable: activeActions.group_delete,
- group_creatable: activeActions.group_create && !config.isMobile,
+ group_creatable: activeActions.group_create && !config.device.isMobile,
quick_create: params.isQuickCreateEnabled || this._isQuickCreateEnabled(viewInfo),
hasProgressBar: !!progressBar,
};
@@ -77,7 +77,7 @@ var KanbanView = BasicView.extend({
this.controllerParams.readOnlyMode = false;
this.controllerParams.hasButtons = true;
- if (config.isMobile) {
+ if (config.device.isMobile) {
this.jsLibs.push('/web/static/lib/jquery.touchSwipe/jquery.touchSwipe.js');
}
},
diff --git a/addons/web/static/src/js/widgets/switch_company_menu.js b/addons/web/static/src/js/widgets/switch_company_menu.js
index ac0b6f50738..a51f16eb2f2 100644
--- a/addons/web/static/src/js/widgets/switch_company_menu.js
+++ b/addons/web/static/src/js/widgets/switch_company_menu.js
@@ -12,7 +12,7 @@ var _t = core._t;
var SwitchCompanyMenu = Widget.extend({
template: 'SwitchCompanyMenu',
willStart: function() {
- this.isMobile = config.isMobile;
+ this.isMobile = config.device.isMobile;
if (!session.user_companies) {
return $.Deferred().reject();
}