Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more dump() removal (65127)

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@84845 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
blakeross%telocity.com 2001-01-12 04:54:06 +00:00
parent 259207bc05
commit 10e1fcefa2
4 changed files with 7 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
mozilla/xpfe/components/related/resources/related-panel.js
View File

@ -33,12 +33,6 @@ var kDataPrefixUrl = kMAMIUrl;
var oNavObserver = null;
function debug(msg) {
// uncomment for noise
// dump("-+- related-panel: " + msg + "\n");
}
// Our observer of Navigation Messages
function NavObserver(oDisplayFrame,oContentWindow)
{
@ -51,7 +45,6 @@ function NavObserver(oDisplayFrame,oContentWindow)
NavObserver.prototype.Observe =
function (oSubject, sMessage, sContextUrl)
{
debug("Observer("+sMessage+", "+sContextUrl+")");
try {
if (oSubject != this.m_oContentWindow) {
// only pay attention to our client window.
@ -83,10 +76,8 @@ function (bReferrer)
NavObserver.prototype.TrackContext =
function (sContextUrl, bReferrer)
{
debug("TrackContext(" + sContextUrl + ", " + (bReferrer?"true":"false") + ")");
if (sContextUrl != this.m_sLastContextUrl && this.m_oDisplayFrame) {
var sDataUrl = this.TranslateContext(sContextUrl,bReferrer);
debug("TrackContext: setting iframe to " + sDataUrl);
this.m_oDisplayFrame.setAttribute('src', sDataUrl);
this.m_sLastContextUrl = sContextUrl;
}
@ -95,10 +86,8 @@ function (sContextUrl, bReferrer)
NavObserver.prototype.TranslateContext =
function (sUrl, bReferrer)
{
debug("TranslateContext(" + sUrl + ", " + (bReferrer?"true":"false") + ")");
if (!sUrl || ('string' != typeof(sUrl))
|| ('' == sUrl) || sUrl == 'about:blank') {
debug('TranlateContext: bad argument')
return kUnknownReasonUrl;
}
@ -110,7 +99,6 @@ function (sUrl, bReferrer)
// We can only get related links data on HTTP URLs
if (0 != sUrl.indexOf("http://")) {
debug('TranlateContext: non-http argument:('+sUrl+')');
return kNoHTTPReasonUrl;
}
@ -120,14 +108,11 @@ function (sUrl, bReferrer)
var nFirstSlash = sUrlSuffix.indexOf('/');
var nFirstDot = sUrlSuffix.indexOf('.');
if (-1 == nFirstDot) {
debug('TranlateContext: no "." in url');
if (-1 == nFirstDot)
return kNoHTTPReasonUrl;
}
if ((nFirstSlash < nFirstDot) && (-1 != nFirstSlash)) {
debug('TranlateContext: no "." in domain');
if ((nFirstSlash < nFirstDot) && (-1 != nFirstSlash))
return kNoHTTPReasonUrl;
}
// url is http, non-intranet url: see if the domain is in their blocked list.
@ -142,7 +127,6 @@ function (sUrl, bReferrer)
}
if (DomainInSkipList(sDomain)) {
debug('TranlateContext: argument in skip-list');
return kSkipDomainReasonUrl;
} else {
// ok! it is a good url!
@ -169,8 +153,6 @@ function DomainInSkipList(sDomain)
if (pref) {
var sDomainList = pref.CopyCharPref("browser.related.disabledForDomains");
if ((sDomainList) && (sDomainList != "")) {
debug("\nProposed New Domain: '" + sDomain + "'\n");
debug("Skip Domain List: '" + sDomainList + "'\n");
var aDomains = sDomainList.split(",");
@ -179,10 +161,8 @@ function DomainInSkipList(sDomain)
var sDomainCopy = sDomain;
var sTestDomain = aDomains[x];
debug("Skip Domain #" + x + ": " + sTestDomain + "\n");
if ('*' == sTestDomain[0]) { // wildcard match
debug(" Wildcard domain.\n");
// strip off the asterisk
sTestDomain = sTestDomain.substring(1);
@ -193,7 +173,6 @@ function DomainInSkipList(sDomain)
}
if (0 == sDomainCopy.lastIndexOf(sTestDomain)) {
debug(" Skip this domain '" + sDomainCopy + "'\n");
bSkipDomainFlag = true;
break;
@ -227,10 +206,9 @@ function Init()
oObserverService.AddObserver(oNavObserver, "StartDocumentLoad");
oObserverService.AddObserver(oNavObserver, "EndDocumentLoad");
oObserverService.AddObserver(oNavObserver, "FailDocumentLoad");
debug("added observer\n");
} else {
oNavObserver = null;
debug("FAILURE to get observer service\n");
dump("FAILURE to get observer service\n");
}
}
}
@ -241,13 +219,12 @@ function Destruct()
var oObserverService = Components.classes["@mozilla.org/observer-service;1"].getService();
oObserverService = oObserverService.QueryInterface(Components.interfaces.nsIObserverService);
if (oObserverService && oNavObserver) {
debug("Removing observer\n");
oObserverService.RemoveObserver(oNavObserver, "StartDocumentLoad");
oObserverService.RemoveObserver(oNavObserver, "EndDocumentLoad");
oObserverService.RemoveObserver(oNavObserver, "FailDocumentLoad");
oNavObserver = null;
} else {
debug("FAILURE to get observer service\n");
dump("FAILURE to get observer service\n");
}
}

12
mozilla/xpfe/components/search/resources/internet.js
View File

@ -40,16 +40,12 @@ function doCheckAll(activeFlag)
if (treeChildrenNode == null) return(false);
var numEngines = treeChildrenNode.childNodes.length;
dump("doCheckAll(): " + numEngines + " engines.\n");
for (var x = 0; x<numEngines; x++)
{
var treeItem = treeChildrenNode.childNodes[x];
if (!treeItem)
{
dump("doCheckAll(): huh? treeItem is null.\n");
continue;
}
if (!treeItem)
continue;
var checkedFlag = false;
@ -77,8 +73,6 @@ function doCheckAll(activeFlag)
}
}
dump("doCheckAll() done.\n");
return(true);
}
@ -91,8 +85,6 @@ function saveSearch()
var searchURL = resultsTree.getAttribute("ref");
if ((!searchURL) || (searchURL == "")) return(false);
dump("Bookmark search URL: " + searchURL + "\n");
var bmks = Components.classes["@mozilla.org/browser/bookmarks-service;1"].getService();
if (bmks) bmks = bmks.QueryInterface(Components.interfaces.nsIBookmarksService);

10
mozilla/xpfe/components/sidebar/resources/customize-panel.js
View File

@ -29,11 +29,6 @@ var NC = "http://home.netscape.com/NC-rdf#";
var sidebarObj = new Object;
var customizeObj = new Object;
function debug(msg) {
// Uncomment for noise
// dump("customize-panel: msg+"\n");
}
function Init()
{
customizeObj.id = window.arguments[0];
@ -41,9 +36,6 @@ function Init()
sidebarObj.datasource_uri = window.arguments[2];
sidebarObj.resource = window.arguments[3];
debug("panel id: " + customizeObj.id);
debug("panel url: " + customizeObj.url);
sidebarObj.datasource = RDF.GetDataSource(sidebarObj.datasource_uri);
var customize_frame = document.getElementById('customize_frame');
@ -53,11 +45,9 @@ function Init()
// Use an assertion to pass a "refresh" event to all the sidebars.
// They use observers to watch for this assertion (in sidebarOverlay.js).
function RefreshPanel() {
debug("refresh the sidebar now");
var sb_resource = RDF.GetResource(sidebarObj.resource);
var refresh_resource = RDF.GetResource(NC + "refresh_panel");
var panel_resource = RDF.GetLiteral(customizeObj.id);
debug("panel id from literal: "+panel_resource.Value);
sidebarObj.datasource.Assert(sb_resource,
refresh_resource,

27
mozilla/xpfe/global/resources/content/nsTreeController.js
View File

@ -50,11 +50,6 @@ var bmTypeRes = RDF.GetResource(NC_NS + "Bookmark");
// this is a hack for now - just assume containment
var containment = RDF.GetResource(NC_NS + "child");
function debug(foo)
{
// dump(foo);
}
function isContainer(node)
{
return node.getAttribute("container") == "true";
@ -110,7 +105,6 @@ function nsTreeController_copy(tree)
var theName = nameNode.Value;
debug("Node " + nodeIndex + ": " + ID + " name: " + theName + "\n");
url += "ID:{" + ID + "};";
url += "NAME:{" + theName + "};";
@ -135,7 +129,6 @@ function nsTreeController_copy(tree)
}
if (url == "") return false;
debug("Copy URL: " + url + "\n");
// get some useful components
var trans = Components.classes[nsTransferable_contractid].createInstance(nsITransferable);
@ -168,9 +161,7 @@ function nsTreeController_paste(tree)
var datasource = tree.database;
var pasteNodeID = select_list[0].id;
debug("Paste onto " + pasteNodeID + "\n");
var isContainerFlag = isContainer(select_list[0]);
debug("Container status: " + isContainerFlag + "\n");
var trans_uri = "@mozilla.org/widget/transferable;1";
@ -214,16 +205,12 @@ function nsTreeController_paste(tree)
}
RDFC.Init(datasource, pasteContainerRes);
debug("Inited RDFC\n");
if (isContainerFlag == false)
{
pasteNodeIndex = RDFC.IndexOf(pasteNodeRes);
if (pasteNodeIndex < 0) return false; // how did that happen?
}
debug("Loop over strings\n");
var dirty = false;
for (var x=0; x<strings.length; x=x+2)
{
@ -237,15 +224,12 @@ function nsTreeController_paste(tree)
theID = theID.substr(4, theID.length-5);
theName = theName.substr(6, theName.length-7);
debug("Paste ID: " + theID + " NAME: " + theName + "\n");
var IDRes = RDF.GetResource(theID);
if (!IDRes) continue;
if (RDFC.IndexOf(IDRes) > 0)
{
debug("Unable to add ID:'" + theID +
"' as its already in this folder.\n");
continue;
}
@ -261,12 +245,10 @@ function nsTreeController_paste(tree)
if (isContainerFlag == true)
{
RDFC.AppendElement(IDRes);
debug("Appended node onto end of container\n");
}
else
{
RDFC.InsertElementAt(IDRes, pasteNodeIndex++, true);
debug("Pasted at index # " + pasteNodeIndex + "\n");
}
dirty = true;
@ -276,7 +258,6 @@ function nsTreeController_paste(tree)
{
// set default bookmark type
datasource.Assert(IDRes, typeRes, bmTypeRes, true);
debug("Setting default bookmark type\n");
}
}
@ -286,7 +267,6 @@ function nsTreeController_paste(tree)
if (remote)
{
remote.Flush();
debug("Wrote out bookmark changes.\n");
}
}
return true;
@ -304,8 +284,6 @@ function nsTreeController_delete(tree)
var datasource = tree.database;
debug("# of Nodes selected: " + select_list.length);
if (promptFlag == true)
{
var deleteStr = '';
@ -344,9 +322,6 @@ function nsTreeController_delete(tree)
parentID = node.parentNode.parentNode.id;
if (!parentID) continue;
debug("Node " + nodeIndex + ": " + ID);
debug("Parent Node " + nodeIndex + ": " + parentID);
var IDRes = RDF.GetResource(ID);
if (!IDRes) continue;
var parentIDRes = RDF.GetResource(parentID);
@ -369,7 +344,6 @@ function nsTreeController_delete(tree)
try {
var remote = datasource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
remote.Flush();
debug("Wrote out bookmark changes.");
} catch (ex) {
}
}
@ -459,7 +433,6 @@ nsTreeController.prototype =
case "cmd_selectAll":
return this.getTree().selectAll();
}
dump("How did I get here?\n");
return false;
},
copy: nsTreeController_copy,