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

[FIX] web_dialog_size js warnings

pull/1402/head
emagdalena 2019-10-14 12:38:54 +02:00
parent 23e6fa8524
commit cc1a521d70
3 changed files with 60 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
web_dialog_size/static/src/js/web_dialog_size.js
View File

@ -1,66 +1,70 @@
odoo.define('web_dialog_size.web_dialog_size', function (require) {
'use strict';
'use strict';
var rpc = require('web.rpc');
var Dialog = require('web.Dialog');
var rpc = require('web.rpc');
var Dialog = require('web.Dialog');
var config = rpc.query({
model: 'ir.config_parameter',
method: 'get_web_dialog_size_config',
});
var config = rpc.query({
model: 'ir.config_parameter',
method: 'get_web_dialog_size_config',
});
Dialog.include({
Dialog.include({
willStart: function () {
var self = this;
return this._super.apply(this, arguments).then(function () {
self.$modal.find('.dialog_button_extend').on('click', self.proxy('_extending'));
self.$modal.find('.dialog_button_restore').on('click', self.proxy('_restore'));
return config.then(function(r) {
if (r.default_maximize) {
self._extending();
} else {
self._restore();
}
});
});
},
opened: function(handler) {
return this._super.apply(this, arguments).then(function(){
if (this.$modal) {
this.$modal.draggable({
handle: '.modal-header',
helper: false
willStart: function () {
var self = this;
return this._super.apply(this, arguments).then(function () {
self.$modal.find('.dialog_button_extend').on('click',
self.proxy('_extending')
);
self.$modal.find('.dialog_button_restore').on('click',
self.proxy('_restore')
);
return config.then(function (r) {
if (r.default_maximize) {
self._extending();
} else {
self._restore();
}
});
});
},
opened: function () {
return this._super.apply(this, arguments).then(function () {
if (this.$modal) {
this.$modal.draggable({
handle: '.modal-header',
helper: false,
});
}
}.bind(this));
},
close: function () {
if (this.$modal) {
var draggable = this.$modal.draggable("instance");
if (draggable) {
this.$modal.draggable("destroy");
}
}
}.bind(this));
},
return this._super.apply(this, arguments);
},
close: function() {
if (this.$modal) {
var draggable = this.$modal.draggable("instance");
if (draggable) {
this.$modal.draggable("destroy");
}
}
return this._super.apply(this, arguments);
},
_extending: function () {
var dialog = this.$modal.find('.modal-dialog');
dialog.addClass('dialog_full_screen');
dialog.find('.dialog_button_extend').hide();
dialog.find('.dialog_button_restore').show();
},
_extending: function() {
var dialog = this.$modal.find('.modal-dialog');
dialog.addClass('dialog_full_screen');
dialog.find('.dialog_button_extend').hide();
dialog.find('.dialog_button_restore').show();
},
_restore: function () {
var dialog = this.$modal.find('.modal-dialog');
dialog.removeClass('dialog_full_screen');
dialog.find('.dialog_button_restore').hide();
dialog.find('.dialog_button_extend').show();
},
_restore: function() {
var dialog = this.$modal.find('.modal-dialog');
dialog.removeClass('dialog_full_screen');
dialog.find('.dialog_button_restore').hide();
dialog.find('.dialog_button_extend').show();
},
});
});
});

2
web_environment_ribbon/static/src/js/ribbon.js
View File

@ -53,7 +53,7 @@ odoo.define('web_environment_ribbon.ribbon', function (require) {
ribbon.css('color', ribbon_data.color);
}
// Ribbon background color
if (ribbon_data.background_color &&
if (ribbon_data.background_color &&
validStrColour(ribbon_data.background_color)) {
ribbon.css('background-color', ribbon_data.background_color);
}

2
web_responsive/__manifest__.py
View File

@ -14,7 +14,7 @@
"installable": True,
"depends": ["web", "mail"],
"development_status": "Production/Stable",
"maintainers": ['Yajo', 'Tardo'],
"maintainers": ["Yajo", "Tardo"],
"data": ["views/assets.xml", "views/res_users.xml", "views/web.xml"],
"qweb": [
"static/src/xml/apps.xml",