diff options
| author | Romain Estievenart <res@odoo.com> | 2019-12-11 13:37:22 +0000 |
|---|---|---|
| committer | Adrien Dieudonne <adr@odoo.com> | 2020-01-13 13:25:01 +0000 |
| commit | baf5ec854ce60b21569afe347bd710496a4feb46 (patch) | |
| tree | 9b4e9366bbce5ecfc2c1bafdbd93c3f8981bddd9 /odoo/addons/base/static/src/js | |
| parent | a0779851237930e8c6d46efe3326746472e09945 (diff) | |
[MOV] base,web: move "base settings" mobile related code
This code is not useful since https://github.com/odoo/odoo/commit/9831ed08fe
Note that this part of code will be refactored in web_enterprise.
Task ID: 2085899
closes odoo/odoo#38499
Related: odoo/enterprise#6077
Signed-off-by: Adrien Dieudonné (adr) <adr@odoo.com>
Diffstat (limited to 'odoo/addons/base/static/src/js')
| -rw-r--r-- | odoo/addons/base/static/src/js/res_config_settings.js | 101 |
1 files changed, 1 insertions, 100 deletions
diff --git a/odoo/addons/base/static/src/js/res_config_settings.js b/odoo/addons/base/static/src/js/res_config_settings.js index 802fdaced6f..67e2979c308 100644 --- a/odoo/addons/base/static/src/js/res_config_settings.js +++ b/odoo/addons/base/static/src/js/res_config_settings.js @@ -3,7 +3,6 @@ odoo.define('base.settings', function (require) { var BasicModel = require('web.BasicModel'); var core = require('web.core'); -var config = require('web.config'); var FormView = require('web.FormView'); var FormController = require('web.FormController'); var FormRenderer = require('web.FormRenderer'); @@ -24,16 +23,6 @@ var BaseSettingRenderer = FormRenderer.extend({ this.activeTab = false; }, - start: function () { - var prom = this._super.apply(this, arguments); - if (config.device.isMobile) { - core.bus.on("DOM_updated", this, function () { - this._moveToTab(this.currentIndex || this._currentAppIndex()); - }); - } - return prom; - }, - /** * @override * overridden to show a message, informing user that there are changes @@ -103,49 +92,6 @@ var BaseSettingRenderer = FormRenderer.extend({ } }, /** - * In mobile view behaviour is like swipe content left / right and apps tab will be shown on the top. - * This method will set the required properties (styling and css). - * - * @private - * @param {int} currentTab - */ - _activateSettingMobileTab: function (currentTab) { - var self = this; - var moveTo = currentTab; - var next = moveTo + 1; - var previous = moveTo - 1; - - this.$(".settings .app_settings_block").removeClass("previous next current before after"); - this.$(".settings_tab .tab").removeClass("previous next current before after"); - _.each(this.modules, function (module, index) { - var tab = self.$(".tab[data-key='" + module.key + "']"); - var view = module.settingView; - - if (index === previous) { - tab.addClass("previous"); - tab.css("margin-left", "0px"); - view.addClass("previous"); - } else if (index === next) { - tab.addClass("next"); - tab.css("margin-left", "-" + tab.outerWidth() + "px"); - view.addClass("next"); - } else if (index < moveTo) { - tab.addClass("before"); - tab.css("margin-left", "-" + tab.outerWidth() + "px"); - view.addClass("before"); - } else if (index === moveTo) { - var marginLeft = tab.outerWidth() / 2; - tab.css("margin-left", "-" + marginLeft + "px"); - tab.addClass("current"); - view.addClass("current"); - } else if (index > moveTo) { - tab.addClass("after"); - tab.css("margin-left", "0"); - view.addClass("after"); - } - }); - }, - /** * find current app index in modules * */ @@ -157,22 +103,6 @@ var BaseSettingRenderer = FormRenderer.extend({ return index; }, /** - * Enables swipe navigation between settings pages - * - * @private - */ - _enableSwipe: function () { - var self = this; - this.$('.settings').swipe({ - swipeLeft: function () { - self._moveToTab(self.currentIndex + 1); - }, - swipeRight: function () { - self._moveToTab(self.currentIndex - 1); - } - }); - }, - /** * * @private * @param {string} module @@ -214,12 +144,7 @@ var BaseSettingRenderer = FormRenderer.extend({ view.removeClass("o_hidden"); this.activeView = view; this.activeTab = tab; - - if (config.device.isMobile) { - this._activateSettingMobileTab(this.currentIndex); - } else { - tab.addClass("selected"); - } + tab.addClass("selected"); } }, @@ -239,10 +164,6 @@ var BaseSettingRenderer = FormRenderer.extend({ _onKeyUpSearch: function (event) { this.searchText = this.searchInput.val(); this.activeTab.removeClass('selected'); - if (config.device.isMobile) { - this.$('.settings_tab').addClass('o_hidden'); - this.$('.settings').addClass('d-block'); - } this._searchSetting(); }, /** @@ -261,10 +182,6 @@ var BaseSettingRenderer = FormRenderer.extend({ }); this.activeTab.removeClass('o_hidden').addClass('selected'); this.activeView.removeClass('o_hidden'); - if (config.device.isMobile) { - this.$('.settings_tab').removeClass('o_hidden'); - this.$('.settings').removeClass('d-block'); - } }, _render: function () { @@ -273,10 +190,6 @@ var BaseSettingRenderer = FormRenderer.extend({ self._initModules(); self._renderLeftPanel(); self._initSearch(); - - if (config.device.isMobile) { - self._enableSwipe(); - } }); }, @@ -418,18 +331,6 @@ var BaseSettingView = FormView.extend({ Renderer: BaseSettingRenderer, Controller: BaseSettingController, }), - - /** - * Overrides to lazy-load touchSwipe library in mobile. - * - * @override - */ - init: function () { - if (config.device.isMobile) { - this.jsLibs.push('/web/static/lib/jquery.touchSwipe/jquery.touchSwipe.js'); - } - this._super.apply(this, arguments); - }, }); view_registry.add('base_settings', BaseSettingView); |
