branch develop updated (98a2d75 -> 4860258)
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 98a2d75 correction taille du QrCode new 4860258 correction gestion de erreur en cas de sondage non accessible The 1 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 486025817a0e9f99dd992588e194fb031890d74e Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed May 24 11:10:14 2017 +0200 correction gestion de erreur en cas de sondage non accessible Summary of changes: pollen-ui-riot-js/src/main/web/js/Error.js | 6 +++--- pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html | 3 +++ 2 files changed, 6 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 486025817a0e9f99dd992588e194fb031890d74e Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed May 24 11:10:14 2017 +0200 correction gestion de erreur en cas de sondage non accessible --- pollen-ui-riot-js/src/main/web/js/Error.js | 6 +++--- pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/js/Error.js b/pollen-ui-riot-js/src/main/web/js/Error.js index 4ac129e..6adc197 100644 --- a/pollen-ui-riot-js/src/main/web/js/Error.js +++ b/pollen-ui-riot-js/src/main/web/js/Error.js @@ -18,9 +18,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -let values = require('object.values'); +let values = require("object.values"); if (!Object.values) { - values.shim(); + values.shim(); } class Error { @@ -29,7 +29,7 @@ class Error { if (e instanceof Error) { this.message = e.message; this.timeout = e.timeout; - } else if (e instanceof String) { + } else if (typeof e === "string" || e instanceof String) { this.message = e; } else { this.message = Object.values(e) diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html index 4bbcdb2..2199d01 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html @@ -179,6 +179,8 @@ require("../popup/QrCodeButton.tag.html"); <script type="es6"> this.session = require("../../js/Session"); + let Error = require("../../js/Error"); + let route = require("riot-route"); this.installBundle(this.session, "poll"); this.selectedTab = this.opts.tabName || "votes"; @@ -198,6 +200,7 @@ require("../popup/QrCodeButton.tag.html"); this.listen("poll", this.onPollChange); this.poll.init(this.opts.pollId, this.opts.voteId, this.opts.permission).catch((error) => { this.bus.trigger("error", new Error(this._l(error.status))); + route("/"); }); this.closePoll = (e) => { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm