Signal and mark progress

3 files changed, 28 insertions, 8 deletions

diff --git a/assets/javascript/app.js b/assets/javascript/app.js
index fdf4616..c6197df 100644
--- a/assets/javascript/app.js
+++ b/assets/javascript/app.js
@@ -1,10 +1,11 @@
 require([
     "jQuery",
-    "progress"
-], function($, progress){
+    "core/state",
+    "core/progress"
+], function($, _state, progress){
     $(document).ready(function() {
-        var $book = $(".book");
-        var githubId = $book.data("github");
+        var state = _state();
+        var $book = state.$book;
 
         // Toggle summary
         $book.find(".book-header .toggle-summary").click(function(e) {
@@ -13,7 +14,7 @@ require([
         });
 
         // Star and watch count
-        $.getJSON("https://api.github.com/repos/"+githubId)
+        $.getJSON("https://api.github.com/repos/"+state.githubId)
         .done(function(repo) {
             $book.find(".count-star span").text(repo.stargazers_count);
             $book.find(".count-watch span").text(repo.subscribers_count);
diff --git a/assets/javascript/progress.js b/assets/javascript/core/progress.js
index bf4b54d..bd657a1 100644
--- a/assets/javascript/progress.js
+++ b/assets/javascript/core/progress.js
@@ -1,11 +1,12 @@
 define([
     "lodash",
     "jQuery",
-    "utils/storage"
-], function(_, $, storage) {
+    "utils/storage",
+    "core/state"
+], function(_, $, storage, state) {
     // Get current level
     var getCurrentLevel = function() {
-        return $(".book").data("level");
+        return state().level;
     };
 
     // Return all levels
@@ -43,6 +44,10 @@ define([
 
     // Show progress
     var showProgress = function() {
+        // Mark current progress
+        markProgress(getCurrentLevel(), true);
+        
+        // Update progress
         var progress = getProgress();
         var $summary = $(".book-summary");
 
diff --git a/assets/javascript/core/state.js b/assets/javascript/core/state.js
new file mode 100644
index 0000000..fc67d7b
--- /dev/null
+++ b/assets/javascript/core/state.js
@@ -0,0 +1,14 @@
+define([
+    "jQuery"
+], function() {
+    return function() {
+        var $book = $(".book");
+
+        return {
+            '$book': $book,
+
+            'githubId': $book.data("github"),
+            'level': $book.data("level")
+        };
+    };
+});
\ No newline at end of file