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

Merge PR #1351 into 12.0 

Signed-off-by pedrobaeza
pull/1357/head
OCA-git-bot 2019-08-09 11:26:03 +00:00
parent da292dd541 d6b474790d
commit 98f7d1b68e
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web_responsive/__manifest__.py
View File

@ -5,7 +5,7 @@
{ {
"name": "Web Responsive", "name": "Web Responsive",
"summary": "Responsive web client, community-supported", "summary": "Responsive web client, community-supported",
"version": "12.0.1.1.2", "version": "12.0.1.1.3",
"category": "Website", "category": "Website",
"website": "https://github.com/OCA/web", "website": "https://github.com/OCA/web",
"author": "LasLabs, Tecnativa, Alexandre Díaz, " "author": "LasLabs, Tecnativa, Alexandre Díaz, "

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

@ -15,6 +15,14 @@ odoo.define('web_responsive', function (require) {
var RelationalFields = require('web.relational_fields'); var RelationalFields = require('web.relational_fields');
var Chatter = require('mail.Chatter'); var Chatter = require('mail.Chatter');
/*
* Helper function to know if are waiting
*
*/
function isWaiting () {
return $('.oe_wait').length !== 0;
}
/** /**
* Reduce menu data to a searchable format understandable by fuzzy.js * Reduce menu data to a searchable format understandable by fuzzy.js
* *
@ -283,7 +291,7 @@ odoo.define('web_responsive', function (require) {
* Control if AppDrawer can be closed * Control if AppDrawer can be closed
*/ */
_hideAppsMenu: function () { _hideAppsMenu: function () {
return $('.oe_wait').length === 0 && !this.$('input').is(':focus'); return !isWaiting() && !this.$('input').is(':focus');
}, },
}); });
@ -326,7 +334,7 @@ odoo.define('web_responsive', function (require) {
if ( if (
this.$menu_toggle.is(":visible") && this.$menu_toggle.is(":visible") &&
this.$section_placeholder.is(":visible") && this.$section_placeholder.is(":visible") &&
$('.oe_wait').length === 0 !isWaiting()
) { ) {
this.$section_placeholder.collapse("hide"); this.$section_placeholder.collapse("hide");
} }
@ -338,7 +346,7 @@ odoo.define('web_responsive', function (require) {
* @returns {Boolean} * @returns {Boolean}
*/ */
_hideMenuSection: function () { _hideMenuSection: function () {
return $('.oe_wait').length === 0; return !isWaiting();
}, },
/** /**
@ -351,6 +359,17 @@ odoo.define('web_responsive', function (require) {
return this._super.apply(this, arguments); return this._super.apply(this, arguments);
} }
}, },
/**
* Don't display the menu if are waiting for an action to end
*
* @override
*/
_onMouseOverMenu: function () {
if (!isWaiting()) {
this._super.apply(this, arguments);
}
},
}); });
RelationalFields.FieldStatus.include({ RelationalFields.FieldStatus.include({