Techsystech
/
web
mirror of https://github.com/OCA/web.git
3
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

[FIX] web_responsive: adapt AppDrawer Discard

pull/1819/head
Mathias Markl 2019-06-24 11:39:51 +02:00 committed by Splash
parent ba9714451a
commit b42dd64d04
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
web_responsive/static/src/js/web_responsive.js
View File

@ -7,6 +7,7 @@ odoo.define('web_responsive', function (require) {
var ActionManager = require('web.ActionManager'); var ActionManager = require('web.ActionManager');
var AbstractWebClient = require("web.AbstractWebClient"); var AbstractWebClient = require("web.AbstractWebClient");
var AppsMenu = require("web.AppsMenu"); var AppsMenu = require("web.AppsMenu");
var BasicController = require('web.BasicController');
var config = require("web.config"); var config = require("web.config");
var core = require("web.core"); var core = require("web.core");
var FormRenderer = require('web.FormRenderer'); var FormRenderer = require('web.FormRenderer');
@ -112,6 +113,14 @@ odoo.define('web_responsive', function (require) {
return this._super.apply(this, arguments); return this._super.apply(this, arguments);
}, },
/**
* @override
*/
_onAppsMenuItemClicked: function (ev) {
this._super.apply(this, arguments);
ev.preventDefault();
},
/** /**
* Get all info for a given menu. * Get all info for a given menu.
* *
@ -276,10 +285,21 @@ odoo.define('web_responsive', function (require) {
}, },
}); });
BasicController.include({
/**
* @override
*/
canBeDiscarded: function (recordID) {
if (this.model.isDirty(recordID || this.handle)) {
$('.o_menu_apps .dropdown:has(.dropdown-menu.show) > a').dropdown('toggle');
}
return this._super.apply(this, arguments);
},
});
Menu.include({ Menu.include({
events: _.extend({ events: _.extend({
// Clicking on apps menu
"click .o_menu_apps a[data-toggle=dropdown]": "_onAppsMenuClick",
// Clicking a hamburger menu item should close the hamburger // Clicking a hamburger menu item should close the hamburger
"click .o_menu_sections [role=menuitem]": "_hideMobileSubmenus", "click .o_menu_sections [role=menuitem]": "_hideMobileSubmenus",
// Opening any dropdown in the navbar should hide the hamburger // Opening any dropdown in the navbar should hide the hamburger
@ -326,22 +346,6 @@ odoo.define('web_responsive', function (require) {
return this._super.apply(this, arguments); return this._super.apply(this, arguments);
} }
}, },
/**
* Check if Controller can be removed
*/
_onAppsMenuClick: function(event, checkedCanBeRemoved) {
var action_manager = this.getParent().action_manager;
var controller = action_manager.getCurrentController();
if (controller && !checkedCanBeRemoved) {
controller.widget.canBeRemoved().done(function () {
$(event.currentTarget).trigger('click', [true]);
$(event.currentTarget).off('.bs.dropdown');
});
event.stopPropagation();
event.preventDefault();
}
},
}); });
RelationalFields.FieldStatus.include({ RelationalFields.FieldStatus.include({