[Pale-Moon] Issue #1737 - Part 3: Clean up base/content p.3

This commit is contained in:
Pale Moon 2020-03-10 17:19:36 +01:00 • committed by Roy Tam
commit 6c51c7704a
9 changed files with 833 additions and 836 deletions

View file

@ -7,96 +7,91 @@ const NS_ERROR_MODULE_NETWORK = 2152398848;
const NS_NET_STATUS_READ_FROM = NS_ERROR_MODULE_NETWORK + 8;
const NS_NET_STATUS_WROTE_TO = NS_ERROR_MODULE_NETWORK + 9;
function getPanelBrowser()
{
return document.getElementById("web-panels-browser");
function getPanelBrowser() {
return document.getElementById("web-panels-browser");
}
var panelProgressListener = {
onProgressChange : function (aWebProgress, aRequest,
aCurSelfProgress, aMaxSelfProgress,
aCurTotalProgress, aMaxTotalProgress) {
},
onProgressChange: function (aWebProgress, aRequest,
aCurSelfProgress, aMaxSelfProgress,
aCurTotalProgress, aMaxTotalProgress) {
},
onStateChange : function(aWebProgress, aRequest, aStateFlags, aStatus)
{
if (!aRequest)
return;
//ignore local/resource:/chrome: files
if (aStatus == NS_NET_STATUS_READ_FROM || aStatus == NS_NET_STATUS_WROTE_TO)
return;
if (aStateFlags & Ci.nsIWebProgressListener.STATE_START &&
aStateFlags & Ci.nsIWebProgressListener.STATE_IS_NETWORK) {
window.parent.document.getElementById('sidebar-throbber').setAttribute("loading", "true");
}
else if (aStateFlags & Ci.nsIWebProgressListener.STATE_STOP &&
aStateFlags & Ci.nsIWebProgressListener.STATE_IS_NETWORK) {
window.parent.document.getElementById('sidebar-throbber').removeAttribute("loading");
}
},
onLocationChange : function(aWebProgress, aRequest, aLocation, aFlags) {
UpdateBackForwardCommands(getPanelBrowser().webNavigation);
},
onStatusChange : function(aWebProgress, aRequest, aStatus, aMessage) {
},
onSecurityChange : function(aWebProgress, aRequest, aState) {
},
QueryInterface : function(aIID)
{
if (aIID.equals(Ci.nsIWebProgressListener) ||
aIID.equals(Ci.nsISupportsWeakReference) ||
aIID.equals(Ci.nsISupports))
return this;
throw Cr.NS_NOINTERFACE;
onStateChange: function(aWebProgress, aRequest, aStateFlags, aStatus) {
if (!aRequest) {
return;
}
//ignore local/resource:/chrome: files
if (aStatus == NS_NET_STATUS_READ_FROM || aStatus == NS_NET_STATUS_WROTE_TO) {
return;
}
if (aStateFlags & Ci.nsIWebProgressListener.STATE_START &&
aStateFlags & Ci.nsIWebProgressListener.STATE_IS_NETWORK) {
window.parent.document.getElementById('sidebar-throbber').setAttribute("loading", "true");
} else if (aStateFlags & Ci.nsIWebProgressListener.STATE_STOP &&
aStateFlags & Ci.nsIWebProgressListener.STATE_IS_NETWORK) {
window.parent.document.getElementById('sidebar-throbber').removeAttribute("loading");
}
},
onLocationChange: function(aWebProgress, aRequest, aLocation, aFlags) {
UpdateBackForwardCommands(getPanelBrowser().webNavigation);
},
onStatusChange: function(aWebProgress, aRequest, aStatus, aMessage) {
},
onSecurityChange: function(aWebProgress, aRequest, aState) {
},
QueryInterface: function(aIID) {
if (aIID.equals(Ci.nsIWebProgressListener) ||
aIID.equals(Ci.nsISupportsWeakReference) ||
aIID.equals(Ci.nsISupports)) {
return this;
}
throw Cr.NS_NOINTERFACE;
}
};
var gLoadFired = false;
function loadWebPanel(aURI) {
var panelBrowser = getPanelBrowser();
if (gLoadFired) {
panelBrowser.webNavigation
.loadURI(aURI, nsIWebNavigation.LOAD_FLAGS_NONE,
null, null, null);
}
panelBrowser.setAttribute("cachedurl", aURI);
var panelBrowser = getPanelBrowser();
if (gLoadFired) {
panelBrowser.webNavigation
.loadURI(aURI, nsIWebNavigation.LOAD_FLAGS_NONE,
null, null, null);
}
panelBrowser.setAttribute("cachedurl", aURI);
}
function load()
{
var panelBrowser = getPanelBrowser();
panelBrowser.webProgress.addProgressListener(panelProgressListener,
Ci.nsIWebProgress.NOTIFY_ALL);
var cachedurl = panelBrowser.getAttribute("cachedurl")
if (cachedurl) {
panelBrowser.webNavigation
.loadURI(cachedurl, nsIWebNavigation.LOAD_FLAGS_NONE, null,
null, null);
}
function load() {
var panelBrowser = getPanelBrowser();
panelBrowser.webProgress.addProgressListener(panelProgressListener,
Ci.nsIWebProgress.NOTIFY_ALL);
var cachedurl = panelBrowser.getAttribute("cachedurl")
if (cachedurl) {
panelBrowser.webNavigation
.loadURI(cachedurl, nsIWebNavigation.LOAD_FLAGS_NONE, null,
null, null);
}
gLoadFired = true;
gLoadFired = true;
}
function unload()
{
getPanelBrowser().webProgress.removeProgressListener(panelProgressListener);
function unload() {
getPanelBrowser().webProgress.removeProgressListener(panelProgressListener);
}
function PanelBrowserStop()
{
getPanelBrowser().webNavigation.stop(nsIWebNavigation.STOP_ALL)
function PanelBrowserStop() {
getPanelBrowser().webNavigation.stop(nsIWebNavigation.STOP_ALL)
}
function PanelBrowserReload()
{
getPanelBrowser().webNavigation
.sessionHistory
.QueryInterface(nsIWebNavigation)
.reload(nsIWebNavigation.LOAD_FLAGS_NONE);
function PanelBrowserReload() {
getPanelBrowser().webNavigation
.sessionHistory
.QueryInterface(nsIWebNavigation)
.reload(nsIWebNavigation.LOAD_FLAGS_NONE);
}