use history.pushState and onpopstate in the opening trainer

yovae · Jan 9, 2015 · c69300b · c69300b
1 parent 7144956
commit c69300b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/ui/opening/src/ctrl.js b/ui/opening/src/ctrl.js
@@ -11,7 +11,7 @@ module.exports = function(cfg, router, i18n) {
 
   var chess, init;
 
-  var initialize = function() {
+  initialize = function() {
     chess = new Chess(this.data.opening.fen);
     init = {
       dests: chess.dests(),
@@ -54,6 +54,16 @@ module.exports = function(cfg, router, i18n) {
     }
   }.bind(this);
 
+  this.pushState = function(cfg) {
+    if (window.history.pushState)
+      window.history.pushState(cfg, null, '/training/opening/' + cfg.opening.id);
+  }.bind(this);
+
+  window.onpopstate = function(cfg) {
+    if (cfg.state) this.reload(cfg.state);
+    m.redraw();
+  }.bind(this);
+
   var onMove = function(orig, dest, meta) {
     $.sound.move();
     submitMove(orig + dest);

diff --git a/ui/opening/src/main.js b/ui/opening/src/main.js
@@ -8,6 +8,7 @@ module.exports = function(element, config, router, i18n) {
     controller: function () { return controller; },
     view: view
   });
+  controller.pushState(config);
 };
 
 // lol, that's for the rest of lichess to access mithril

diff --git a/ui/opening/src/xhr.js b/ui/opening/src/xhr.js
@@ -32,6 +32,9 @@ module.exports = {
       method: 'GET',
       url: uncache('/training/opening'),
       config: xhrConfig
-    }).then(ctrl.reload);
+    }).then(function(cfg) {
+      ctrl.reload(cfg);
+      ctrl.pushState(cfg);
+    });
   }
 };
diff --git a/ui/puzzle/src/ctrl.js b/ui/puzzle/src/ctrl.js
@@ -119,7 +119,7 @@ module.exports = function(cfg, router, i18n) {
 
   window.onpopstate = function(cfg) {
     if (cfg.state) this.reload(cfg.state);
-    return true;
+    m.redraw();
   }.bind(this);
 
   this.playOpponentMove = function(move) {