Merge branch 'master' into schema-mehek

1 files changed, 34 insertions, 26 deletions

diff --git a/src/client/views/DictationOverlay.tsx b/src/client/views/DictationOverlay.tsx
index f4f96da8a..0bdcdc303 100644
--- a/src/client/views/DictationOverlay.tsx
+++ b/src/client/views/DictationOverlay.tsx
@@ -1,9 +1,8 @@
 import { computed, observable, runInAction } from 'mobx';
 import { observer } from 'mobx-react';
-import "normalize.css";
 import * as React from 'react';
 import { DictationManager } from '../util/DictationManager';
-import "./Main.scss";
+import './Main.scss';
 import { MainViewModal } from './MainViewModal';
 
 @observer
@@ -29,44 +28,53 @@ export class DictationOverlay extends React.Component {
             this.dictationOverlayVisible = false;
             this.dictationSuccess = undefined;
             DictationOverlay.Instance.hasActiveModal = false;
-            setTimeout(() => this.dictatedPhrase = DictationManager.placeholder, 500);
+            setTimeout(() => (this.dictatedPhrase = DictationManager.placeholder), 500);
         }, duration);
-    }
+    };
     public cancelDictationFade = () => {
         if (this.overlayTimeout) {
             clearTimeout(this.overlayTimeout);
             this.overlayTimeout = undefined;
         }
-    }
+    };
 
-    @computed public get dictatedPhrase() { return this._dictationState; }
-    @computed public get dictationSuccess() { return this._dictationSuccessState; }
-    @computed public get dictationOverlayVisible() { return this._dictationDisplayState; }
-    @computed public get isListening() { return this._dictationListeningState; }
+    @computed public get dictatedPhrase() {
+        return this._dictationState;
+    }
+    @computed public get dictationSuccess() {
+        return this._dictationSuccessState;
+    }
+    @computed public get dictationOverlayVisible() {
+        return this._dictationDisplayState;
+    }
+    @computed public get isListening() {
+        return this._dictationListeningState;
+    }
 
-    public set dictatedPhrase(value: string) { runInAction(() => this._dictationState = value); }
-    public set dictationSuccess(value: boolean | undefined) { runInAction(() => this._dictationSuccessState = value); }
-    public set dictationOverlayVisible(value: boolean) { runInAction(() => this._dictationDisplayState = value); }
-    public set isListening(value: DictationManager.Controls.ListeningUIStatus) { runInAction(() => this._dictationListeningState = value); }
+    public set dictatedPhrase(value: string) {
+        runInAction(() => (this._dictationState = value));
+    }
+    public set dictationSuccess(value: boolean | undefined) {
+        runInAction(() => (this._dictationSuccessState = value));
+    }
+    public set dictationOverlayVisible(value: boolean) {
+        runInAction(() => (this._dictationDisplayState = value));
+    }
+    public set isListening(value: DictationManager.Controls.ListeningUIStatus) {
+        runInAction(() => (this._dictationListeningState = value));
+    }
 
     render() {
         const success = this.dictationSuccess;
         const result = this.isListening && !this.isListening.interim ? DictationManager.placeholder : `"${this.dictatedPhrase}"`;
         const dialogueBoxStyle = {
-            background: success === undefined ? "gainsboro" : success ? "lawngreen" : "red",
-            borderColor: this.isListening ? "red" : "black",
-            fontStyle: "italic"
+            background: success === undefined ? 'gainsboro' : success ? 'lawngreen' : 'red',
+            borderColor: this.isListening ? 'red' : 'black',
+            fontStyle: 'italic',
         };
         const overlayStyle = {
-            backgroundColor: this.isListening ? "red" : "darkslategrey"
+            backgroundColor: this.isListening ? 'red' : 'darkslategrey',
         };
-        return (<MainViewModal
-            contents={result}
-            isDisplayed={this.dictationOverlayVisible}
-            interactive={false}
-            dialogueBoxStyle={dialogueBoxStyle}
-            overlayStyle={overlayStyle}
-            closeOnExternalClick={this.initiateDictationFade}
-        />);
+        return <MainViewModal contents={result} isDisplayed={this.dictationOverlayVisible} interactive={false} dialogueBoxStyle={dialogueBoxStyle} overlayStyle={overlayStyle} closeOnExternalClick={this.initiateDictationFade} />;
     }
-}
\ No newline at end of file
+}