Merge upstream 0.6.3

options.js

@@ -6,6 +6,7 @@ var tcDefaults = {
   rememberSpeed: false, // default: false
   audioBoolean: false, // default: false
   startHidden: false, // default: false
+  forceLastSavedSpeed: false, //default: false
   enabled: true, // default enabled
   controllerOpacity: 0.3, // default: 0.3
   keyBindings: [
@@ -17,8 +18,7 @@ var tcDefaults = {
     { action: "reset", key: 82, value: 1, force: false, predefined: true }, // R
     { action: "fast", key: 71, value: 1.8, force: false, predefined: true } // G
   ],
-  blacklist:
-   `www.instagram.com
+  blacklist: `www.instagram.com
     twitter.com
     imgur.com
     teams.microsoft.com
@@ -186,7 +186,7 @@ function validate() {
   document
     .getElementById("blacklist")
     .value.split("\n")
-    .forEach(match => {
+    .forEach((match) => {
       match = match.replace(regStrip, "");
       if (match.startsWith("/")) {
         try {
@@ -208,11 +208,12 @@ function save_options() {
     return;
   }
   keyBindings = [];
-  Array.from(document.querySelectorAll(".customs")).forEach(item =>
+  Array.from(document.querySelectorAll(".customs")).forEach((item) =>
     createKeyBindings(item)
   ); // Remove added shortcuts
 
   var rememberSpeed = document.getElementById("rememberSpeed").checked;
+  var forceLastSavedSpeed = document.getElementById("forceLastSavedSpeed").checked;
   var audioBoolean = document.getElementById("audioBoolean").checked;
   var enabled = document.getElementById("enabled").checked;
   var startHidden = document.getElementById("startHidden").checked;
@@ -235,6 +236,7 @@ function save_options() {
   chrome.storage.sync.set(
     {
       rememberSpeed: rememberSpeed,
+      forceLastSavedSpeed: forceLastSavedSpeed,
       audioBoolean: audioBoolean,
       enabled: enabled,
       startHidden: startHidden,
@@ -242,11 +244,11 @@ function save_options() {
       keyBindings: keyBindings,
       blacklist: blacklist.replace(regStrip, "")
     },
-    function() {
+    function () {
       // Update status to let user know options were saved.
       var status = document.getElementById("status");
       status.textContent = "Options saved";
-      setTimeout(function() {
+      setTimeout(function () {
         status.textContent = "";
       }, 1000);
     }
@@ -255,8 +257,9 @@ function save_options() {
 
 // Restores options from chrome.storage
 function restore_options() {
-  chrome.storage.sync.get(tcDefaults, function(storage) {
+  chrome.storage.sync.get(tcDefaults, function (storage) {
     document.getElementById("rememberSpeed").checked = storage.rememberSpeed;
+    document.getElementById("forceLastSavedSpeed").checked = storage.forceLastSavedSpeed;
     document.getElementById("audioBoolean").checked = storage.audioBoolean;
     document.getElementById("enabled").checked = storage.enabled;
     document.getElementById("startHidden").checked = storage.startHidden;
@@ -265,7 +268,7 @@ function restore_options() {
     document.getElementById("blacklist").value = storage.blacklist;
 
     // ensure that there is a "display" binding for upgrades from versions that had it as a separate binding
-    if (storage.keyBindings.filter(x => x.action == "display").length == 0) {
+    if (storage.keyBindings.filter((x) => x.action == "display").length == 0) {
       storage.keyBindings.push({
         action: "display",
         value: 0,
@@ -317,15 +320,15 @@ function restore_options() {
 }
 
 function restore_defaults() {
-  chrome.storage.sync.set(tcDefaults, function() {
+  chrome.storage.sync.set(tcDefaults, function () {
     restore_options();
     document
       .querySelectorAll(".removeParent")
-      .forEach(button => button.click()); // Remove added shortcuts
+      .forEach((button) => button.click()); // Remove added shortcuts
     // Update status to let user know options were saved.
     var status = document.getElementById("status");
     status.textContent = "Default options restored";
-    setTimeout(function() {
+    setTimeout(function () {
       status.textContent = "";
     }, 1000);
   });
@@ -334,10 +337,10 @@ function restore_defaults() {
 function show_experimental() {
   document
     .querySelectorAll(".customForce")
-    .forEach(item => (item.style.display = "inline-block"));
+    .forEach((item) => (item.style.display = "inline-block"));
 }
 
-document.addEventListener("DOMContentLoaded", function() {
+document.addEventListener("DOMContentLoaded", function () {
   restore_options();
 
   document.getElementById("save").addEventListener("click", save_options);
@@ -356,25 +359,25 @@ document.addEventListener("DOMContentLoaded", function() {
     funcName(event);
   }
 
-  document.addEventListener("keypress", event => {
+  document.addEventListener("keypress", (event) => {
     eventCaller(event, "customValue", inputFilterNumbersOnly);
   });
-  document.addEventListener("focus", event => {
+  document.addEventListener("focus", (event) => {
     eventCaller(event, "customKey", inputFocus);
   });
-  document.addEventListener("blur", event => {
+  document.addEventListener("blur", (event) => {
     eventCaller(event, "customKey", inputBlur);
   });
-  document.addEventListener("keydown", event => {
+  document.addEventListener("keydown", (event) => {
     eventCaller(event, "customKey", recordKeyPress);
   });
-  document.addEventListener("click", event => {
-    eventCaller(event, "removeParent", function() {
+  document.addEventListener("click", (event) => {
+    eventCaller(event, "removeParent", function () {
       event.target.parentNode.remove();
     });
   });
-  document.addEventListener("change", event => {
-    eventCaller(event, "customDo", function() {
+  document.addEventListener("change", (event) => {
+    eventCaller(event, "customDo", function () {
       if (customActionsNoValues.includes(event.target.value)) {
         event.target.nextElementSibling.nextElementSibling.disabled = true;
         event.target.nextElementSibling.nextElementSibling.value = 0;