diff --git a/.eslintignore b/.eslintignore
index d915c4f4e62a..44a937a19187 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,10 +1,6 @@
# Always ignore node_modules.
**/node_modules/**/*.*
-# Include these to speed up ESLint, see bug 1347906.
-.hg
-.git
-
# Exclude expected objdirs.
obj*/**
diff --git a/browser/base/content/aboutNetError.xhtml b/browser/base/content/aboutNetError.xhtml
index 6acf6a4b97b5..a60abe57516d 100644
--- a/browser/base/content/aboutNetError.xhtml
+++ b/browser/base/content/aboutNetError.xhtml
@@ -630,7 +630,7 @@
init for other error types .-->
diff --git a/browser/base/content/aboutTabCrashed.xhtml b/browser/base/content/aboutTabCrashed.xhtml
index dd3b5ca770f4..185abb0004af 100644
--- a/browser/base/content/aboutTabCrashed.xhtml
+++ b/browser/base/content/aboutTabCrashed.xhtml
@@ -49,7 +49,7 @@
&tabCrashed.requestReport;
-
+
@@ -59,13 +59,13 @@
-
+
-
+
@@ -75,7 +75,7 @@
diff --git a/browser/base/content/browser-context.inc b/browser/base/content/browser-context.inc
index 51b14d15237d..bfd206dede39 100644
--- a/browser/base/content/browser-context.inc
+++ b/browser/base/content/browser-context.inc
@@ -21,13 +21,13 @@
onclick="checkForMiddleClick(this, event);"/>
@@ -791,11 +791,11 @@
class="chromeclass-toolbar-additional"
command="Browser:ReloadOrDuplicate"
onclick="checkForMiddleClick(this, event);"
- tooltiptext="&reloadButton.tooltip;"/>
+ tooltip="dynamic-shortcut-tooltip"/>
+ tooltip="dynamic-shortcut-tooltip"/>
diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index eb6134cd7c7e..8217598084d5 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -2194,6 +2194,7 @@
var aDisallowInheritPrincipal;
var aOpener;
var aCreateLazyBrowser;
+ var aSkipBackgroundNotify;
if (arguments.length == 2 &&
typeof arguments[1] == "object" &&
!(arguments[1] instanceof Ci.nsIURI)) {
@@ -2220,6 +2221,7 @@
aOpener = params.opener;
aIsPrerendered = params.isPrerendered;
aCreateLazyBrowser = params.createLazyBrowser;
+ aSkipBackgroundNotify = params.skipBackgroundNotify;
}
// if we're adding tabs, we're past interrupt mode, ditch the owner
@@ -2254,6 +2256,11 @@
}
t.setAttribute("onerror", "this.removeAttribute('image');");
+
+ if (aSkipBackgroundNotify) {
+ t.setAttribute("skipbackgroundnotify", true);
+ }
+
t.className = "tabbrowser-tab";
this.tabContainer._unlockTabSizing();
@@ -2656,12 +2663,11 @@
!aSkipPermitUnload &&
aTab.linkedPanel &&
!aAdoptedByTab) {
+ TelemetryStopwatch.start("FX_TAB_CLOSE_PERMIT_UNLOAD_TIME_MS", aTab);
+
// We need to block while calling permitUnload() because it
// processes the event queue and may lead to another removeTab()
// call before permitUnload() returns.
-
- TelemetryStopwatch.start("FX_TAB_CLOSE_PERMIT_UNLOAD_TIME_MS", aTab);
-
aTab._pendingPermitUnload = true;
let {permitUnload, timedOut} = browser.permitUnload();
delete aTab._pendingPermitUnload;
@@ -2672,8 +2678,6 @@
// so we don't (try to) close the same tab again. Of course, we
// also stop if the unload was cancelled by the user:
if (aTab.closing || (!timedOut && !permitUnload)) {
- // NB: deliberately keep the _closedDuringPermitUnload set to
- // true so we keep exiting early in case of multiple calls.
return false;
}
}
@@ -6313,10 +6317,10 @@
selected.left - scrollRect.left);
}
- if (!this._animateElement.hasAttribute("notifybgtab")) {
- this._animateElement.setAttribute("notifybgtab", "true");
+ if (!this._animateElement.hasAttribute("highlight")) {
+ this._animateElement.setAttribute("highlight", "true");
setTimeout(function(ele) {
- ele.removeAttribute("notifybgtab");
+ ele.removeAttribute("highlight");
}, 150, this._animateElement);
}
]]>