window module, various fixes

ShMcK · ShMcK · commit e9b224ea6c74 · 2016-05-15T15:44:24.000-07:00
diff --git a/lib/actions/_types.js b/lib/actions/_types.js
@@ -6,7 +6,6 @@ exports.HINT_POSITION_SET = 'HINT_POSITION_SET';
 exports.PAGE_SET = 'PAGE_SET';
 exports.PROGRESS_LOAD = 'PROGRESS_LOAD';
 exports.PROGRESS_PAGE_POSITION_LOAD = 'PROGRESS_PAGE_POSITION_LOAD';
-exports.QUIT = 'QUIT';
 exports.ROUTE_SET = 'ROUTE_SET';
 exports.TEST_SAVE = 'TEST_SAVE';
 exports.SETUP_PACKAGE = 'SETUP_PACKAGE';
@@ -17,4 +16,3 @@ exports.TEST_RUN = 'TEST_RUN';
 exports.TUTORIAL_SET = 'TUTORIAL_SET';
 exports.TUTORIAL_UPDATE = 'TUTORIAL_UPDATE';
 exports.TUTORIALS_FIND = 'TUTORIALS_FIND';
-exports.WINDOW_TOGGLE = 'WINDOW_TOGGLE';
diff --git a/lib/actions/index.js b/lib/actions/index.js
@@ -28,6 +28,4 @@ exports.tutorialsFind = tutorial_1.tutorialsFind;
 exports.tutorialSet = tutorial_1.tutorialSet;
 exports.tutorialUpdate = tutorial_1.tutorialUpdate;
 var toggle_1 = require('./toggle');
-exports.windowToggle = toggle_1.windowToggle;
 exports.devToolsToggle = toggle_1.devToolsToggle;
-exports.quit = toggle_1.quit;
diff --git a/lib/actions/toggle.js b/lib/actions/toggle.js
@@ -1,14 +1,6 @@
 "use strict";
 var _types_1 = require('./_types');
-function windowToggle() {
-    return { type: _types_1.WINDOW_TOGGLE };
-}
-exports.windowToggle = windowToggle;
 function devToolsToggle() {
     return { type: _types_1.DEVTOOLS_TOGGLE };
 }
 exports.devToolsToggle = devToolsToggle;
