create task object function

Author: ShMcK

Diff for: lib/components/Page/TaskActions/index.js

@@ -8,6 +8,7 @@ var React = require('react');
 var Stepper_1 = require('material-ui/Stepper');
 var index_1 = require('../../index');
 var AddButton_1 = require('../AddButton');
+var task_object_1 = require('./task-object');
 var TaskActions = (function (_super) {
     __extends(TaskActions, _super);
     function TaskActions(props) {
@@ -20,16 +21,7 @@ var TaskActions = (function (_super) {
         var _this = this;
         var actions = this.props.actions;
         var stepIndex = this.state.stepIndex;
-        var actionList = actions.map(function (a) {
-            var obj = {
-                action: a.substring(0, a.indexOf('(')),
-                content: a.substring(a.indexOf('(') + 2, a.length - 2)
-            };
-            if (obj.action === 'open') {
-                obj.singleLine = true;
-            }
-            return obj;
-        });
+        var actionList = actions.map(function (a) { return task_object_1.default(a); });
         return (React.createElement(Stepper_1.Stepper, {activeStep: stepIndex, linear: false, orientation: 'vertical'}, actionList.map(function (a, index) { return (React.createElement(Stepper_1.Step, null, React.createElement(Stepper_1.StepButton, {onClick: function () { return _this.setState({ stepIndex: index }); }}, a.action + (a.singleLine ? ' ' + a.content : '')), React.createElement(Stepper_1.StepContent, null, a.singleLine ? ''
             : React.createElement(index_1.Markdown, null, '```js\n' + a.content + '\n```')))); }), React.createElement(AddButton_1.default, null)));
     };

Diff for: lib/components/Page/TaskActions/task-object.js

@@ -0,0 +1,17 @@
+"use strict";
+function getTaskObject(a) {
+    var obj = {
+        action: a.substring(0, a.indexOf('(')),
+        content: a.substring(a.indexOf('(') + 2, a.length - 2)
+    };
+    if (obj.action === 'open') {
+        obj.singleLine = true;
+    }
+    var cursor = /::>/g;
+    if (!!obj.content.match(cursor)) {
+        obj.content = obj.content.replace(cursor, '→');
+    }
+    return obj;
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = getTaskObject;

Diff for: lib/modules/editor-paths/index.js

@@ -6,15 +6,17 @@ function twoDigitify(n) {
     return n > 9 ? '' + n : '0' + n;
 }
 function editorOpenPage(index) {
-    var filePath = path_1.join('tutorial', twoDigitify(index + 1), 'index.md');
-    return function (dispatch) { return actions_1.editorOpen(filePath); };
+    return function (dispatch) {
+        var filePath = path_1.join('tutorial', twoDigitify(index + 1), 'index.md');
+        dispatch(actions_1.editorOpen(filePath));
+    };
 }
 exports.editorOpenPage = editorOpenPage;
 function editorOpenTest(pageIndex, testIndex) {
     return function (dispatch, getState) {
         var suffix = config_options_1.default[getState().packageJson.config].suffix;
         var filePath = path_1.join('tutorial', twoDigitify(pageIndex), twoDigitify(testIndex) + '.' + suffix);
-        actions_1.editorOpen(filePath);
+        dispatch(actions_1.editorOpen(filePath));
     };
 }
 exports.editorOpenTest = editorOpenTest;

Diff for: src/components/Page/TaskActions/index.tsx

@@ -4,6 +4,7 @@ import {
 } from 'material-ui/Stepper';
 import {Markdown} from '../../index';
 import AddButton from '../AddButton';
+import getTaskObject from './task-object';
 
 export default class TaskActions extends React.Component<{
   actions: string[]
@@ -20,16 +21,7 @@ export default class TaskActions extends React.Component<{
     const {actions} = this.props;
     const {stepIndex} = this.state;
     // TODO: sort actions with higher accuracy
-    const actionList = actions.map(a => {
-      const obj: Builder.ActionObject = {
-        action: a.substring(0, a.indexOf('(')),
-        content: a.substring(a.indexOf('(') + 2, a.length - 2)
-      };
-      if (obj.action === 'open') {
-        obj.singleLine = true;
-      }
-      return obj;
-    });
+    const actionList: Builder.ActionObject[] = actions.map(a => getTaskObject(a));
     return (
       <Stepper
         activeStep={stepIndex}

Diff for: src/components/Page/TaskActions/task-object.ts

@@ -0,0 +1,17 @@
+export default function getTaskObject(a: string): Builder.ActionObject {
+  const obj: Builder.ActionObject = {
+    action: a.substring(0, a.indexOf('(')),
+    content: a.substring(a.indexOf('(') + 2, a.length - 2)
+  };
+
+  if (obj.action === 'open') {
+    obj.singleLine = true;
+  }
+
+  const cursor = /::>/g;
+  if (!!obj.content.match(cursor)) {
+    obj.content = obj.content.replace(cursor, '→');
+  }
+
+  return obj;
+}

Diff for: src/modules/editor-paths/index.ts

@@ -7,12 +7,14 @@ function twoDigitify(n: number): string {
 }
 
 export function editorOpenPage(index: number) {
-  const filePath = join(
-    'tutorial',
-    twoDigitify(index + 1),
-    'index.md'
-  );
-  return dispatch => editorOpen(filePath);
+  return dispatch => {
+    const filePath = join(
+      'tutorial',
+      twoDigitify(index + 1),
+      'index.md'
+    );
+    dispatch(editorOpen(filePath));
+  };
 }
 
 export function editorOpenTest(pageIndex: number, testIndex: number) {
@@ -24,6 +26,6 @@ export function editorOpenTest(pageIndex: number, testIndex: number) {
       twoDigitify(pageIndex),
       twoDigitify(testIndex) + '.' + suffix
     );
-    editorOpen(filePath);
+    dispatch(editorOpen(filePath));
   };
 }

Diff for: tsconfig.json

@@ -23,6 +23,7 @@
     "files": [
         "src/actions.ts",
         "src/components/index.ts",
+        "src/components/Page/TaskActions/task-object.ts",
         "src/components/remove-later.ts",
         "src/components/Root.ts",
         "src/components/styles/theme.ts",