From 1392d9815780993cfb82a5b847d402709d7dbb8e Mon Sep 17 00:00:00 2001 From: Faith Magcalas Date: Fri, 29 Jan 2016 12:57:01 -0500 Subject: [PATCH 1/3] Assignment 2 greeting --- browser/app/nsBrowserApp.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/browser/app/nsBrowserApp.cpp b/browser/app/nsBrowserApp.cpp index fc65ce5201aca..cef78ec384620 100644 --- a/browser/app/nsBrowserApp.cpp +++ b/browser/app/nsBrowserApp.cpp @@ -285,7 +285,8 @@ sizeof(XPCOM_DLL) - 1)) int main(int argc, char* argv[]) { - mozilla::TimeStamp start = mozilla::TimeStamp::Now(); +fprintf(stderr, "hello faith\n"); + mozilla::TimeStamp start = mozilla::TimeStamp::Now(); #ifdef XP_MACOSX TriggerQuirks(); From 3ed12ac2026dc275c45819c33ac7e616127a54e7 Mon Sep 17 00:00:00 2001 From: Faith Magcalas Date: Thu, 25 Feb 2016 22:11:21 -0500 Subject: [PATCH 2/3] Bug 1219495 - Change condition of if statement to prevent selectedPanel from switching to _browser from _error. --- toolkit/mozapps/extensions/content/extensions.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/extensions/content/extensions.js index 1c1fa5fff0403..98bb1c70b61ed 100644 --- a/toolkit/mozapps/extensions/content/extensions.js +++ b/toolkit/mozapps/extensions/content/extensions.js @@ -2245,7 +2245,8 @@ var gDiscoverView = { Ci.nsIWebProgressListener.STATE_IS_REQUEST | Ci.nsIWebProgressListener.STATE_TRANSFERRING; // Once transferring begins show the content - if (aStateFlags & transferStart) + if ((aStateFlags & transferStart) && + (this.node.selectedPanel != this._error)) this.node.selectedPanel = this._browser; // Only care about the network events From d8897dc8f93e3f1a5f3b1e4267792da0d80e01e8 Mon Sep 17 00:00:00 2001 From: Faith Magcalas Date: Fri, 26 Feb 2016 00:00:58 -0500 Subject: [PATCH 3/3] gfb patch --- browser/app/nsBrowserApp.cpp | 3 +-- .../mozapps/extensions/content/1219495.patch | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 toolkit/mozapps/extensions/content/1219495.patch diff --git a/browser/app/nsBrowserApp.cpp b/browser/app/nsBrowserApp.cpp index cef78ec384620..fc65ce5201aca 100644 --- a/browser/app/nsBrowserApp.cpp +++ b/browser/app/nsBrowserApp.cpp @@ -285,8 +285,7 @@ sizeof(XPCOM_DLL) - 1)) int main(int argc, char* argv[]) { -fprintf(stderr, "hello faith\n"); - mozilla::TimeStamp start = mozilla::TimeStamp::Now(); + mozilla::TimeStamp start = mozilla::TimeStamp::Now(); #ifdef XP_MACOSX TriggerQuirks(); diff --git a/toolkit/mozapps/extensions/content/1219495.patch b/toolkit/mozapps/extensions/content/1219495.patch new file mode 100644 index 0000000000000..db483b7e1fda2 --- /dev/null +++ b/toolkit/mozapps/extensions/content/1219495.patch @@ -0,0 +1,21 @@ +# HG changeset patch +# User Faith Magcalas + +Bug 1219495 - Change condition of if statement to prevent selectedPanel from switching to _browser from _error. + + +diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/extensions/content/extensions.js +index 1c1fa5f..98bb1c7 100644 +--- a/toolkit/mozapps/extensions/content/extensions.js ++++ b/toolkit/mozapps/extensions/content/extensions.js +@@ -2245,7 +2245,8 @@ var gDiscoverView = { + Ci.nsIWebProgressListener.STATE_IS_REQUEST | + Ci.nsIWebProgressListener.STATE_TRANSFERRING; + // Once transferring begins show the content +- if (aStateFlags & transferStart) ++ if ((aStateFlags & transferStart) && ++ (this.node.selectedPanel != this._error)) + this.node.selectedPanel = this._browser; + + // Only care about the network events +