Merge branch 'react' into react

public/_locales/en/messages.json

@@ -510,5 +510,8 @@
     },
     "manualSkip": {
         "message": "Manual Skip"
+    },
+    "showOverlay": {
+        "message": "Show Overlay On Player"
     }
 }

src/components/CategorySkipOptionsComponent.tsx

@@ -1,6 +1,7 @@
 import * as React from "react";
 
 import Config from "../config"
+import { CategorySkipOption } from "../types";
 
 export interface CategorySkipOptionsProps { 
     category: string;
@@ -27,7 +28,17 @@ class CategorySkipOptionsComponent extends React.Component<CategorySkipOptionsPr
         // Set the default opton properly
         for (const categorySelection of Config.config.categorySelections) {
             if (categorySelection.name === this.props.category) {
-                defaultOption = categorySelection.autoSkip ? "autoSkip" : "manualSkip";
+                switch (categorySelection.option) {
+                    case CategorySkipOption.ShowOverlay:
+                        defaultOption = "showOverlay";
+                        break;
+                    case CategorySkipOption.ManualSkip:
+                        defaultOption = "manualSkip";
+                        break;
+                    case CategorySkipOption.AutoSkip:
+                        defaultOption = "autoSkip";
+                        break;
+                }
             }
         }
 
@@ -54,23 +65,35 @@ class CategorySkipOptionsComponent extends React.Component<CategorySkipOptionsPr
     }
 
     skipOptionSelected(event: React.ChangeEvent<HTMLSelectElement>): void {
-        switch (event.target.value) {
+        let option: CategorySkipOption;
-            case "disable": 
+
         this.removeCurrentCategorySelection();
 
+        switch (event.target.value) {
+            case "disable": 
+                return;
+            case "showOverlay":
+                option = CategorySkipOption.ShowOverlay;
+
                 break;
-            default:
+            case "manualSkip":
-                this.removeCurrentCategorySelection();
+                option = CategorySkipOption.ManualSkip;
+
+                break;
+            case "autoSkip":
+                option = CategorySkipOption.AutoSkip;
+
+                break;
+        }
 
         Config.config.categorySelections.push({
             name: this.props.category,
-                    autoSkip: event.target.value === "autoSkip"
+            option: option
         });
 
         // Forces the Proxy to send this to the chrome storage API
         Config.config.categorySelections = Config.config.categorySelections;
     }
-    }
 
     /** Removes this category from the config list of category selections */
     removeCurrentCategorySelection(): void {
@@ -89,8 +112,8 @@ class CategorySkipOptionsComponent extends React.Component<CategorySkipOptionsPr
 
     getCategorySkipOptions(): JSX.Element[] {
         let elements: JSX.Element[] = [];
-
+""
-        let optionNames = ["disable", "manualSkip", "autoSkip"];
+        let optionNames = ["disable", "showOverlay", "manualSkip", "autoSkip"];
 
         for (const optionName of optionNames) {
             elements.push(

src/config.ts

@@ -1,5 +1,5 @@
 import * as CompileConfig from "../config.json";
-import { CategorySelection } from "./types";
+import { CategorySelection, CategorySkipOption } from "./types";
 
 interface SBConfig {
     userID: string,
@@ -129,7 +129,7 @@ var Config: SBObject = {
         mobileUpdateShowCount: 0,
         categorySelections: [{
             name: "sponsor",
-            autoSkip: true
+            option: CategorySkipOption.AutoSkip
         }]
     },
     localConfig: null,

src/types.ts

@@ -26,13 +26,20 @@ interface VideoDurationResponse {
     duration: number;
 }
 
+enum CategorySkipOption {
+    ShowOverlay,
+    ManualSkip,
+    AutoSkip
+}
+
 interface CategorySelection {
     name: string;
-    autoSkip: boolean;
+    option: CategorySkipOption
 }
 
 export {
     VideoDurationResponse,
     ContentContainer,
+    CategorySkipOption,
     CategorySelection
 };