Cleanup and fix linter warnings

src/calc.ts

@@ -8,7 +8,7 @@ function frameRatio(a: Rectangle, b: Rectangle): FrameRatio {
 	let widthRatio = b.width / a.width;
 	let heightRatio = b.height / a.height;
 
-	return function ({ width, height, x, y }) {
+	return ({ width, height, x, y }) => {
 		width = Math.round(width * widthRatio);
 		height = Math.round(height * heightRatio);
 		x = Math.round(b.x + (x - a.x) * widthRatio);

src/key.ts

@@ -1,5 +1,5 @@
-import log from './logger';
 import { hyper, hyperShift } from './config';
+import log from './logger';
 
 const handlers: Map<string, Key> = new Map();
 const hyperHandlers: Map<string, Key> = new Map();
@@ -12,7 +12,6 @@ onKey('f19', ['shift'], enableHyperBindings);
 
 function enableHyperBindings() {
 	if (!hyperTimeout) {
-		log('enable f19');
 		enableHyperKeys();
 		hyperTimeout = setTimeout(disableHyperBindings, 510);
 	} else {
@@ -22,7 +21,6 @@ function enableHyperBindings() {
 }
 
 function disableHyperBindings() {
-	log('disable f19');
 	if (hyperTimeout) {
 		clearTimeout(hyperTimeout);
 		hyperTimeout = null;
@@ -75,11 +73,11 @@ function getHandler(key: string, mod: string[]) {
 }
 
 function enableHyperKeys() {
-	hyperHandlers.forEach(h => h.enable());
+	hyperHandlers.forEach((h) => h.enable());
 }
 
 function disableHyperKeys() {
-	hyperHandlers.forEach(h => h.disable());
+	hyperHandlers.forEach((h) => h.disable());
 }
 
 export { onKey, getHandler, enableHyperKeys, disableHyperKeys };

src/logger.ts

@@ -1,15 +1,15 @@
 export default function log(...args: any[]): void {
-	args = args.map(arg => stringify(arg));
+	args = args.map((arg) => stringify(arg));
 	Phoenix.log(args.join(' '));
 }
 
 function stringify(value: any) {
 	switch (typeof value) {
-	case 'object':
-		return JSON.stringify(value, null, 2);
-	case 'function':
-		return value.toString();
-	default:
-		return value;
+		case 'object':
+			return JSON.stringify(value, null, 2);
+		case 'function':
+			return value.toString();
+		default:
+			return value;
 	}
 }

src/misc/brightness.ts

@@ -37,7 +37,9 @@ function addBrightness(value: number) {
 
 function showBrightness(value: number) {
 	clearTimeout(bModalHideHandler);
-	if (!bModal) bModal = new Modal();
+	if (!bModal) {
+		bModal = new Modal();
+	}
 
 	bModal.text = `Brightness: ${value}`;
 	bModal.showCenterOn(Screen.main());

src/misc/coffee.ts

@@ -1,7 +1,7 @@
 /**
  * This module starts a timer to notify you when your coffee is done.
  */
-import { applyMargin, originOnScreen, Orientation } from '../modal';
+import { applyMargin, Orientation, originOnScreen } from '../modal';
 
 export default start;
 
@@ -50,7 +50,9 @@ function updater(timer: CoffeTimer) {
 		timer.timeout--;
 		let min = timer.timeout ? '~' + String(timer.timeout) : '<1';
 		timer.modal.text = `Coffee in ${min} min`;
-		timer.modal.origin = applyMargin(originOnScreen(timer.modal, timer.screen, Orientation.SouthEast), MODAL_MARGIN, MODAL_MARGIN);
+
+		const screenOrigin = originOnScreen(timer.modal, timer.screen, Orientation.SouthEast);
+		timer.modal.origin = applyMargin(screenOrigin, MODAL_MARGIN, MODAL_MARGIN);
 		timer.modal.show();
 	};
 }

src/misc/terminal.ts

@@ -8,9 +8,9 @@ const TERMINAL_APP = TERMINAL_NAME.replace(/[0-9]+$/, '');
 
 // Initialize with current app status.
 let term = App.get(TERMINAL_NAME);
-let termIsActive = (function() {
+let termIsActive = (() => {
 	const win = Window.focused();
-	if (!win) return false;
+	if (!win) { return false; }
 
 	return isTerminal(win.app());
 })();

src/modal.ts

@@ -4,7 +4,7 @@ enum Orientation {
 	NorthWest,
 	NorthEast,
 	SouthWest,
-	SouthEast
+	SouthEast,
 }
 
 function titleModal(text: string, duration: number = 1, icon?: Phoenix.Icon) {
@@ -17,11 +17,11 @@ function titleModal(text: string, duration: number = 1, icon?: Phoenix.Icon) {
 	m.showTitleOn(Screen.main());
 }
 
-Modal.prototype.showTitleOn = function(screen: Screen) {
+Modal.prototype.showTitleOn = function _showTitleOn(screen: Screen) {
 	showAt(this, screen, 2, 1 + (1 / 3));
 };
 
-Modal.prototype.showCenterOn = function(screen: Screen) {
+Modal.prototype.showCenterOn = function _showCenterOn(screen: Screen) {
 	showAt(this, screen, 2, 2);
 };
 

src/phoenix.ts

@@ -1,45 +1,45 @@
-import * as _ from 'lodash';
-
-import './window';
 import './screen';
+import './window';
 
-import { onKey } from './key';
 import { frameRatio } from './calc';
-import { titleModal } from './modal';
+import { hyper, hyperShift } from './config';
+import { onKey } from './key';
 import log from './logger';
 import brightness from './misc/brightness';
 import coffeTimer from './misc/coffee';
 import { TimerStopper } from './misc/coffee';
-import { Scanner } from './scan';
 import * as terminal from './misc/terminal';
-import { hyper, hyperShift } from './config';
+import { titleModal } from './modal';
+import { Scanner } from './scan';
 
 let scanner = new Scanner();
 let coffee: TimerStopper;
 
 Phoenix.set({
-	'daemon': true,
-	'openAtLogin': true,
+	daemon: true,
+	openAtLogin: true,
 });
 
 Event.on('screensDidChange', () => log('Screens changed'));
 
 onKey('tab', hyper, () => {
 	let win = Window.focused();
-	if (!win) return;
+	if (!win) { return; }
 
 	let oldScreen = win.screen();
 	let newScreen = oldScreen.next();
 
-	if (oldScreen.isEqual(newScreen)) return;
+	if (oldScreen.isEqual(newScreen)) {
+		return;
+	}
 
 	let ratio = frameRatio(oldScreen.flippedVisibleFrame(), newScreen.flippedVisibleFrame());
 	win.setFrame(ratio(win.frame()));
 });
 
 onKey('left', hyper, () => {
 	let win = Window.focused();
-	if (!win) return;
+	if (!win) { return; }
 
 	let { width, height, x, y } = win.screen().flippedVisibleFrame();
 	width = Math.ceil(width / 2);
@@ -49,7 +49,7 @@ onKey('left', hyper, () => {
 
 onKey('right', hyper, () => {
 	let win = Window.focused();
-	if (!win) return;
+	if (!win) { return; }
 
 	let { width, height, x, y } = win.screen().flippedVisibleFrame();
 	width /= 2;
@@ -62,7 +62,7 @@ onKey('right', hyper, () => {
 
 onKey('up', hyper, () => {
 	let win = Window.focused();
-	if (!win) return;
+	if (!win) { return; }
 
 	let { width, x } = win.frame();
 	let { height, y } = win.screen().flippedVisibleFrame();
@@ -74,12 +74,12 @@ onKey('up', hyper, () => {
 
 onKey('down', hyper, () => {
 	let win = Window.focused();
-	if (!win) return;
+	if (!win) { return; }
 
 	let { width, x } = win.frame();
 	let { height, y } = win.screen().flippedVisibleFrame();
 	height /= 2;
-	[ height, y ] = [ Math.ceil(height), y + Math.floor(height) ];
+	[height, y] = [Math.ceil(height), y + Math.floor(height)];
 
 	win.setFrame({ height, width, x, y });
 	win.clearUnmaximized();
@@ -94,7 +94,7 @@ onKey('return', hyper, () => {
 
 onKey('left', hyperShift, () => {
 	let win = Window.focused();
-	if (!win) return;
+	if (!win) { return; }
 
 	let { width, height, y } = win.frame();
 	let { x } = win.screen().flippedVisibleFrame();
@@ -104,7 +104,7 @@ onKey('left', hyperShift, () => {
 
 onKey('right', hyperShift, () => {
 	let win = Window.focused();
-	if (!win) return;
+	if (!win) { return; }
 
 	let { width, height, y } = win.frame();
 	let { width: sWidth, x } = win.screen().flippedVisibleFrame();
@@ -117,7 +117,7 @@ onKey('right', hyperShift, () => {
 
 onKey('up', hyperShift, () => {
 	let win = Window.focused();
-	if (!win) return;
+	if (!win) { return; }
 
 	let { width, height, x } = win.frame();
 	let { y } = win.screen().flippedVisibleFrame();
@@ -127,7 +127,7 @@ onKey('up', hyperShift, () => {
 
 onKey('down', hyperShift, () => {
 	let win = Window.focused();
-	if (!win) return;
+	if (!win) { return; }
 
 	let { width, height, x } = win.frame();
 	let { height: sHeight, y } = win.screen().flippedVisibleFrame();
@@ -140,7 +140,7 @@ onKey('down', hyperShift, () => {
 
 onKey('return', hyperShift, () => {
 	let win = Window.focused();
-	if (!win) return;
+	if (!win) { return; }
 
 	let { width, height } = win.frame();
 	let { width: sWidth, height: sHeight, x, y } = win.screen().flippedVisibleFrame();
@@ -164,7 +164,7 @@ onKey('delete', hyper, () => {
 
 onKey('m', hyper, () => {
 	let s = Screen.at(Mouse.location());
-	if (!s) return;
+	if (!s) { return; }
 
 	log(s.identifier(), Mouse.location());
 });
@@ -202,7 +202,7 @@ onKey('space', hyper, () => {
 		m.showCenterOn(Screen.main());
 	});
 
-	scanner.scanln(s => {
+	scanner.scanln((s) => {
 		m.close();
 		tab.disable();
 	}, (s) => {

src/scan.ts

@@ -30,7 +30,9 @@ class Scanner {
 		this.enable();
 		this.doneCallback = done;
 		this.updateCallback = (s) => {
-			if (!s) return; // an update requires a character
+			if (!s) {
+				return; // an update requires a character
+			}
 			this.disable();
 			done(s);
 		};
@@ -39,7 +41,7 @@ class Scanner {
 	/**
 	 * scanln scans an entire line (return ends scan).
 	 */
-	public scanln(done: ScanCallback, update: ScanCallback = (() => {})) {
+	public scanln(done: ScanCallback, update: ScanCallback = (() => undefined)) {
 		this.enable();
 		this.doneCallback = done;
 		this.updateCallback = update;
@@ -65,11 +67,11 @@ class Scanner {
 			}
 		}
 
-		this.keyHandlers.forEach(h => h.enable()); // make sure all handlers are enabled
+		this.keyHandlers.forEach((h) => h.enable()); // make sure all handlers are enabled
 	}
 
 	private disable() {
-		this.keyHandlers.forEach(h => {
+		this.keyHandlers.forEach((h) => {
 			h.disable();
 			const last = getHandler(h.key, h.modifiers);
 			if (last) {

src/screen.ts

@@ -12,22 +12,3 @@ function screenAt(point: Point) {
 
 // Extend ScreenObject
 Screen.at = screenAt;
-
-class PositionHandler {
-	private screenStore: Map<string, Object>;
-	private store: Map<number, Object>;
-
-	constructor() {
-		this.screenStore = new Map();
-		this.store = new Map();
-	}
-
-	changed(win: Window) {
-		let window = Object.assign({}, win.frame());
-		let screen = Object.assign({}, win.screen().flippedVisibleFrame());
-		this.store.set(win.hash(), {window, screen});
-	}
-	remove(win: Window) {
-		this.store.delete(win.hash());
-	}
-}

src/window.ts

@@ -20,7 +20,7 @@ function clearUnmaximized(win: Window) {
 }
 
 function unmaximizedFrame(win: Window): Rectangle {
-	let c =  frameCache.get(win.hash());
+	let c = frameCache.get(win.hash());
 	let ratio = frameRatio(c.screen, win.screen().flippedVisibleFrame());
 	return ratio(c.window);
 }
@@ -32,19 +32,19 @@ function toggleMaximized(win: Window) {
 		win.clearUnmaximized();
 	} else {
 		frameCache.set(id, {
-			window: win.frame(),
 			screen: win.screen().flippedVisibleFrame(),
+			window: win.frame(),
 		});
 		win.maximize();
 	}
 }
 
-Window.prototype.clearUnmaximized = function () { clearUnmaximized(this); };
-Window.prototype.toggleMaximized = function () { toggleMaximized(this); };
+Window.prototype.clearUnmaximized = function _clearUnmaximized() { clearUnmaximized(this); };
+Window.prototype.toggleMaximized = function _toggleMaximized() { toggleMaximized(this); };
 
 // FIXME: This is too hacky, I'd prefer not to monkey patch built-ins
 let setFrameOrig = Window.prototype.setFrame;
-Window.prototype.setFrame = function(frame: Rectangle): boolean {
+Window.prototype.setFrame = function _setFrame(frame: Rectangle): boolean {
 	let ret = setFrameOrig.call(this, frame);
 	if (this.app().bundleIdentifier() === 'com.microsoft.Word') {
 		// Workaround for Microsoft Word resizing too slowly and thus not