Skip to content

Commit 10499a6

Browse files
committed
open log button on page
1 parent 00ac235 commit 10499a6

File tree

7 files changed

+22
-6
lines changed

7 files changed

+22
-6
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ This project adheres to [Semantic Versioning](http://semver.org/).
2222
- fix tutorial progress issues
2323
- use `::>` to set cursor position
2424

25-
## [0.5.4] - 2016-03
25+
## [0.5.4] - coming soon
2626
- fix bug that prevented scroll in Atom 1.6+

lib/atom/editor.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,3 +96,7 @@ function openFolder() {
9696
atom.open();
9797
}
9898
exports.openFolder = openFolder;
99+
function toggleDevTools() {
100+
atom.toggleDevTools();
101+
}
102+
exports.toggleDevTools = toggleDevTools;

lib/components/page/toolbar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ var default_1 = (function (_super) {
4242
default_1.prototype.render = function () {
4343
var _a = this.props, tasks = _a.tasks, taskPosition = _a.taskPosition;
4444
var progress = taskProgress(taskPosition, tasks.length);
45-
return (React.createElement("section", {className: 'cr-page-toolbar'}, React.createElement(ProgressBar, {progress: progress}), React.createElement(material_ui_1.Toolbar, null, React.createElement(material_ui_1.ToolbarGroup, {float: 'right'}, this.getButton()))));
45+
return (React.createElement("section", {className: 'cr-page-toolbar'}, React.createElement(ProgressBar, {progress: progress}), React.createElement(material_ui_1.Toolbar, null, React.createElement(material_ui_1.ToolbarGroup, {float: 'left'}, React.createElement(material_ui_1.FlatButton, {label: 'Log', onTouchTap: editor_1.toggleDevTools})), React.createElement(material_ui_1.ToolbarGroup, {float: 'right'}, this.getButton()))));
4646
};
4747
default_1 = __decorate([
4848
react_redux_1.connect(null, function (dispatch, state) {

package.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
"author": "Shawn McKay <shawn.j.mckay@gmail.com>",
77
"keywords": [
88
"atom",
9-
"coderoad"
9+
"coderoad",
10+
"tutorial",
11+
"learn",
12+
"education"
1013
],
1114
"activationCommands": {
1215
"atom-workspace": "cr-viewer:toggle"
@@ -49,7 +52,7 @@
4952
},
5053
"devDependencies": {
5154
"ava": "^0.12.0",
52-
"enzyme": "2.0.0",
55+
"enzyme": "2.1.0",
5356
"jsdom": "8.1.0",
5457
"react-addons-test-utils": "0.14.7"
5558
},

src/atom/editor.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,3 +107,7 @@ export function quit() {
107107
export function openFolder() {
108108
atom.open();
109109
}
110+
111+
export function toggleDevTools() {
112+
atom.toggleDevTools();
113+
}

src/components/page/toolbar.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import * as React from 'react';
22
import {connect} from 'react-redux';
33
import * as Action from '../../actions/actions';
4-
import {LinearProgress, Toolbar, ToolbarGroup, RaisedButton} from 'material-ui';
5-
import {save} from '../../atom/editor';
4+
import {LinearProgress, Toolbar, ToolbarGroup, RaisedButton, FlatButton} from 'material-ui';
5+
import {save, toggleDevTools} from '../../atom/editor';
66
import {store} from '../../_base';
77

88
const ProgressBar = ({progress}) => <LinearProgress mode='determinate'
@@ -41,6 +41,10 @@ export default class extends React.Component<{
4141

4242
<Toolbar>
4343

44+
<ToolbarGroup float='left'>
45+
<FlatButton label='Log' onTouchTap={toggleDevTools} />
46+
</ToolbarGroup>
47+
4448
<ToolbarGroup float='right'>
4549
{/* add log here */}
4650
{this.getButton()}

tsconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
"src/atom/main.ts",
6464
"src/atom/subscriptions.ts",
6565
"src/components/_components.ts",
66+
"src/components/dialog/dialog.ts",
6667
"src/components/remove-later.ts",
6768
"src/components/theme/theme.ts",
6869
"src/reducers/alert/alert.ts",

0 commit comments

Comments
 (0)