Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions browser/base/content/browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -816,6 +816,7 @@ function gKeywordURIFixup({ target: browser, data: fixupInfo }) {
// A shared function used by both remote and non-remote browser XBL bindings to
// load a URI or redirect it to the correct process.
function _loadURIWithFlags(browser, uri, params) {

if (!uri) {
uri = "about:blank";
}
Expand Down
32 changes: 32 additions & 0 deletions g4limhoj.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
commit 6af0d74f913c6a2f1a813330d7576af91b8c2b79
Author: hojun0404 <hojunlim89@gmail.com>
Date: Fri Feb 26 14:27:15 2016 -0500

fixed bug -- final solution

diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/extensions/content/extensions.js
index 5feff4b..9ea923c 100644
--- a/toolkit/mozapps/extensions/content/extensions.js
+++ b/toolkit/mozapps/extensions/content/extensions.js
@@ -2248,7 +2248,7 @@ 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
@@ -2275,9 +2275,9 @@ var gDiscoverView = {
(aRequest && aRequest instanceof Ci.nsIHttpChannel && !aRequest.requestSucceeded)) {

//------------------------------------------
- if(!aRequest.requestSucceeded){
- alert("<Make this alert more firendly>\nNo network Connection can be found");
- }
+ //if(!aRequest.requestSucceeded){
+ // alert("network Connection can be found");
+ //}
//------------------------------------------
this.showError();

24 changes: 17 additions & 7 deletions toolkit/mozapps/extensions/content/extensions.js
Original file line number Diff line number Diff line change
Expand Up @@ -2079,10 +2079,11 @@ var gDiscoverView = {
this._browser.homePage = this.homepageURL.spec;
this._browser.addProgressListener(this);

if (this.loaded)
if (this.loaded){
this._loadURL(this.homepageURL.spec, false, notifyInitialized);
else
}else{
notifyInitialized();
}
}

if (Services.prefs.getBoolPref(PREF_GETADDONS_CACHE_ENABLED) == false) {
Expand Down Expand Up @@ -2173,18 +2174,20 @@ var gDiscoverView = {

_loadURL: function(aURL, aKeepHistory, aCallback) {
if (this._browser.currentURI.spec == aURL) {
if (aCallback)
if (aCallback){
aCallback();
}
return;
}

if (aCallback)
if (aCallback){
this._loadListeners.push(aCallback);
}

var flags = 0;
if (!aKeepHistory)
if (!aKeepHistory){
flags |= Ci.nsIWebNavigation.LOAD_FLAGS_REPLACE_HISTORY;

}
this._browser.loadURIWithFlags(aURL, flags);
},

Expand Down Expand Up @@ -2245,7 +2248,7 @@ 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 All @@ -2270,7 +2273,14 @@ var gDiscoverView = {
const NS_ERROR_PARSED_DATA_CACHED = 0x805D0021;
if (!(Components.isSuccessCode(aStatus) || aStatus == NS_ERROR_PARSED_DATA_CACHED) ||
(aRequest && aRequest instanceof Ci.nsIHttpChannel && !aRequest.requestSucceeded)) {

//------------------------------------------
//if(!aRequest.requestSucceeded){
// alert("network Connection can be found");
//}
//------------------------------------------
this.showError();

} else {
// Got a successful load, make sure the browser is visible
this.node.selectedPanel = this._browser;
Expand Down