Skip to content

Commit 55328f4

Browse files
ShMcKShMcK
committed
tslinted
1 parent de8e020 commit 55328f4

File tree

13 files changed

+16
-24
lines changed

13 files changed

+16
-24
lines changed

‎lib/components/page/page.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,9 @@ var default_1 = (function (_super) {
136136
})
137137
: null,
138138
isFinalTask ? null : React.createElement(material_ui_1.Divider, null),
139-
page.completed && page.continue ? React.createElement(material_ui_1.ListItem, {className: 'cr-task-continue', ref: 'continue'},
140-
React.createElement("div", {className: 'cr-task-continue-description'},
141-
React.createElement(_components_1.MarkdownText, {text: page.continue})
139+
page.completed && page.onComplete ? React.createElement(material_ui_1.ListItem, {className: 'cr-task-onComplete', ref: 'onComplete'},
140+
React.createElement("div", {className: 'cr-task-onComplete-description'},
141+
React.createElement(_components_1.MarkdownText, {text: page.onComplete})
142142
)
143143
) : null));
144144
})),

‎lib/reducers/page/page.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ function pageReducer(page, action) {
1616
title: page.title,
1717
description: page.description,
1818
explanation: page.explanation,
19-
continue: page.continue,
19+
onComplete: page.onComplete,
2020
completed: true
2121
};
2222
default:

‎lib/reducers/run-tests/run-tests.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ function runTestReducer(runTests, action) {
1212
previous = current;
1313
return run_1.runTaskTests();
1414
}
15-
else {
16-
return false;
17-
}
15+
return false;
1816
case Type.TEST_COMPLETE:
1917
return false;
2018
case Type.SET_PAGE:

‎lib/reducers/tasks/tasks.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
"use strict";
22
var Type = require('../../actions/actionTypes');
33
var defaultTasks = [{
4-
title: '',
54
description: '',
65
completed: false,
76
tests: [],

‎src/actions/page-actions.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import * as Type from './actionTypes';
2-
import * as Action from './actions';
32
import {store} from '../_base';
43
import Package from '../services/package';
54
const _ = require('lodash');

‎src/actions/task-actions.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import * as Type from './actionTypes';
2-
import * as Action from './actions';
32
import {store} from '../_base';
43

54
export function showHint(): CR.Action {

‎src/atom/main.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class Main {
2525
// render React component
2626
render(this.root);
2727
}
28-
consumeStatusBar(statusBar){
28+
consumeStatusBar(statusBar) {
2929
this.statusBarTile = addToStatusBar(statusBar);
3030
}
3131
deactivate(): void {

‎src/components/page/page.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,19 +136,19 @@ render() {
136136
</ListItem>
137137
{isCurrentTask && hints ?
138138
hints.map((hint, indexHint) => {
139-
return <ListItem className='cr-task-hint' ref={'hint'+indexHint}>
139+
return <ListItem className='cr-task-hint' ref={'hint' + indexHint}>
140140
<div class='cr-task-hint-box'>
141141
<span className='cr-task-hint-index'>{indexHint + 1}.</span>
142142
<div className='cr-task-hint-description'><MarkdownText text={hint} /></div>
143143
</div>
144-
</ListItem>
144+
</ListItem>;
145145
})
146146
: null}
147147
{isFinalTask ? null : <Divider />}
148-
{page.completed && page.continue ? <ListItem className='cr-task-continue' ref='continue'>
149-
<div className='cr-task-continue-description'><MarkdownText text={page.continue} />
148+
{page.completed && page.onComplete ? <ListItem className='cr-task-onComplete' ref='onComplete'>
149+
<div className='cr-task-onComplete-description'><MarkdownText text={page.onComplete} />
150150
</div>
151-
</ListItem>: null}
151+
</ListItem> : null}
152152
</div>
153153
);
154154
})

‎src/reducers/page/page.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export default function pageReducer(page = defaultPage, action: CR.Action): CR.P
1616
title: page.title,
1717
description: page.description,
1818
explanation: page.explanation,
19-
continue: page.continue,
19+
onComplete: page.onComplete,
2020
completed: true
2121
};
2222
default:

‎src/reducers/run-tests/run-tests.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import * as Type from '../../actions/actionTypes';
2-
import * as Action from '../../actions/actions';
32
import {runTaskTests} from './run';
43

54
const pageTimeout = 2000;
@@ -15,9 +14,8 @@ export default function runTestReducer(runTests = false, action: CR.Action): boo
1514
if (current - previous > pageTimeout) {
1615
previous = current;
1716
return runTaskTests();
18-
} else {
19-
return false;
2017
}
18+
return false;
2119
case Type.TEST_COMPLETE:
2220
return false;
2321
case Type.SET_PAGE:

‎src/reducers/tasks/tasks.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import * as Type from '../../actions/actionTypes';
22

33
const defaultTasks: CR.Task[] = [{
4-
title: '',
54
description: '',
65
completed: false,
76
tests: [],

‎src/typings/cr/cr.d.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@ declare namespace CR {
1212
interface Page extends Info {
1313
explanation?: string;
1414
tasks?: Task[];
15-
continue?: string;
15+
onComplete?: string;
1616
}
1717
interface Task {
1818
description: string;
1919
tests?: string[];
2020
hints?: string[];
2121
actions?: string[];
22+
completed?: boolean;
2223
}
2324

2425
/**

‎tslint.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
"no-shadowed-variable": true,
3333
"no-string-literal": true,
3434
"no-switch-case-fall-through": true,
35-
"no-trailing-comma": true,
3635
"no-trailing-whitespace": true,
3736
"no-unused-expression": true,
3837
"no-unused-variable": true,
@@ -43,12 +42,12 @@
4342
"check-open-brace",
4443
"check-catch",
4544
"check-else",
45+
"check-finally",
4646
"check-whitespace"
4747
],
4848
"quotemark": [true, "single"],
4949
"radix": true,
5050
"semicolon": true,
51-
"sort-object-literal-keys": false,
5251
"triple-equals": [true, "allow-null-check"],
5352
"variable-name": false,
5453
"whitespace": [true,

0 commit comments

Comments
 (0)