more love

script/articles/saison_retardee.js

@@ -1,7 +1,7 @@
 define(['m', '_'], function (m, _ ) {
 return {
     "title": {
-        "innerMarkdown": "<h2 id=\"d-but-saison-2017-retard-e\">Début saison 2017 retardée</h2>\n"
+        "innerMarkdown": "<h2 id=\"début-saison-2017-retardée\">Début saison 2017 retardée</h2>\n"
     },
     "meta": {
         "innerMarkdown": "<p>Samedi 23 avril 2017</p>\n"

script/util.js

@@ -56,9 +56,32 @@ define(['m'], function(m) {
                );
     };
 
-    util.resultatsURL = function(){
-        var cacheBuster = 2;
-        return "api/resultats.json?_=" + cacheBuster;
+    util.resultatsURL = function(year){
+        var cacheBuster = window.Date.now();
+        year = !!year ? year: util.getDefaultYear();
+        return "api/resultats" + year + ".json?_=" + cacheBuster;
+    };
+
+
+    util.getAvailableYears = function(){
+        if(window.availableYears){
+            return _.clone(window.availableYears)
+        }
+        return [];
+    };
+
+    util.getDefaultYear = function(){
+        return _.max(util.getAvailableYears());
+    }
+
+
+    util.getResults = function(year){
+        var url = util.resultatsURL(year);
+        return m.request({method: "GET", url: url})
+    };
+
+    util.getDefaultResults = function(){
+        return util.getResults(util.getDefaultYear());
     };
 
     return util;

script/views/calendarPage.js

@@ -7,8 +7,7 @@ define(['m', '_', 'util', 'resultParser', 'teams', 'views/topNavBar', 'views/foo
 
     statsView.controller = function(year){
         var games = m.prop([]);
-        var url = "api/resultats" + year + ".json";
-        return m.request({method: "GET", url: url})
+        return util.getResults(year)
                .then(games)
                .then(resultParser.getStats);
     };
@@ -121,8 +120,7 @@ define(['m', '_', 'util', 'resultParser', 'teams', 'views/topNavBar', 'views/foo
 
     schedulView.controller = function(year){
         var games = m.prop([]);
-        var url = "api/resultats" + year + ".json"
-        return m.request({method: "GET", url: url})
+        return util.getResults(year)
                .then(games)
                .then(resultParser.getNightGames);
     };
@@ -179,8 +177,9 @@ define(['m', '_', 'util', 'resultParser', 'teams', 'views/topNavBar', 'views/foo
 
     calendarPage.view  = function(vnode){
         var isPlayoff = window.location.hash.endsWith('playoff');
-        var year = _.get(m.route.param(), 'year', '');
-        var availableYears = window.availableYears || [];
+        var availableYears = util.getAvailableYears();
+        var year = _.get(m.route.param(), 'year', util.getDefaultYear());
+        
         var main = isPlayoff ? m.component(playoffView) : m.component(schedulView, year, availableYears);
         return [m.component(topNavBar),
                 m('div.uk-grid.uk-margin-top.uk-margin-bottom',

script/views/mainPage.js

@@ -34,8 +34,7 @@ define(['m', '_', 'util', 'resultParser', 'views/topNavBar', 'views/footer', 'ar
 
     nextGameDaySchedule.controller = function(){
         var games = m.prop([]);
-        var toDay = new Date();
-        return m.request({method: "GET", url: util.resultatsURL()})
+        return util.getDefaultResults()
                .then(games)
                .then(resultParser.getNightGames)
                .then(function(nightGames){