edits, refactoring

ShMcK · ShMcK · commit 163c3ff2322a · 2016-05-03T21:01:43.000-07:00
diff --git a/keymaps/cr.json b/keymaps/cr.json
@@ -1,6 +1,5 @@
 {
   "atom-workspace": {
-    "ctrl-alt-0": "cr-viewer:toggle",
-    "ctrl-alt-9": "cr-viewer:runTests"
+    "ctrl-alt-0": "cr-viewer:toggle"
   }
 }
diff --git a/lib/atom/subscriptions.js b/lib/atom/subscriptions.js
@@ -14,18 +14,10 @@ function onActivate() {
             store_1.default.dispatch(actions_1.testRun());
         }));
     });
-    subscriptions.add(atom.commands.add('atom-workspace', {
-        'cr-viewer:testRun': function () {
-            if (store_1.default.getState().route === 'page') {
-                store_1.default.dispatch(actions_1.testRun());
-            }
-        },
-    }));
     return subscriptions;
 }
 exports.onActivate = onActivate;
 function onDeactivate() {
-    window.onresize = null;
     root_1.default.unmount();
     subscriptions.dispose();
 }
diff --git a/lib/components/common/Markdown.js b/lib/components/common/Markdown.js
diff --git a/lib/components/index.js b/lib/components/index.js
@@ -5,8 +5,6 @@ var AppMenu_1 = require('./AppMenu');
 exports.AppMenu = AppMenu_1.default;
 var FinalPage_1 = require('./FinalPage');
 exports.FinalPage = FinalPage_1.default;
-var Markdown_1 = require('./Markdown');
-exports.Markdown = Markdown_1.default;
 var Page_1 = require('./Page');
 exports.Page = Page_1.default;
 var Progress_1 = require('./Progress');
@@ -17,6 +15,8 @@ var Start_1 = require('./Start');
 exports.Start = Start_1.default;
 var Tutorials_1 = require('./Tutorials');
 exports.Tutorials = Tutorials_1.default;
+var Markdown_1 = require('./common/Markdown');
+exports.Markdown = Markdown_1.default;
 var RouteButton_1 = require('./common/RouteButton');
 exports.RouteButton = RouteButton_1.default;
 var ContentCard_1 = require('./common/ContentCard');
diff --git a/lib/reducers/task-actions/index.js b/lib/reducers/task-actions/index.js
@@ -3,12 +3,9 @@ var _types_1 = require('../../actions/_types');
 var editor_reducer_1 = require('./editor-reducer');
 var store_1 = require('../../store');
 function handleTaskActions(actions) {
-    console.log('actions', actions);
     var next = actions.shift();
-    console.log('next', next);
     if (next && next.length) {
         next.reduce(function (total, curr) {
-            console.log('total, curr', total, curr);
             return total.then(function () { return editor_reducer_1.default(curr); });
         }, Promise.resolve());
     }
@@ -35,7 +32,6 @@ function taskActionsReducer(taskActions, action) {
             return actions;
         case _types_1.TEST_RESULT:
             actions = action.payload.actions || [];
-            console.log('TEST_RESULT actions', actions);
             var nextTaskPosition = action.payload.result.taskPosition;
             var times = nextTaskPosition - taskTracker;
             if (times > 0) {
diff --git a/lib/store/index.js b/lib/store/index.js
@@ -2,7 +2,7 @@
 var redux_1 = require('redux');
 var reducers_1 = require('../reducers');
 var createLogger = require('redux-logger');
-var devMode = true;
+var devMode = false;
 var store = null;
 if (devMode) {
     var logger = createLogger();
diff --git a/src/atom/subscriptions.ts b/src/atom/subscriptions.ts
@@ -22,19 +22,6 @@ export function onActivate(): AtomCore.Disposable {
         store.dispatch(testRun());
       }));
   });
