Skip to content

Commit acd6f58

Browse files
ShMcKShMcK
committed
open/close from drawer, Hold component outline
1 parent b062460 commit acd6f58

File tree

36 files changed

+269
-104
lines changed

36 files changed

+269
-104
lines changed

‎lib/actions/_types.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ exports.TESTS_LOAD = 'TESTS_LOAD';
1919
exports.TUTORIAL_SET = 'TUTORIAL_SET';
2020
exports.TUTORIAL_UPDATE = 'TUTORIAL_UPDATE';
2121
exports.TUTORIALS_FIND = 'TUTORIALS_FIND';
22+
exports.WINDOW_TOGGLE = 'WINDOW_TOGGLE';

‎lib/actions/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,5 @@ var tutorial_1 = require('./tutorial');
2727
exports.tutorialsFind = tutorial_1.tutorialsFind;
2828
exports.tutorialSet = tutorial_1.tutorialSet;
2929
exports.tutorialUpdate = tutorial_1.tutorialUpdate;
30+
var window_1 = require('./window');
31+
exports.windowToggle = window_1.windowToggle;

‎lib/actions/window.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
"use strict";
2+
var _types_1 = require('./_types');
3+
function windowToggle() {
4+
return { type: _types_1.WINDOW_TOGGLE };
5+
}
6+
exports.windowToggle = windowToggle;

‎lib/atom/main.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ var Main = (function () {
2929
}
3030
subscriptions_1.onDeactivate();
3131
};
32-
Main.prototype.toggle = function () {
33-
root_1.Root.toggle();
34-
};
3532
return Main;
3633
}());
3734
;

