close popup when opening new tabs (from options page)

Author: ken107

js/options.js

@@ -1,4 +1,6 @@
 
+var queryString = getQueryString();
+
 Promise.all([
   getVoices(),
   getSettings(),
@@ -12,7 +14,6 @@ function initialize(allVoices, settings, acceptLangs) {
   updateDependents(settings);
 
   //close button
-  var queryString = getQueryString();
   if (queryString.referer) {
     $("button.close").show()
       .click(function() {
@@ -25,7 +26,7 @@ function initialize(allVoices, settings, acceptLangs) {
     .click(function() {
       getAuthToken({interactive: true})
         .then(function(token) {
-          brapi.tabs.create({url: config.webAppUrl + "/premium-voices.html?t=" + token});
+          createTabAndClosePopup({url: config.webAppUrl + "/premium-voices.html?t=" + token});
         })
         .catch(handleError)
       return false;
@@ -67,14 +68,13 @@ function initialize(allVoices, settings, acceptLangs) {
     .val(settings.voiceName || "")
     .change(function() {
       var voiceName = $(this).val();
-      if (voiceName == "@custom") brapi.tabs.create({url: "custom-voices.html"});
-      else if (voiceName == "@languages") brapi.tabs.create({url: "languages.html"});
-      else if (voiceName == "@premium") brapi.tabs.create({url: "premium-voices.html"});
+      if (voiceName == "@custom") createTabAndClosePopup({url: "custom-voices.html"});
+      else if (voiceName == "@languages") createTabAndClosePopup({url: "languages.html"});
       else if (voiceName == "@piper") bgPageInvoke("managePiperVoices")
       else saveSettings({voiceName: voiceName});
     });
   $("#languages-edit-button").click(function() {
-    brapi.tabs.create({url: "languages.html"});
+    createTabAndClosePopup({url: "languages.html"});
   })
 
 
@@ -161,7 +161,7 @@ function initialize(allVoices, settings, acceptLangs) {
 
   //hot key
   $("#hotkeys-link").click(function() {
-    brapi.tabs.create({url: getHotkeySettingsUrl()});
+    createTabAndClosePopup({url: getHotkeySettingsUrl()});
   });
 }
 
@@ -348,8 +348,9 @@ function handleError(err) {
             })
           break;
         case "#auth-wavenet":
-          createTab(brapi.runtime.getURL("firefox-perm.html") + "?perms=" + encodeURIComponent(JSON.stringify(config.wavenetPerms)) + "&then=auth-wavenet")
-            .then(() => window.close())
+          createTabAndClosePopup({
+            url: "firefox-perm.html?perms=" + encodeURIComponent(JSON.stringify(config.wavenetPerms)) + "&then=auth-wavenet"
+          })
           break;
         case "#user-gesture":
           getBackgroundPage()
@@ -379,6 +380,14 @@ function showAccountInfo(account) {
   }
 }
 
+function createTabAndClosePopup(opts) {
+  brapi.tabs.create(opts)
+    .then(() => {
+      if (queryString.popup) window.close()
+    })
+    .catch(handleError)
+}
+
 
 
 function createSlider(elem, defaultValue, onChange, onSlideChange) {

js/popup.js

@@ -245,7 +245,7 @@ function onStop() {
 }
 
 function onSettings() {
-  location.href = "options.html?referer=popup.html";
+  location.href = "options.html?popup=true&referer=popup.html";
 }
 
 function onForward() {