Skip to content

A3 #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
squirrelsbelike wants to merge 3 commits into
base: master
Choose a base branch
from
Open

A3 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1392d98
Assignment 2 greeting
squirrelsbelike Jan 29, 2016
3ed12ac
Bug 1219495 - Change condition of if statement to prevent selectedPan…
squirrelsbelike Feb 26, 2016
d8897dc
gfb patch
squirrelsbelike Feb 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions toolkit/mozapps/extensions/content/1219495.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# HG changeset patch
# User Faith Magcalas <doobydoobydoobah@gmail.com>

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

3 changes: 2 additions & 1 deletion toolkit/mozapps/extensions/content/extensions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down