-  /**
-   * Key subscriptions
-   */
-  subscriptions.add(
-    // run tests on hot key. See keymaps
-    atom.commands.add('atom-workspace', {
-      'cr-viewer:testRun': () => {
-        if (store.getState().route === 'page') {
-          store.dispatch(testRun());
-        }
-      },
-    })
-  );
   return subscriptions;
 }
 
diff --git a/src/components/common/Markdown.tsx b/src/components/common/Markdown.tsx
diff --git a/src/components/index.ts b/src/components/index.ts
@@ -1,11 +1,11 @@
 export {default as Alert} from './Alert';
 export {default as AppMenu} from './AppMenu';
 export {default as FinalPage} from './FinalPage';
-export {default as Markdown} from './Markdown';
 export {default as Page} from './Page';
 export {default as Progress} from './Progress';
 export {default as Routes} from './Routes';
 export {default as Start} from './Start';
 export {default as Tutorials} from './Tutorials';
+export {default as Markdown} from './common/Markdown';
 export {default as RouteButton} from './common/RouteButton';
 export {default as ContentCard} from './common/ContentCard';
diff --git a/src/typings/cr/cr.d.ts b/src/typings/cr/cr.d.ts
@@ -34,7 +34,7 @@ declare namespace CR {
     taskActions: string[];
     alert: Alert;
     tutorial: Tutorial;
-    tutorials: Tutorial.Info[];
+    tutorialList: Tutorial.Info[];
     testRun: boolean;
     checks: Checks;
   }
diff --git a/tsconfig.json b/tsconfig.json
@@ -126,9 +126,9 @@
         "src/components/AppMenu/menuRightRouteOptions.tsx",
         "src/components/AppMenu/Quit/index.tsx",
         "src/components/common/ContentCard.tsx",
+        "src/components/common/Markdown.tsx",
         "src/components/common/RouteButton.tsx",
         "src/components/FinalPage/index.tsx",
-        "src/components/Markdown/index.tsx",
         "src/components/Page/EditPage/index.tsx",
         "src/components/Page/Hints/HintButton.tsx",
         "src/components/Page/Hints/index.tsx",
diff --git a/tsd.json b/tsd.json
@@ -31,12 +31,6 @@
     },
     "react-redux/react-redux.d.ts": {
       "commit": "efd40e67ff323f7147651bdbef03c03ead7b1675"
-    },
-    "classnames/classnames.d.ts": {
-      "commit": "e5a27ea95e47b95333784f1f0d590127b4e39a89"
-    },
-    "react/react-addons-css-transition-group.d.ts": {
-      "commit": "5d0f2126c8dac8fce0ff020218aea06607213b0d"
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"atom-workspace": {`
`3`		`- "ctrl-alt-0": "cr-viewer:toggle",`
`4`		`- "ctrl-alt-9": "cr-viewer:runTests"`
	`3`	`+ "ctrl-alt-0": "cr-viewer:toggle"`
`5`	`4`	`}`
`6`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ declare namespace CR {`
`34`	`34`	`taskActions: string[];`
`35`	`35`	`alert: Alert;`
`36`	`36`	`tutorial: Tutorial;`
`37`		`- tutorials: Tutorial.Info[];`
	`37`	`+ tutorialList: Tutorial.Info[];`
`38`	`38`	`testRun: boolean;`
`39`	`39`	`checks: Checks;`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,12 +31,6 @@`
`31`	`31`	`},`
`32`	`32`	`"react-redux/react-redux.d.ts": {`
`33`	`33`	`"commit": "efd40e67ff323f7147651bdbef03c03ead7b1675"`
`34`		`- },`
`35`		`- "classnames/classnames.d.ts": {`
`36`		`- "commit": "e5a27ea95e47b95333784f1f0d590127b4e39a89"`
`37`		`- },`
`38`		`- "react/react-addons-css-transition-group.d.ts": {`
`39`		`- "commit": "5d0f2126c8dac8fce0ff020218aea06607213b0d"`
`40`	`34`	`}`
`41`	`35`	`}`
`42`	`36`	`}`