‎lib/atom/subscriptions.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ var root_1 = require('../components/root');
66
var subscriptions = null;
77
function onActivate() {
88
subscriptions = new CompositeDisposable;
9-
subscriptions.add(atom.commands.add('atom-workspace', {
10-
'cr-viewer:toggle': root_1.Root.toggle,
11-
}));
129
atom.workspace.observeTextEditors(function (editor) {
1310
subscriptions.add(editor.onDidSave(function () {
1411
store_1.default.dispatch(actions_1.testRun());

‎lib/components/App.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ var React = require('react');
2525
var react_redux_1 = require('react-redux');
2626
var index_1 = require('./index');
2727
var Routes_1 = require('./Routes');
28+
var Drawer_1 = require('material-ui/Drawer');
29+
var Hold_1 = require('./Hold');
2830
var height = atom.getSize().height;
2931
window.onresize = function () {
3032
height = atom.getSize().height;
@@ -36,7 +38,7 @@ var App = (function (_super) {
3638
}
3739
App.prototype.render = function () {
3840
var store = this.props.store;
39-
return (React.createElement("section", {className: 'cr', key: 'main', style: { height: height }}, React.createElement(index_1.AppMenu, __assign({}, store)), React.createElement(Routes_1.Routes, __assign({}, store)), React.createElement(index_1.Alert, __assign({}, store))));
41+
return (React.createElement("section", {className: 'cr', key: 'main', style: { height: height }}, React.createElement(Drawer_1.default, {width: 400, openSecondary: true, open: store.open}, React.createElement(index_1.AppMenu, __assign({}, store)), React.createElement(Routes_1.Routes, __assign({}, store)), React.createElement(index_1.Alert, __assign({}, store))), React.createElement(Hold_1.Hold, null)));
4042
};
4143
App = __decorate([
4244
react_redux_1.connect(function (store) {

‎lib/components/AppMenu/CloseWindow.js

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
"use strict";
2+
var __extends = (this && this.__extends) || function (d, b) {
3+
for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
4+
function __() { this.constructor = d; }
5+
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
6+
};
7+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
8+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
9+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
10+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
11+
return c > 3 && r && Object.defineProperty(target, key, r), r;
12+
};
13+
var __metadata = (this && this.__metadata) || function (k, v) {
14+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
15+
};
16+
var React = require('react');
17+
var react_redux_1 = require('react-redux');
18+
var actions_1 = require('../../actions');
19+
var IconButton_1 = require('material-ui/IconButton');
20+
var close_1 = require('material-ui/svg-icons/navigation/close');
21+
var CloseWindow = (function (_super) {
22+
__extends(CloseWindow, _super);
23+
function CloseWindow() {
24+
_super.apply(this, arguments);
25+
}
26+
CloseWindow.prototype.render = function () {
27+
return (React.createElement(IconButton_1.default, {onClick: this.props.windowToggle}, React.createElement(close_1.default, null)));
28+
};
29+
CloseWindow = __decorate([
30+
react_redux_1.connect(null, function (dispatch) {
31+
return {
32+
windowToggle: function () { return dispatch(actions_1.windowToggle()); }
33+
};
34+
}),
35+
__metadata('design:paramtypes', [])
36+
], CloseWindow);
37+
return CloseWindow;
38+
}(React.Component));
39+
exports.CloseWindow = CloseWindow;

‎lib/components/AppMenu/Quit/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
1515
};
1616
var React = require('react');
1717
var react_redux_1 = require('react-redux');
18-
var root_1 = require('../../root');
18+
var actions_1 = require('../../../actions');
1919
var subscriptions_1 = require('../../../atom/subscriptions');
2020
var MenuItem_1 = require('material-ui/MenuItem');
2121
var styles = {
@@ -34,7 +34,7 @@ var Quit = (function (_super) {
3434
react_redux_1.connect(null, function (dispatch) {
3535
return {
3636
quit: function () {
37-
root_1.Root.toggle();
37+
dispatch(actions_1.windowToggle());
3838
subscriptions_1.onDeactivate();
3939
}
4040
};

‎lib/components/AppMenu/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
"use strict";
22
var React = require('react');
33
var AppBar_1 = require('material-ui/AppBar');
4-
var menuIconLeft_1 = require('./menuIconLeft');
4+
var CloseWindow_1 = require('./CloseWindow');
55
var menuRight_1 = require('./menuRight');
66
var styles = {
77
zIndex: '1 !important'
88
};
99
exports.AppMenu = function (_a) {
1010
var route = _a.route;
11-
return (React.createElement(AppBar_1.default, {title: 'CodeRoad', className: 'cr-menu-bar', styles: styles, iconElementLeft: menuIconLeft_1.menuIconLeft(), iconElementRight: menuRight_1.menuRight(route)}));
11+
return (React.createElement(AppBar_1.default, {title: 'CodeRoad', className: 'cr-menu-bar', styles: styles, iconElementLeft: React.createElement(CloseWindow_1.CloseWindow, null), iconElementRight: menuRight_1.menuRight(route)}));
1212
};

‎lib/components/Hold.js

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
"use strict";
2+
var __extends = (this && this.__extends) || function (d, b) {
3+
for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
4+
function __() { this.constructor = d; }
5+
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
6+
};
7+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
8+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
9+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
10+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
11+
return c > 3 && r && Object.defineProperty(target, key, r), r;
12+
};
13+
var __metadata = (this && this.__metadata) || function (k, v) {
14+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
15+
};
16+
var React = require('react');
17+
var react_redux_1 = require('react-redux');
18+
var actions_1 = require('../actions');
19+
var colors_1 = require('material-ui/styles/colors');
20+
var styles = {
21+
backgroundColor: colors_1.cyan500,
22+
width: '20px',
23+
height: atom.getSize().height,
24+
};
25+
var Hold = (function (_super) {
26+
__extends(Hold, _super);
27+
function Hold() {
28+
_super.apply(this, arguments);
29+
}
30+
Hold.prototype.render = function () {
31+
return React.createElement("div", {style: styles, onTouchTap: this.props.windowToggle});
32+
};
33+
Hold = __decorate([
34+
react_redux_1.connect(null, function (dispatch) {
35+
return {
36+
windowToggle: function () { return dispatch(actions_1.windowToggle()); }
37+
};
38+
}),
39+
__metadata('design:paramtypes', [])
40+
], Hold);
41+
return Hold;
42+
}(React.Component));
43+
exports.Hold = Hold;

0 commit comments

Comments
 (0)