remove globals, use redux state

Author: ShMcK

lib/actions/page.js

@@ -1,13 +1,17 @@
 "use strict";
 var _types_1 = require('./_types');
 var store_1 = require('../store');
+var _position = {
+    chapter: 0,
+    page: 0,
+};
 function pageNext() {
     var position = store_1.store.getState().position;
     return { type: _types_1.PAGE_NEXT, payload: { position: position } };
 }
 exports.pageNext = pageNext;
 function pageSet(position) {
-    if (position === void 0) { position = { chapter: 0, page: 0 }; }
+    if (position === void 0) { position = _position; }
     if (position.completed) {
         return {
             payload: { route: 'final' },

lib/atom/main.js

@@ -5,24 +5,9 @@ var polyfills_1 = require('../services/polyfills');
 var subscriptions_1 = require('./subscriptions');
 var store_1 = require('../store');
 var actions_1 = require('../actions');
-function setDir() {
-    if (atom.project.rootDirectories.length > 0) {
-        return atom.project.rootDirectories[0].path;
-    }
-    else {
-        return null;
-    }
-}
-function setWin() {
-    return navigator.appVersion.indexOf('Win') > -1;
-}
 var Main = (function () {
     function Main() {
         polyfills_1.default();
-        window.coderoad = {
-            dir: setDir(),
-            win: setWin(),
-        };
         store_1.store.dispatch(actions_1.setupVerify());
         this.root = mount_1.initRoot();
     }

lib/reducers/checks/action-setup.js

@@ -6,7 +6,8 @@ var store_1 = require('../../store');
 var actions_2 = require('../../actions');
 var packageData = "{\n  \"name\": \"demo\",\n  \"dependencies\": {\n    \"coderoad-functional-school\": \"^0.2.1\"\n  }\n}";
 function createPackageJson() {
-    var packagePath = path_1.join(window.coderoad.dir, 'package.json');
+    var dir = store_1.store.getState().dir;
+    var packagePath = path_1.join(dir, 'package.json');
     return new Promise(function (resolve, reject) {
         editor_1.open(packagePath);
         setTimeout(function () {

lib/reducers/checks/verify.js

@@ -7,7 +7,7 @@ function allTrue(obj) {
     return Object.values(obj).every(function (x) { return x === true; });
 }
 function setupVerify() {
-    var dir = !!window.coderoad.dir;
+    var dir = !!store_1.store.getState().dir;
     var packageJson = false;
     var tutorial = false;
     var pj = store_1.store.getState().packageJson;

lib/reducers/dir/index.js

@@ -0,0 +1,12 @@
+"use strict";
+function dirReducer(dir) {
+    if (dir === void 0) { dir = null; }
+    if (atom.project.rootDirectories.length > 0) {
+        return atom.project.rootDirectories[0].path;
+    }
+    else {
+        return null;
+    }
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = dirReducer;

lib/reducers/editor-actions/index.js

@@ -14,6 +14,7 @@ function editorActionsReducer(editorActions, action) {
     switch (action.type) {
         case _types_1.TESTS_LOAD:
             actions = store_1.store.getState().tasks.map(function (task) { return task.actions || []; });
+            console.log('LOAD', actions);
             currentTaskPosition = 0;
             handleEditorActions(actions.shift());
             return actions;

lib/reducers/index.js

@@ -2,6 +2,7 @@
 var redux_1 = require('redux');
 var alert_1 = require('./alert');
 var checks_1 = require('./checks');
+var dir_1 = require('./dir');
 var editor_actions_1 = require('./editor-actions');
 var hint_position_1 = require('./hint-position');
 var package_json_1 = require('./package-json');
@@ -17,7 +18,7 @@ var tutorial_1 = require('./tutorial');
 var tutorials_1 = require('./tutorials');
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = redux_1.combineReducers({
-    alert: alert_1.default, checks: checks_1.default, editorActions: editor_actions_1.default, hintPosition: hint_position_1.default, page: page_1.default,
+    alert: alert_1.default, checks: checks_1.default, dir: dir_1.default, editorActions: editor_actions_1.default, hintPosition: hint_position_1.default, page: page_1.default,
     packageJson: package_json_1.default, position: position_1.default, progress: progress_1.default, route: route_1.default, taskPosition: task_position_1.default,
-    taskTests: task_tests_1.default, tasks: tasks_1.default, testRun: test_run_1.default, tutorial: tutorial_1.default, tutorials: tutorials_1.default
+    taskTests: task_tests_1.default, tasks: tasks_1.default, testRun: test_run_1.default, tutorial: tutorial_1.default, tutorials: tutorials_1.default,
 });

lib/reducers/package-json/index.js

@@ -3,11 +3,13 @@ var _types_1 = require('../../actions/_types');
 var path_1 = require('path');
 var fs_1 = require('fs');
 var exists_1 = require('../../services/exists');
+var store_1 = require('../../store');
 function packageJsonReducer(pj, action) {
     if (pj === void 0) { pj = null; }
     switch (action.type) {
         case _types_1.PACKAGE_SET:
-            var pathToPackageJson = path_1.join(window.coderoad.dir, 'package.json');
+            var dir = store_1.store.getState().dir;
+            var pathToPackageJson = path_1.join(dir, 'package.json');
             if (exists_1.fileExists(pathToPackageJson)) {
                 return JSON.parse(fs_1.readFileSync(pathToPackageJson, 'utf8'));
             }

lib/reducers/tasks/config-task-tests.js

@@ -1,16 +1,18 @@
 "use strict";
 var path_1 = require('path');
 var store_1 = require('../../store');
+var system_1 = require('../../services/system');
 function configTestString(config, name, testPath) {
-    if (window.coderoad.win) {
+    if (system_1.isWindows) {
         testPath = testPath.split('/').join('\\');
     }
     var tutorial = store_1.store.getState().tutorial;
     if (tutorial && tutorial.config.dir) {
         testPath = path_1.join(tutorial.config.dir, testPath);
     }
     else {
-        testPath = path_1.join(window.coderoad.dir, 'node_modules', name, testPath);
+        var dir = store_1.store.getState().dir;
+        testPath = path_1.join(dir, 'node_modules', name, testPath);
     }
     if (tutorial.config.testSuffix) {
         testPath += tutorial.config.testSuffix;

lib/reducers/test-run/parse-loaders.js

@@ -32,7 +32,8 @@ function parseLoaders(data, fileType) {
                 pathToFile = path_1.normalize(path_1.join(tutorialDir, fileToLoad));
             }
             else {
-                pathToFile = path_1.normalize(path_1.join(window.coderoad.dir, fileToLoad));
+                var dir = store_1.store.getState().dir;
+                pathToFile = path_1.normalize(path_1.join(dir, fileToLoad));
             }
             try {
                 lines[i] = fs_1.readFileSync(pathToFile, 'utf8');