This is an automated email from the git hooks/post-receive script. New commit to branch feature/253-tuiles in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 4248cad2cb466c073e38f256ab3008c87341bccf Author: Cécilia Bossard <bossard@codelutin.com> Date: Thu Feb 27 17:38:37 2020 +0100 ref #253 Code style --- pollen-ui-riot-js/src/main/web/js/PollService.js | 6 +++--- .../src/main/web/tag/components/IconButton.tag.html | 2 +- .../src/main/web/tag/components/MenuItem.tag.html | 6 +++--- .../src/main/web/tag/components/PollenButton.tag.html | 6 +++--- .../src/main/web/tag/components/Separator.tag.html | 5 ++--- pollen-ui-riot-js/src/main/web/tag/poll/MyPollsHeader.tag.html | 4 ++-- .../src/main/web/tag/poll/PollCardReboot.tag.html | 10 +++++----- pollen-ui-riot-js/src/main/web/tag/poll/Polls.tag.html | 8 ++++---- 8 files changed, 23 insertions(+), 24 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/js/PollService.js b/pollen-ui-riot-js/src/main/web/js/PollService.js index 7582723d..358db130 100644 --- a/pollen-ui-riot-js/src/main/web/js/PollService.js +++ b/pollen-ui-riot-js/src/main/web/js/PollService.js @@ -100,15 +100,15 @@ class PollService extends FetchService { } currentPolls(pagination, search) { - return this._getPolls(pagination, "current", search); + return this._getPolls(pagination, "current", search); } upcommingPolls(pagination, search) { - return this._getPolls(pagination, "upcomming", search); + return this._getPolls(pagination, "upcomming", search); } allPolls(pagination, search) { - return this._getPolls(pagination, "all", search); + return this._getPolls(pagination, "all", search); } polls(pagination, search) { diff --git a/pollen-ui-riot-js/src/main/web/tag/components/IconButton.tag.html b/pollen-ui-riot-js/src/main/web/tag/components/IconButton.tag.html index 47106cba..c2d58ed0 100644 --- a/pollen-ui-riot-js/src/main/web/tag/components/IconButton.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/components/IconButton.tag.html @@ -33,7 +33,7 @@ this.activeClassName = ""; this.visibleSelector = "hidden"; - if(this.opts.active) { + if (this.opts.active) { this.activeClassName = "active"; this.visibleSelector = "visible"; } diff --git a/pollen-ui-riot-js/src/main/web/tag/components/MenuItem.tag.html b/pollen-ui-riot-js/src/main/web/tag/components/MenuItem.tag.html index 1c78dfbb..8579b761 100644 --- a/pollen-ui-riot-js/src/main/web/tag/components/MenuItem.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/components/MenuItem.tag.html @@ -36,19 +36,19 @@ var method = this.opts.method; var ref = this.opts.ref; - if(method === ref) { + if (method === ref) { this.activeClassName = "active"; this.visibleSelector = "visible"; } this.mainClassName = "visible"; - if(this.opts.mainclassname) { + if (this.opts.mainclassname) { this.mainClassName = this.opts.mainclassname; } this.display = (mustBeVisible) => { this.mainClassName = mustBeVisible ? "visible" : "hidden"; - } + }; </script> diff --git a/pollen-ui-riot-js/src/main/web/tag/components/PollenButton.tag.html b/pollen-ui-riot-js/src/main/web/tag/components/PollenButton.tag.html index cbf8a34c..183f36ab 100644 --- a/pollen-ui-riot-js/src/main/web/tag/components/PollenButton.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/components/PollenButton.tag.html @@ -30,13 +30,13 @@ this.className = ""; - if(this.opts.primary) { + if (this.opts.primary) { this.className = "primary"; } - if(this.opts.secondary) { + if (this.opts.secondary) { this.className = "secondary"; } - if(this.opts.cancel) { + if (this.opts.cancel) { this.className = "cancel"; } diff --git a/pollen-ui-riot-js/src/main/web/tag/components/Separator.tag.html b/pollen-ui-riot-js/src/main/web/tag/components/Separator.tag.html index df6bb85b..69455219 100644 --- a/pollen-ui-riot-js/src/main/web/tag/components/Separator.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/components/Separator.tag.html @@ -26,15 +26,14 @@ <script type="es6"> - this.visibility = "visible"; - if(this.opts.isvisible) { + if (this.opts.isvisible) { this.visibility = this.opts.isvisible; } this.display = (mustBeVisible) => { this.visibility = mustBeVisible ? "visible" : "hidden"; - } + }; </script> diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/MyPollsHeader.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/MyPollsHeader.tag.html index 4c95e77c..8998cc02 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/MyPollsHeader.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/MyPollsHeader.tag.html @@ -113,7 +113,7 @@ import "../popup/ModalReboot.tag.html"; var isBoxChecked = false; - if(checkedValues.length > 0) { + if (checkedValues.length > 0) { isBoxChecked = true; } @@ -122,7 +122,7 @@ import "../popup/ModalReboot.tag.html"; this.refs.rightSubMenuSeparator.display(isBoxChecked); this.update(); - } + }; </script> diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/PollCardReboot.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/PollCardReboot.tag.html index 201bf9d9..c415f12c 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/PollCardReboot.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/PollCardReboot.tag.html @@ -100,10 +100,10 @@ import "../components/Avatar.tag.html"; // si le sondage est non terminé, on redirige vers la liste des votes // si le sondage est terminé, on redirige vers les résultats - if(this.ended) { - this.redirectToPoll = "#poll/"+this.opts.poll.id+"/result/"+this.opts.poll.permission; + if (this.ended) { + this.redirectToPoll = "#poll/" + this.opts.poll.id + "/result/" + this.opts.poll.permission; } else { - this.redirectToPoll = "#poll/"+this.opts.poll.id+"/vote/"+this.opts.poll.permission; + this.redirectToPoll = "#poll/" + this.opts.poll.id + "/vote/" + this.opts.poll.permission; } this.deletePoll = (e) => { @@ -119,10 +119,10 @@ import "../components/Avatar.tag.html"; }; this.ontogglecheckbox = (checkbox) => { - if(this.opts.ontogglecheckbox) { + if (this.opts.ontogglecheckbox) { this.opts.ontogglecheckbox(checkbox); } - } + }; </script> diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Polls.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Polls.tag.html index 0fc194ef..555647e2 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Polls.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Polls.tag.html @@ -110,17 +110,17 @@ import "./NoPoll.tag.html"; }; this.ontogglecheckbox = (checkbox) => { - if(checkbox.checked) { + if (checkbox.checked) { this.boxChecked.push(checkbox.parent); - } else { + } else { var filtered = this.boxChecked.filter(function(value) { - return value.opts.poll.id != checkbox.parent.opts.poll.id; + return value.opts.poll.id !== checkbox.parent.opts.poll.id; }); this.boxChecked = filtered; } this.refs.pollsHeader.boxChecked(this.boxChecked); - } + }; </script> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.