-function quit() {
-    return { type: _types_1.QUIT };
-}
-exports.quit = quit;
diff --git a/lib/atom/subscriptions.js b/lib/atom/subscriptions.js
@@ -7,7 +7,7 @@ var subscriptions = null;
 function onActivate() {
     subscriptions = new CompositeDisposable;
     subscriptions.add(atom.commands.add('atom-workspace', {
-        'cr-viewer:toggle': function () { return store_1.default.dispatch(actions_1.windowToggle()); }
+        'cr-viewer:toggle': function () { return store_1.default.dispatch({ type: 'WINDOW_TOGGLE' }); }
     }));
     atom.workspace.observeTextEditors(function (editor) {
         subscriptions.add(editor.onDidSave(function () {
diff --git a/lib/components/AppMenu/Quit/index.js b/lib/components/AppMenu/Quit/index.js
@@ -1,43 +1,11 @@
 "use strict";
-var __extends = (this && this.__extends) || function (d, b) {
-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-};
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    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;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var React = require('react');
-var react_redux_1 = require('react-redux');
-var actions_1 = require('../../../actions');
 var MenuItem_1 = require('material-ui/MenuItem');
+var subscriptions_1 = require('../../../atom/subscriptions');
 var styles = {
     textAlign: 'center',
     padding: '0px 2px',
 };
-var Quit = (function (_super) {
-    __extends(Quit, _super);
-    function Quit() {
-        _super.apply(this, arguments);
-    }
-    Quit.prototype.render = function () {
-        return (React.createElement(MenuItem_1.default, {style: styles, key: 'quit', onClick: this.props.quit}, "quit"));
-    };
-    Quit = __decorate([
-        react_redux_1.connect(null, function (dispatch) {
-            return {
-                quit: function () { return dispatch(actions_1.quit()); }
-            };
-        }), 
-        __metadata('design:paramtypes', [])
-    ], Quit);
-    return Quit;
-}(React.Component));
+var Quit = function () { return (React.createElement(MenuItem_1.default, {style: styles, key: 'quit', onClick: subscriptions_1.onDeactivate}, "quit")); };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Quit;
diff --git a/lib/modules/alert/Alert.js b/lib/modules/alert/Alert.js
@@ -33,7 +33,7 @@ var Alert = (function (_super) {
     Alert.prototype.render = function () {
         var _a = this.props, alert = _a.alert, close = _a.close;
         var action = alert.action, message = alert.message, open = alert.open, duration = alert.duration, color = alert.color;
-        return (React.createElement(Snackbar_1.default, {style: styles, bodyStyle: { color: color }, open: open, message: message || '', action: action || '', autoHideDuration: duration || 2000, onRequestClose: close}));
+        return (React.createElement(Snackbar_1.default, {style: styles, bodyStyle: { color: color }, open: open, message: message || '', action: action || '', autoHideDuration: duration || 2000, onActionTouchTap: close, onRequestClose: close}));
     };
     Alert = __decorate([
         react_redux_1.connect(null, function (dispatch) {
diff --git a/lib/modules/window/actions.js b/lib/modules/window/actions.js
@@ -0,0 +1,6 @@
+"use strict";
+var types_1 = require('./types');
+function windowToggle() {
+    return { type: types_1.WINDOW_TOGGLE };
+}
+exports.windowToggle = windowToggle;
diff --git a/lib/modules/window/index.js b/lib/modules/window/index.js
@@ -0,0 +1,5 @@
+"use strict";
+var reducer_1 = require('./reducer');
+exports.reducer = reducer_1.default;
+var actions_1 = require('./actions');
+exports.windowToggle = actions_1.windowToggle;
diff --git a/lib/modules/window/reducer.js b/lib/modules/window/reducer.js
@@ -0,0 +1,13 @@
+"use strict";
+var types_1 = require('./types');
+function windowToggle(open, action) {
+    if (open === void 0) { open = false; }
+    switch (action.type) {
+        case types_1.WINDOW_TOGGLE:
+            return !open;
+        default:
+            return open;
+    }
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = windowToggle;
diff --git a/lib/modules/window/types.js b/lib/modules/window/types.js
@@ -0,0 +1,2 @@
+"use strict";
+exports.WINDOW_TOGGLE = 'WINDOW_TOGGLE';
diff --git a/lib/reducers/index.js b/lib/reducers/index.js
@@ -1,6 +1,7 @@
 "use strict";
 var redux_1 = require('redux');
 var alert_1 = require('../modules/alert');
+var window_1 = require('../modules/window');
 var checks_1 = require('./checks');
 var devTools_toggle_1 = require('./devTools-toggle');
 var dir_1 = require('./dir');
@@ -17,11 +18,10 @@ var task_tests_1 = require('./task-tests');
 var test_run_1 = require('./test-run');
 var tutorial_1 = require('./tutorial');
 var tutorial_list_1 = require('./tutorial-list');
-var window_toggle_1 = require('./window-toggle');
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = redux_1.combineReducers({
     alert: alert_1.reducer, checks: checks_1.default, devToolsToggle: devTools_toggle_1.default, dir: dir_1.default, hintPosition: hint_position_1.default,
     packageJson: package_json_1.default, page: page_1.default, pagePosition: page_position_1.default, progress: progress_1.default, route: route_1.default, tasks: tasks_1.default,
     tutorial: tutorial_1.default, tutorialList: tutorial_list_1.default,
-    taskActions: task_actions_1.default, taskPosition: task_position_1.default, taskTests: task_tests_1.default, testRun: test_run_1.default, windowToggle: window_toggle_1.default
+    taskActions: task_actions_1.default, taskPosition: task_position_1.default, taskTests: task_tests_1.default, testRun: test_run_1.default, windowToggle: window_1.reducer
 });
diff --git a/src/actions/_types.ts b/src/actions/_types.ts
@@ -5,7 +5,6 @@ export const HINT_POSITION_SET = 'HINT_POSITION_SET';
 export const PAGE_SET = 'PAGE_SET';
 export const PROGRESS_LOAD = 'PROGRESS_LOAD';
 export const PROGRESS_PAGE_POSITION_LOAD = 'PROGRESS_PAGE_POSITION_LOAD';
-export const QUIT = 'QUIT';
 export const ROUTE_SET = 'ROUTE_SET';
 export const TEST_SAVE = 'TEST_SAVE';
 export const SETUP_PACKAGE = 'SETUP_PACKAGE';
@@ -16,4 +15,3 @@ export const TEST_RUN = 'TEST_RUN';
 export const TUTORIAL_SET = 'TUTORIAL_SET';
 export const TUTORIAL_UPDATE = 'TUTORIAL_UPDATE';
 export const TUTORIALS_FIND = 'TUTORIALS_FIND';
-export const WINDOW_TOGGLE = 'WINDOW_TOGGLE';
diff --git a/src/actions/toggle.ts b/src/actions/toggle.ts
@@ -1,13 +1,5 @@
-import {WINDOW_TOGGLE, DEVTOOLS_TOGGLE, QUIT} from './_types';
-
-export function windowToggle(): Action {
-  return { type: WINDOW_TOGGLE };
-}
+import {DEVTOOLS_TOGGLE} from './_types';
 
 export function devToolsToggle(): Action {
   return { type: DEVTOOLS_TOGGLE };
 }
-
-export function quit(): Action {
-  return { type: QUIT };
-}
diff --git a/src/atom/subscriptions.ts b/src/atom/subscriptions.ts
@@ -1,6 +1,6 @@
 const CompositeDisposable = require('atom').CompositeDisposable;
 import store from '../store';
-import {testRun, alertReplay, windowToggle} from '../actions';
+import {testRun, alertReplay} from '../actions';
 import Root from '../components/root';
 
 let subscriptions = null;
@@ -11,7 +11,7 @@ export function onActivate(): AtomCore.Disposable {
 
   subscriptions.add(
     atom.commands.add('atom-workspace', {
-      'cr-viewer:toggle': () => store.dispatch(windowToggle())
+      'cr-viewer:toggle': () => store.dispatch({ type: 'WINDOW_TOGGLE'})
     })
   );
 
diff --git a/src/components/AppMenu/Quit/index.tsx b/src/components/AppMenu/Quit/index.tsx
@@ -2,29 +2,20 @@ import * as React from 'react';
 import {connect} from 'react-redux';
 import {quit} from '../../../actions';
 import MenuItem from 'material-ui/MenuItem';
+import {onDeactivate} from '../../../atom/subscriptions';
 
 const styles = {
   textAlign: 'center',
   padding: '0px 2px',
 };
 
-@connect(null, (dispatch) => {
-  return {
-    quit: () => dispatch(quit())
-  };
-})
-export default class Quit extends React.Component<{
-  quit?: any
-}, {}> {
-  render() {
-    return (
-      <MenuItem
-        style={styles}
-        key='quit'
-        onClick={this.props.quit}
-        >
-        quit
-      </MenuItem>
-    );
-  }
-}
+const Quit = () => (
+  <MenuItem
+    style={styles}
+    key='quit'
+    onClick={onDeactivate}
+  >
+    quit
+  </MenuItem>
+);
+export default Quit;
diff --git a/src/components/AppMenu/index.tsx b/src/components/AppMenu/index.tsx
@@ -2,6 +2,7 @@ import * as React from 'react';
 import AppBar from 'material-ui/AppBar';
 import CloseWindow from './CloseWindow';
 import menuRight from './menuRight';
+import {onDeactivate} from '../../atom/subscriptions';
 
 const styles = {
   zIndex: '1 !important'
diff --git a/src/modules/alert/Alert.tsx b/src/modules/alert/Alert.tsx
@@ -32,6 +32,7 @@ export default class Alert extends React.Component<{
           message={message || ''}
           action={action || ''}
           autoHideDuration={duration || 2000}
+          onActionTouchTap={close}
           onRequestClose={close}
       />
     );
diff --git a/src/modules/window/actions.ts b/src/modules/window/actions.ts
@@ -0,0 +1,5 @@
+import {WINDOW_TOGGLE} from './types';
+
+export function windowToggle(): Action {
+  return { type: WINDOW_TOGGLE };
+}
diff --git a/src/modules/window/index.ts b/src/modules/window/index.ts
@@ -0,0 +1,2 @@
+export {default as reducer} from './reducer';
+export {windowToggle} from './actions';
diff --git a/src/modules/window/reducer.ts b/src/modules/window/reducer.ts
@@ -0,0 +1,14 @@
+import {WINDOW_TOGGLE} from './types';
+
+export default function windowToggle(
+  open = false, action: Action
+): boolean {
+  switch (action.type) {
+
+    case WINDOW_TOGGLE:
+      return !open;
+
+    default:
+      return open;
+  }
+}
diff --git a/src/modules/window/types.ts b/src/modules/window/types.ts
@@ -0,0 +1 @@
+export const WINDOW_TOGGLE = 'WINDOW_TOGGLE';
diff --git a/src/reducers/index.ts b/src/reducers/index.ts
@@ -1,6 +1,7 @@
 import {combineReducers} from 'redux';
 
 import {reducer as alert} from '../modules/alert';
+import {reducer as windowToggle} from '../modules/window';
 import checks from './checks';
 import devToolsToggle from './devTools-toggle';
 import dir from './dir';
@@ -17,7 +18,6 @@ import taskTests from './task-tests';
 import testRun from './test-run';
 import tutorial from './tutorial';
 import tutorialList from './tutorial-list';
-import windowToggle from './window-toggle';
 
 export default combineReducers({
   alert, checks, devToolsToggle, dir, hintPosition,
diff --git a/src/reducers/window-toggle/index.ts b/src/reducers/window-toggle/index.ts
diff --git a/tsconfig.json b/tsconfig.json
@@ -79,6 +79,10 @@
         "src/modules/alert/index.ts",
         "src/modules/alert/reducer.ts",
         "src/modules/alert/types.ts",
+        "src/modules/window/actions.ts",
+        "src/modules/window/index.ts",
+        "src/modules/window/reducer.ts",
+        "src/modules/window/types.ts",
         "src/reducers/checks/action-setup.ts",
         "src/reducers/checks/action-system.ts",
         "src/reducers/checks/check-system.ts",
@@ -112,7 +116,6 @@
         "src/reducers/tutorial/config-paths.ts",
         "src/reducers/tutorial/index.ts",
         "src/reducers/tutorial/tutorial-config.ts",
-        "src/reducers/window-toggle/index.ts",
         "src/services/command-line.ts",
         "src/services/exists.ts",
         "src/services/polyfills.ts",

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+"use strict";`
	`2`	`+exports.WINDOW_TOGGLE = 'WINDOW_TOGGLE';`