branch develop updated (0dae0857 -> f0438cb4)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 0dae0857 fixes #112 submit avant de faire précédent pour garder les modifs en mémoire new 233a6ed2 ajout de paramètres manquants new e106f6fd fixes #125 soumission multiple de commentaire new f0438cb4 fixes #124 soumission multiple de choix The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit f0438cb43bab89b1a6040982b945c1afe237bed7 Author: Kevin Morin <morin@codelutin.com> Date: Fri Aug 4 12:06:13 2017 +0200 fixes #124 soumission multiple de choix commit e106f6fd655759da1a55fd615147e826e432d27e Author: Kevin Morin <morin@codelutin.com> Date: Fri Aug 4 11:59:52 2017 +0200 fixes #125 soumission multiple de commentaire commit 233a6ed298b34214570e2dee00b6adbebe15fd18 Author: Kevin Morin <morin@codelutin.com> Date: Fri Aug 4 11:59:32 2017 +0200 ajout de paramètres manquants Summary of changes: pollen-ui-riot-js/src/main/web/tag/poll/Comments.tag.html | 11 ++++++++++- pollen-ui-riot-js/src/main/web/tag/poll/Results.tag.html | 2 +- pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html | 10 +++++++++- 3 files changed, 20 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 233a6ed298b34214570e2dee00b6adbebe15fd18 Author: Kevin Morin <morin@codelutin.com> Date: Fri Aug 4 11:59:32 2017 +0200 ajout de paramètres manquants --- pollen-ui-riot-js/src/main/web/tag/poll/Results.tag.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Results.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Results.tag.html index 1410c03e..1912f7e3 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Results.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Results.tag.html @@ -51,7 +51,7 @@ require("../voteCountingType/CoombsDetailResult.tag.html"); this.listen("poll", this.onPollChange); - this.listen("user", () => { + this.listen("user", (user, oldUser) => { if (user != oldUser) { this.poll.loadResults(); this.update(); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit e106f6fd655759da1a55fd615147e826e432d27e Author: Kevin Morin <morin@codelutin.com> Date: Fri Aug 4 11:59:52 2017 +0200 fixes #125 soumission multiple de commentaire --- pollen-ui-riot-js/src/main/web/tag/poll/Comments.tag.html | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Comments.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Comments.tag.html index dbe2bb68..49032792 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Comments.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Comments.tag.html @@ -51,7 +51,8 @@ require("./Report.tag.html"); </div> <div class="actions-right"> <button type="submit" - class="c-button c-button--info pull-right"> + class="c-button c-button--info pull-right" + disabled="{sendingComment}"> <i class="fa fa-paper-plane"/> {__.sendComment} </button> @@ -189,6 +190,7 @@ require("./Report.tag.html"); let session = require("../../js/Session"); this.installBundle(session, "poll_comments"); let moment = require("moment"); + this.sendingComment = false; this.poll = require("../../js/Poll.js"); @@ -226,9 +228,16 @@ require("./Report.tag.html"); this.addComment = (e) => { e.preventDefault(); e.stopPropagation(); + this.sendingComment = true; + this.update(); this.poll.addComment(this.refs.author.value, this.refs.text.value) .then(() => { this.refs.text.value = ""; + this.sendingComment = false; + this.update(); + }, (error) => { + this.sendingComment = false; + this.update(); }); }; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit f0438cb43bab89b1a6040982b945c1afe237bed7 Author: Kevin Morin <morin@codelutin.com> Date: Fri Aug 4 12:06:13 2017 +0200 fixes #124 soumission multiple de choix --- pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html index 4ab1a92c..9fe80519 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html @@ -166,7 +166,8 @@ require("../components/HumanInput.tag.html"); </div> <button type="submit" class="c-button c-button--success" - tooltips="{__.addChoice}"> + tooltips="{__.addChoice}" + disabled="{addingChoice}"> <i class="fa fa-plus"></i> </button> </div> @@ -188,6 +189,7 @@ require("../components/HumanInput.tag.html"); choice: null, vote: null }; + this.addingChoice = false; this.poll = require("../../js/Poll.js"); this.poll.loadVotes().then(() => { @@ -370,11 +372,17 @@ require("../components/HumanInput.tag.html"); this.addChoice = (e) => { e.preventDefault(); e.stopPropagation(); + + this.addingChoice = true; + this.update(); + this.refs.choice.submit(); this.poll.addChoice(this.choiceToAdd).then(() => { + this.addingChoice = false; this.choiceToAdd = this.poll.initChoice(this.choiceToAdd); this.update(); }, errors => { + this.addingChoice = false; this.bus.trigger("message", errors); this.update(); }); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm