diff --git a/b2g/components/HelperAppDialog.js b/b2g/components/HelperAppDialog.js
index cc5288acee39..6a7bb79ce8d6 100644
--- a/b2g/components/HelperAppDialog.js
+++ b/b2g/components/HelperAppDialog.js
@@ -33,14 +33,6 @@ HelperAppLauncherDialog.prototype = {
aLauncher.saveToDisk(null, false);
},
- promptForSaveToFile: function(aLauncher,
- aContext,
- aDefaultFile,
- aSuggestedFileExt,
- aForcePrompt) {
- throw Cr.NS_ERROR_NOT_AVAILABLE;
- },
-
promptForSaveToFileAsync: function(aLauncher,
aContext,
aDefaultFile,
diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index fd4c78216370..591762709d77 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
-
+
@@ -136,7 +136,7 @@
-
+
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 4551839254aa..5281141a4bea 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
-
+
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index d680736e1d78..9ed035d77ce7 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index f0906c80a1b1..65e88ba631a3 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 4551839254aa..5281141a4bea 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
-
+
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 690380b21252..509876285778 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 9bc41c551cf0..41552254402d 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index a2204dab917f..1b49e38c6b69 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
{
"git": {
- "git_revision": "1d53fb07984298253aad64bfa4236b7167ee3d4d",
+ "git_revision": "ba613ae583a706131c45e885f65d428d4a541a81",
"remote": "https://git.mozilla.org/releases/gaia.git",
"branch": ""
},
- "revision": "08a288892d8f0b41a960104150fba34f113629e6",
+ "revision": "4705c493adb5c766382b27e4fbff42f7447900e9",
"repo_path": "integration/gaia-central"
}
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index ba09b583dc6b..fcae18349133 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 5db023b1943b..81562ebef1f2 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 5b3132247d4e..6b3ba21fa267 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 6957beb3a3f3..cfe4afd1e979 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/browser/base/content/aboutNetError.xhtml b/browser/base/content/aboutNetError.xhtml
index bfaa301c4bc5..d085b256b267 100644
--- a/browser/base/content/aboutNetError.xhtml
+++ b/browser/base/content/aboutNetError.xhtml
@@ -217,9 +217,15 @@
}
window.addEventListener("AboutNetErrorOptions", function(evt) {
- // Pinning errors are of type nssFailure2 (don't ask me why)
+ // Pinning errors are of type nssFailure2
if (getErrorCode() == "nssFailure2" && !errTitle.hasAttribute("sslv3")) {
- // TODO: and the pref is set...
+ var learnMoreLink = document.getElementById("learnMoreLink");
+ // nssFailure2 also gets us other non-overrideable errors. Choose
+ // a "learn more" link based on description:
+ if (getDescription().contains("mozilla_pkix_error_key_pinning_failure")) {
+ learnMoreLink.href = "https://support.mozilla.org/kb/certificate-pinning-reports";
+ }
+
var options = JSON.parse(evt.detail);
if (options && options.enabled) {
var checkbox = document.getElementById('automaticallyReportInFuture');
@@ -476,8 +482,7 @@
-
- &errorReporting.learnMore;
+ &errorReporting.learnMore;
diff --git a/browser/base/content/urlbarBindings.xml b/browser/base/content/urlbarBindings.xml
index 9acd3bb9e564..2d721e961e4c 100644
--- a/browser/base/content/urlbarBindings.xml
+++ b/browser/base/content/urlbarBindings.xml
@@ -1268,6 +1268,9 @@
onSuccess: function(engine) {
event.target.hidePopup();
BrowserSearch.searchBar.openSuggestionsPanel();
+ },
+ onError: function(errorCode) {
+ Components.utils.reportError("Error adding search engine: " + errorCode);
}
}
Services.search.addEngine(target.getAttribute("uri"),
diff --git a/browser/components/loop/content/libs/l10n.js b/browser/components/loop/content/libs/l10n.js
index b3eaa63b8b67..8429fcfaaff0 100644
--- a/browser/components/loop/content/libs/l10n.js
+++ b/browser/components/loop/content/libs/l10n.js
@@ -40,7 +40,6 @@
function translateString(key, args, fallback) {
if (args && args.num) {
var num = args && args.num;
- delete args.num;
}
var data = getL10nData(key, num);
if (!data && fallback)
diff --git a/browser/components/loop/test/desktop-local/index.html b/browser/components/loop/test/desktop-local/index.html
index 030e8b5ba79b..36e87793f00d 100644
--- a/browser/components/loop/test/desktop-local/index.html
+++ b/browser/components/loop/test/desktop-local/index.html
@@ -73,6 +73,7 @@
+
+