summaryrefslogtreecommitdiffstats
path: root/application/basilisk/base
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-09-27 09:05:25 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-09-27 09:05:25 +0200
commitfbaab39c94a047f2a0b0bfbe6cf24a790cd7e8b5 (patch)
tree7b0e57d393cb08a895973cab2d2072cb2b93a77f /application/basilisk/base
parent580084e9e1d0355c96a54a9641df6c1fee894948 (diff)
parente3508f55bed8a463d298021633dbc7d079c9d764 (diff)
downloadUXP-fbaab39c94a047f2a0b0bfbe6cf24a790cd7e8b5.tar
UXP-fbaab39c94a047f2a0b0bfbe6cf24a790cd7e8b5.tar.gz
UXP-fbaab39c94a047f2a0b0bfbe6cf24a790cd7e8b5.tar.lz
UXP-fbaab39c94a047f2a0b0bfbe6cf24a790cd7e8b5.tar.xz
UXP-fbaab39c94a047f2a0b0bfbe6cf24a790cd7e8b5.zip
Merge branch 'master' into Basilisk-release
Diffstat (limited to 'application/basilisk/base')
-rw-r--r--application/basilisk/base/content/tabbrowser.xml13
1 files changed, 12 insertions, 1 deletions
diff --git a/application/basilisk/base/content/tabbrowser.xml b/application/basilisk/base/content/tabbrowser.xml
index 76ea5d167..043838020 100644
--- a/application/basilisk/base/content/tabbrowser.xml
+++ b/application/basilisk/base/content/tabbrowser.xml
@@ -2101,6 +2101,7 @@
var aRelatedBrowser;
var aOriginPrincipal;
var aOpener;
+ var aSkipBackgroundNotify;
if (arguments.length == 2 &&
typeof arguments[1] == "object" &&
!(arguments[1] instanceof Ci.nsIURI)) {
@@ -2123,6 +2124,7 @@
aRelatedBrowser = params.relatedBrowser;
aOriginPrincipal = params.originPrincipal;
aOpener = params.opener;
+ aSkipBackgroundNotify = params.skipBackgroundNotify;
}
// if we're adding tabs, we're past interrupt mode, ditch the owner
@@ -2151,6 +2153,11 @@
t.setAttribute("crop", "end");
t.setAttribute("onerror", "this.removeAttribute('image');");
+
+ if (aSkipBackgroundNotify) {
+ t.setAttribute("skipbackgroundnotify", true);
+ }
+
t.className = "tabbrowser-tab";
this.tabContainer._unlockTabSizing();
@@ -5932,7 +5939,11 @@
this._fillTrailingGap();
this._handleTabSelect();
} else {
- this._notifyBackgroundTab(tab);
+ if (tab.hasAttribute("skipbackgroundnotify")) {
+ tab.removeAttribute("skipbackgroundnotify");
+ } else {
+ this._notifyBackgroundTab(tab);
+ }
}
// XXXmano: this is a temporary workaround for bug 345399