Skip to content

Commit

Permalink
[IMP] pre-commit run after update
Browse files Browse the repository at this point in the history
Includes some manual fixes to silent ESLint warnings.
  • Loading branch information
Jairo Llopis committed Jan 27, 2020
1 parent 87bd508 commit 981368d
Show file tree
Hide file tree
Showing 35 changed files with 651 additions and 528 deletions.
11 changes: 6 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
language: python
cache:
directories:
- $HOME/.cache/pip
- $HOME/.cache/pre-commit
- $HOME/.cache/pip
- $HOME/.cache/pre-commit

python:
- "3.6"
Expand All @@ -11,7 +11,7 @@ addons:
postgresql: "9.6"
apt:
packages:
- expect-dev # provides unbuffer utility
- expect-dev # provides unbuffer utility

stages:
- linting
Expand All @@ -34,10 +34,11 @@ jobs:

env:
global:
- VERSION="13.0" TESTS="0" LINT_CHECK="0" MAKEPOT="0"
- VERSION="13.0" TESTS="0" LINT_CHECK="0" MAKEPOT="0"

install:
- git clone --depth=1 https://github.com/OCA/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools
- git clone --depth=1 https://github.com/OCA/maintainer-quality-tools.git
${HOME}/maintainer-quality-tools
- export PATH=${HOME}/maintainer-quality-tools/travis:${PATH}
- travis_install_nightly

Expand Down
14 changes: 7 additions & 7 deletions web_decimal_numpad_dot/static/src/js/numpad_dot.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
/* License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */

odoo.define("web_decimal_numpad_dot.FieldFloat", function (require) {
odoo.define("web_decimal_numpad_dot.FieldFloat", function(require) {
"use strict";

var basic_fields = require("web.basic_fields");
var translation = require("web.translation");

var NumpadDotReplaceMixin = {
l10n_decimal_point: function () {
l10n_decimal_point: function() {
return this.formatType === "float_time"
? ":" : translation._t.database.parameters.decimal_point;
? ":"
: translation._t.database.parameters.decimal_point;
},

_replaceAt: function (cur_val, from, to, replacement) {
return cur_val.substring(0, from) + replacement +
cur_val.substring(to);
_replaceAt: function(cur_val, from, to, replacement) {
return cur_val.substring(0, from) + replacement + cur_val.substring(to);
},

_onKeydown: function (event) {
_onKeydown: function(event) {
// Only act on numpad dot key
if (event.keyCode !== 110) {
return this._super.apply(this, arguments);
Expand Down
14 changes: 10 additions & 4 deletions web_decimal_numpad_dot/views/web_decimal_numpad_dot.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<odoo>

<template id="assets_backend"
name="numpad_dot assets" inherit_id="web.assets_backend">
<template
id="assets_backend"
name="numpad_dot assets"
inherit_id="web.assets_backend"
>
<xpath expr="." position="inside">
<script type="text/javascript" src="/web_decimal_numpad_dot/static/src/js/numpad_dot.js"></script>
<script
type="text/javascript"
src="/web_decimal_numpad_dot/static/src/js/numpad_dot.js"
/>
</xpath>
</template>

Expand Down
75 changes: 37 additions & 38 deletions web_dialog_size/static/src/js/web_dialog_size.js
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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) {
Expand All @@ -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();
},

});

});
4 changes: 2 additions & 2 deletions web_dialog_size/static/src/scss/web_dialog_size.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

.modal {
.dialog_full_screen {
@include media-breakpoint-up(sm) {
Expand All @@ -15,7 +14,8 @@
}
}

&.dialog_button_extend, .dialog_button_restore {
&.dialog_button_extend,
.dialog_button_restore {
@include media-breakpoint-down(sm) {
display: none !important;
}
Expand Down
10 changes: 7 additions & 3 deletions web_dialog_size/static/src/xml/web_dialog_size.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<templates id="template" xml:space="preserve">
<t t-extend="Dialog">
<t t-jquery="button.close" t-operation="inner">
<i class="fa fa-close" />
</t>
<t t-jquery="button.close" t-operation="before">
<button type="button" class="dialog_button_extend close"><i class="fa fa-expand" /></button>
<button type="button" class="dialog_button_restore close"><i class="fa fa-compress" /></button>
<button type="button" class="dialog_button_extend close"><i
class="fa fa-expand"
/></button>
<button type="button" class="dialog_button_restore close"><i
class="fa fa-compress"
/></button>
</t>
</t>
</templates>
18 changes: 14 additions & 4 deletions web_dialog_size/templates/assets.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<template id="assets_backend" name="web_dialog_size assets" inherit_id="web.assets_backend">
<template
id="assets_backend"
name="web_dialog_size assets"
inherit_id="web.assets_backend"
>
<xpath expr="." position="inside">
<link rel="stylesheet" href="/web_dialog_size/static/src/scss/web_dialog_size.scss"/>
<script type="text/javascript" src="/web_dialog_size/static/src/js/web_dialog_size.js"></script>
<link
rel="stylesheet"
href="/web_dialog_size/static/src/scss/web_dialog_size.scss"
/>
<script
type="text/javascript"
src="/web_dialog_size/static/src/js/web_dialog_size.js"
/>
</xpath>
</template>
</odoo>
File renamed without changes.
13 changes: 10 additions & 3 deletions web_domain_field/views/web_domain_field.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<template id="assets_backend" name="web_domain_field assets" inherit_id="web.assets_backend">
<template
id="assets_backend"
name="web_domain_field assets"
inherit_id="web.assets_backend"
>
<xpath expr="script[last()]" position="after">
<script type="text/javascript" src="/web_domain_field/static/src/js/pyeval.js" />
<script
type="text/javascript"
src="/web_domain_field/static/src/js/pyeval.js"
/>
</xpath>
</template>
</odoo>
2 changes: 1 addition & 1 deletion web_environment_ribbon/data/ribbon_data.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<!-- Copyright 2015 Francesco OpenCode Apruzzese <cescoap@gmail.com>
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
<odoo noupdate="1">
Expand Down
6 changes: 3 additions & 3 deletions web_environment_ribbon/static/src/css/ribbon.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Copyright 2017 Thomas Binsfeld <thomas.binsfeld@acsone.eu>
* License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */

.test-ribbon{
.test-ribbon {
width: 300px;
top: 25px;
left: -100px;
Expand All @@ -18,8 +18,8 @@
transform: rotate(-45deg);
z-index: 9999;
position: fixed;
box-shadow: 0 0 3px rgba(0,0,0,.3);
background: rgba(255,0,0,.6);
box-shadow: 0 0 3px rgba(0, 0, 0, 0.3);
background: rgba(255, 0, 0, 0.6);
pointer-events: none;
}

Expand Down
50 changes: 25 additions & 25 deletions web_environment_ribbon/static/src/js/ribbon.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
Copyright 2017 Xavier Jiménez <xavier.jimenez@qubiq.es>
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */

odoo.define('web_environment_ribbon.ribbon', function (require) {
odoo.define("web_environment_ribbon.ribbon", function(require) {
"use strict";

var rpc = require('web.rpc');
var core = require('web.core');
var rpc = require("web.rpc");
var core = require("web.core");

// Code from: http://jsfiddle.net/WK_of_Angmar/xgA5C/
function validStrColour (strToTest) {
function validStrColour(strToTest) {
if (strToTest === "") {
return false;
}
Expand All @@ -33,31 +33,31 @@ odoo.define('web_environment_ribbon.ribbon', function (require) {
return image.style.color !== "rgb(255, 255, 255)";
}

core.bus.on('web_client_ready', null, function () {
core.bus.on("web_client_ready", null, function() {
var ribbon = $('<div class="test-ribbon hidden"/>');
$('body').append(ribbon);
$("body").append(ribbon);
ribbon.hide();
// Get ribbon data from backend
rpc.query({
model: 'web.environment.ribbon.backend',
method: 'get_environment_ribbon',
}).then(
function (ribbon_data) {
// Ribbon name
if (ribbon_data.name && ribbon_data.name !== 'False') {
ribbon.html(ribbon_data.name);
ribbon.show();
}
// Ribbon color
if (ribbon_data.color && validStrColour(ribbon_data.color)) {
ribbon.css('color', ribbon_data.color);
}
// Ribbon background color
if (ribbon_data.background_color &&
validStrColour(ribbon_data.background_color)) {
ribbon.css('background-color', ribbon_data.background_color);
}
model: "web.environment.ribbon.backend",
method: "get_environment_ribbon",
}).then(function(ribbon_data) {
// Ribbon name
if (ribbon_data.name && ribbon_data.name !== "False") {
ribbon.html(ribbon_data.name);
ribbon.show();
}
);
// Ribbon color
if (ribbon_data.color && validStrColour(ribbon_data.color)) {
ribbon.css("color", ribbon_data.color);
}
// Ribbon background color
if (
ribbon_data.background_color &&
validStrColour(ribbon_data.background_color)
) {
ribbon.css("background-color", ribbon_data.background_color);
}
});
});
});
17 changes: 10 additions & 7 deletions web_environment_ribbon/view/base_view.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<!-- Copyright 2015 Francesco OpenCode Apruzzese <cescoap@gmail.com>
Copyright 2016 Antonio Espinosa <antonio.espinosa@tecnativa.com>
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
<odoo>

<!-- Load css for ribbons -->
<template id="assets_backend" name="ribbon_test assets"
inherit_id="web.assets_backend">
<template id="assets_backend" name="ribbon_test assets" inherit_id="web.assets_backend">
<xpath expr="." position="inside">
<link rel="stylesheet"
href="/web_environment_ribbon/static/src/css/ribbon.css"/>
<script type="text/javascript"
src="/web_environment_ribbon/static/src/js/ribbon.js"/>
<link
rel="stylesheet"
href="/web_environment_ribbon/static/src/css/ribbon.css"
/>
<script
type="text/javascript"
src="/web_environment_ribbon/static/src/js/ribbon.js"
/>
</xpath>
</template>

Expand Down

0 comments on commit 981368d

Please sign in to comment.