From a9d1a6aae928d6839b5becce73e39d2d9658fde1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Delobelle?= Date: Fri, 24 Mar 2017 21:24:06 +0100 Subject: [PATCH 1/8] clean array iteration --- kfet/static/kfet/js/kfet.api.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kfet/static/kfet/js/kfet.api.js b/kfet/static/kfet/js/kfet.api.js index 7836fcb9..cc499c57 100644 --- a/kfet/static/kfet/js/kfet.api.js +++ b/kfet/static/kfet/js/kfet.api.js @@ -525,15 +525,15 @@ class Formatter { var prefix_prop = options.prefix_prop !== undefined ? options.prefix_prop : '.'; var prefix_attr = options.prefix_attr !== undefined ? options.prefix_attr : ''; - for (var i in props) { - var selector = prefix_prop + props[i]; - var html = options.empty_props ? '' : this.get_prop(object, props[i]); + for (let prop of props) { + var selector = prefix_prop + prop; + var html = options.empty_props ? '' : this.get_prop(object, prop); $container.find( selector ).html( html ); } - for (var i in attrs) { - var name = prefix_attr + attrs[i]; - var value = options.empty_attrs ? '' : this.get_attr(object, attrs[i]); + for (let attr of attrs) { + var name = prefix_attr + attr; + var value = options.empty_attrs ? '' : this.get_attr(object, attr); $container.attr( name, value ); } From abce961d9184e490d8b27b4a05af8aaedee2f586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Delobelle?= Date: Fri, 24 Mar 2017 21:28:33 +0100 Subject: [PATCH 2/8] use django-js-reverse --- kfet/static/kfet/js/kpsul.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kfet/static/kfet/js/kpsul.js b/kfet/static/kfet/js/kpsul.js index 9dd6ae19..7541e52e 100644 --- a/kfet/static/kfet/js/kpsul.js +++ b/kfet/static/kfet/js/kpsul.js @@ -50,7 +50,7 @@ class AccountManager { if (this.is_empty()) { var trigramme = this.selection.get(); if (trigramme.isValidTri()) { - var url_base = "{% url 'kfet.account.create' %}"; + var url_base = Urls['kfet.account.create'](); var url = url_base + '?trigramme=' + encodeURIComponent(trigramme); buttons += ''; } else { /* trigramme input is empty or invalid */ @@ -187,7 +187,7 @@ class AccountSearch { var that = this; this._$input.yourlabsAutocomplete({ - url: '{% url "kfet.account.search.autocomplete" %}', + url: Urls['kfet.account.search.autocomplete'], minimumCharacters: 2, id: 'search_autocomplete', choiceSelector: '.choice', From 2e3bd5bd7a077868f1be749a369429a6708fbdc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Delobelle?= Date: Fri, 24 Mar 2017 21:41:34 +0100 Subject: [PATCH 3/8] fix search box --- kfet/static/kfet/js/kpsul.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kfet/static/kfet/js/kpsul.js b/kfet/static/kfet/js/kpsul.js index 7541e52e..65b9006c 100644 --- a/kfet/static/kfet/js/kpsul.js +++ b/kfet/static/kfet/js/kpsul.js @@ -187,13 +187,14 @@ class AccountSearch { var that = this; this._$input.yourlabsAutocomplete({ - url: Urls['kfet.account.search.autocomplete'], + url: Urls['kfet.account.search.autocomplete'](), minimumCharacters: 2, id: 'search_autocomplete', choiceSelector: '.choice', placeholder: "Chercher un utilisateur K-Fêt", container: that._$results_container, box: that._$results_container, + fixPosition: function() {}, }); return this; From 0d02d47d33d1b17d7895503bb90e3c64540433ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Delobelle?= Date: Fri, 24 Mar 2017 22:05:04 +0100 Subject: [PATCH 4/8] move utils functions --- kfet/static/kfet/js/kfet.js | 15 +++++++++++++++ kfet/templates/kfet/kpsul.html | 15 --------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/kfet/static/kfet/js/kfet.js b/kfet/static/kfet/js/kfet.js index 455d2d95..0fb5c0e1 100644 --- a/kfet/static/kfet/js/kfet.js +++ b/kfet/static/kfet/js/kfet.js @@ -25,6 +25,21 @@ String.prototype.isValidTri = function() { } +function intCheck(v) { + return Number.parseInt(v); +} + +function floatCheck(v) { + if (typeof v === 'number') + return v; + return Number.parseFloat(v); +} + +function booleanCheck(v) { + return v == true; +} + + $(document).ready(function() { $(window).scroll(function() { if ($(window).width() >= 768 && $(this).scrollTop() > 72.6) { diff --git a/kfet/templates/kfet/kpsul.html b/kfet/templates/kfet/kpsul.html index 7fc56605..15f83076 100644 --- a/kfet/templates/kfet/kpsul.html +++ b/kfet/templates/kfet/kpsul.html @@ -175,21 +175,6 @@ + {% endblock %} {% block title %}Nouveaux transferts{% endblock %} @@ -51,14 +52,12 @@