Add ability to close blank tab after redirection

_locales/en/messages.json

@@ -11,6 +11,7 @@
  "config_onlyMainFrame_label": { "message": "Only check URL which is shown in location bar" },
  "config_forceielist_caption": { "message": "Websites to be opened by IE always" },
  "config_disableForce_label": { "message": "Disable" },
+ "config_closeReloadPage_label": { "message": "Close blank tab left after redirection" },
  "config_sitesOpenedBySelf_caption": { "message": "Exceptive websites (opened in Firefox directly)" },
  "config_disableException_label": { "message": "Disable" },
  "config_ignoreQueryString_label": { "message": "Ignore query string in URL" },

_locales/ja/messages.json

@@ -11,6 +11,7 @@
  "config_onlyMainFrame_label": { "message": "アドレスバーに表示されるURLのみを判定する" },
  "config_forceielist_caption": { "message": "Internet Explorerで常に開くWebサイト" },
  "config_disableForce_label": { "message": "無効化" },
+ "config_closeReloadPage_label": { "message": "リダイレクト後に残された空のタブを閉じる" },
  "config_sitesOpenedBySelf_caption": { "message": "IEで開く対象から除外する(Firefoxで直接開く)サイト" },
  "config_disableException_label": { "message": "無効化" },
  "config_ignoreQueryString_label": { "message": "URLの?以降を無視する" },

background.js

@@ -86,6 +86,11 @@ function onBeforeRequest(aDetails) {
  }
  if (redirected) {
  launch(aDetails.url);
+ if (configs.closeReloadPage &&
+ gOpeningTabs.has(aDetails.tabId)) {
+ gOpeningTabs.delete(aDetails.tabId);
+ browser.tabs.remove(aDetails.tabId);
+ }
  }
  else {
  log('url is not redirected: ', aDetails.url);
@@ -193,6 +198,8 @@ function matchPatternToRegExp(pattern) {
  return new RegExp(regex);
 }
 
+var gOpeningTabs = new Map();
+
 (async () => {
  await configs.$load();
  await applyMCDConfigs();
@@ -212,6 +219,18 @@ function matchPatternToRegExp(pattern) {
  setSitesOpenedBySelf();
 
  configs.$addObserver(onConfigUpdated);
+
+
+ browser.tabs.onCreated.addListener(aTab => {
+ gOpeningTabs.set(aTab.id, true);
+ });
+ browser.tabs.onUpdated.addListener((aTabId, aChangeInfo, aTab) => {
+ if (aChangeInfo.status == 'complete' ||
+ (aChangeInfo.url &&
+ !/^(about:(blank|newtab|home))$/.test(aChangeInfo.url))) {
+ gOpeningTabs.delete(aTabId);
+ }
+ });
 })();
 
 async function applyMCDConfigs() {

common/common.js

@@ -27,6 +27,7 @@ configs = new Configs({
  ieargs : '',
  forceielist : '',
  disableForce : false,
+ closeReloadPage : true,
  contextMenu : true,
  onlyMainFrame : true,
  ignoreQueryString : false,

host/host.go

@@ -196,6 +196,7 @@ type SendMCDConfigsResponse struct {
  IEArgs string `json:"ieargs,omitempty"`
  ForceIEList string `json:"forceielist,omitempty"`
  DisableForce bool `json:"disableForce"`
+ CloseReloadPage bool `json:"closeReloadPage"`
  ContextMenu bool `json:"contextMenu"`
  OnlyMainFrame bool `json:"onlyMainFrame"`
  SitesOpenedBySelf string `json:"sitesOpenedBySelf,omitempty"`
@@ -238,6 +239,12 @@ func SendMCDConfigs() {
  } else {
  LogForDebug("Failed to read extensions.ieview.disableForce.\n" + err.Error())
  }
+ closeReloadPage, err := configs.GetBooleanValue("extensions.ieview.closeReloadPage")
+ if err == nil {
+ response.CloseReloadPage = closeReloadPage
+ } else {
+ LogForDebug("Failed to read extensions.ieview.closeReloadPage.\n" + err.Error())
+ }
  sitesOpenedBySelf, err := configs.GetStringValue("extensions.ieview.sitesOpenedBySelf")
  if err == nil {
  response.SitesOpenedBySelf = sitesOpenedBySelf

manifest.json

@@ -7,6 +7,7 @@
  "contextMenus",
  "nativeMessaging",
  "storage",
+ "tabs",
  "webRequest",
  "webRequestBlocking",
  "<all_urls>"

options/options.html

@@ -33,7 +33,6 @@
  <label><input id="ignoreQueryString"
  type="checkbox">
  __MSG_config_ignoreQueryString_label__</label></p>
- <br />
  <textarea id="forceielist"
  rows="10"
  cols="45"></textarea></div>
@@ -45,6 +44,9 @@
  <textarea id="sitesOpenedBySelf"
  rows="10"
  cols="45"></textarea></div>
+ <p><label><input id="closeReloadPage"
+ type="checkbox">
+ __MSG_config_closeReloadPage_label__</label></p>
  <hr>
  <p><label><input id="logging"
  type="checkbox">