From ad37c8252b0e991546910b7fb111944bd00e6adc Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Fri, 24 Jan 2020 13:45:39 +0000 Subject: [PATCH] [IMP] pre-commit run after update Includes some manual fixes to silent ESLint warnings. --- .../static/src/js/web_dialog_size.js | 75 +++++++++---------- .../static/src/scss/web_dialog_size.scss | 4 +- .../static/src/xml/web_dialog_size.xml | 10 ++- web_dialog_size/templates/assets.xml | 18 ++++- 4 files changed, 60 insertions(+), 47 deletions(-) diff --git a/web_dialog_size/static/src/js/web_dialog_size.js b/web_dialog_size/static/src/js/web_dialog_size.js index e13aa88ea..84b02ad8f 100644 --- a/web_dialog_size/static/src/js/web_dialog_size.js +++ b/web_dialog_size/static/src/js/web_dialog_size.js @@ -1,26 +1,25 @@ -odoo.define('web_dialog_size.web_dialog_size', function (require) { - 'use strict'; +odoo.define("web_dialog_size.web_dialog_size", function(require) { + "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', + model: "ir.config_parameter", + method: "get_web_dialog_size_config", }); Dialog.include({ - - willStart: function () { + 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) { + 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 { @@ -30,18 +29,20 @@ odoo.define('web_dialog_size.web_dialog_size', function (require) { }); }, - opened: function () { - 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 () { + close: function() { if (this.$modal) { var draggable = this.$modal.draggable("instance"); if (draggable) { @@ -51,20 +52,18 @@ odoo.define('web_dialog_size.web_dialog_size', function (require) { 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(); }, - }); - }); diff --git a/web_dialog_size/static/src/scss/web_dialog_size.scss b/web_dialog_size/static/src/scss/web_dialog_size.scss index 8e5e86b83..abf3aba73 100644 --- a/web_dialog_size/static/src/scss/web_dialog_size.scss +++ b/web_dialog_size/static/src/scss/web_dialog_size.scss @@ -1,4 +1,3 @@ - .modal { .dialog_full_screen { @include media-breakpoint-up(sm) { @@ -15,7 +14,8 @@ } } - &.dialog_button_extend, .dialog_button_restore { + &.dialog_button_extend, + .dialog_button_restore { @include media-breakpoint-down(sm) { display: none !important; } diff --git a/web_dialog_size/static/src/xml/web_dialog_size.xml b/web_dialog_size/static/src/xml/web_dialog_size.xml index 1ef058fe5..86c0626e3 100644 --- a/web_dialog_size/static/src/xml/web_dialog_size.xml +++ b/web_dialog_size/static/src/xml/web_dialog_size.xml @@ -1,12 +1,16 @@ - + - - + + diff --git a/web_dialog_size/templates/assets.xml b/web_dialog_size/templates/assets.xml index 0845e5027..cb68c4697 100644 --- a/web_dialog_size/templates/assets.xml +++ b/web_dialog_size/templates/assets.xml @@ -1,9 +1,19 @@ - + -