Skip to content

Commit

Permalink
[FIX] web_dialog_size js warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
emagdalenaC2i committed Oct 14, 2019
1 parent 23e6fa8 commit cc1a521
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 54 deletions.
108 changes: 56 additions & 52 deletions web_dialog_size/static/src/js/web_dialog_size.js
Original file line number Diff line number Diff line change
@@ -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();
}
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
});
}
}.bind(this));
},
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");
close: function () {
if (this.$modal) {
var draggable = this.$modal.draggable("instance");
if (draggable) {
this.$modal.draggable("destroy");
}
}
}
return this._super.apply(this, arguments);
},
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 changes: 1 addition & 1 deletion web_environment_ribbon/static/src/js/ribbon.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion web_responsive/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit cc1a521

Please sign in to comment.