From e26b151b43f01ada2207a395dce40555a6b8f427 Mon Sep 17 00:00:00 2001 From: "brendan%mozilla.org" Date: Tue, 7 Dec 1999 00:52:42 +0000 Subject: [PATCH] Tidy whitespace and bracing (r=slamm@netscape.com). --- suite/common/sidebar/sidebarOverlay.js | 154 +++++++++--------- .../sidebar/resources/sidebarOverlay.js | 154 +++++++++--------- 2 files changed, 150 insertions(+), 158 deletions(-) diff --git a/suite/common/sidebar/sidebarOverlay.js b/suite/common/sidebar/sidebarOverlay.js index 0cf20b43c22f..30bf2f263c8c 100644 --- a/suite/common/sidebar/sidebarOverlay.js +++ b/suite/common/sidebar/sidebarOverlay.js @@ -3,7 +3,7 @@ * The contents of this file are subject to the Mozilla Public License * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ + * http://www.mozilla.org/MPL/ * * Software distributed under the License is distributed on an "AS IS" * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See @@ -30,8 +30,7 @@ var PANELS_RDF_FILE = 66626; // the default sidebar: var sidebar = new Object; -function debug(msg) -{ +function debug(msg) { // uncomment for noise // dump(msg+"\n"); } @@ -40,12 +39,12 @@ var panel_observer = new Object; panel_observer = { OnAssert : function(src,prop,target) { - debug("Setting timeout to open default"); + debug("Setting timeout to open default"); - //xxxslamm This timeout does not work. JS bug #???? (bugzilla is down). - // Brendan said that norris is working on this. - //setTimeout("sidebarOpenDefaultPanel(100, 0)",100); - }, + //xxxslamm This timeout does not work. JS bug #???? (bugzilla is down). + // Brendan said that norris is working on this. + //setTimeout("sidebarOpenDefaultPanel(100, 0)",100); + }, OnUnassert : function(src,prop,target) { debug("panel_observer: onUnassert"); }, OnChange : function(src,prop,old_target,new_target) @@ -57,35 +56,34 @@ panel_observer = { function getSidebarDatasourceURI(panels_file_id) { try { - var fileLocatorInterface = Components.interfaces.nsIFileLocator; - var fileLocatorProgID = 'component://netscape/filelocator'; - var fileLocatorService = Components.classes[fileLocatorProgID].getService(); - // use the fileLocator to look in the profile directory - // to find 'panels.rdf', which is the - // database of the user's currently selected panels. - fileLocatorService = fileLocatorService.QueryInterface(fileLocatorInterface); + var fileLocatorInterface = Components.interfaces.nsIFileLocator; + var fileLocatorProgID = 'component://netscape/filelocator'; + var fileLocatorService = Components.classes[fileLocatorProgID].getService(); + // use the fileLocator to look in the profile directory + // to find 'panels.rdf', which is the + // database of the user's currently selected panels. + fileLocatorService = fileLocatorService.QueryInterface(fileLocatorInterface); - // if /panels.rdf doesn't exist, GetFileLocation() will copy - // bin/defaults/profile/panels.rdf to /panels.rdf - var sidebar_file = fileLocatorService.GetFileLocation(panels_file_id); + // if /panels.rdf doesn't exist, GetFileLocation() will copy + // bin/defaults/profile/panels.rdf to /panels.rdf + var sidebar_file = fileLocatorService.GetFileLocation(panels_file_id); - if (!sidebar_file.exists()) { - // this should not happen, as GetFileLocation() should copy - // defaults/panels.rdf to the users profile directory - return null; - } + if (!sidebar_file.exists()) { + // this should not happen, as GetFileLocation() should copy + // defaults/panels.rdf to the users profile directory + return null; + } - debug("sidebar uri is " + sidebar_file.URLString); - return sidebar_file.URLString; + debug("sidebar uri is " + sidebar_file.URLString); + return sidebar_file.URLString; } catch (ex) { - // this should not happen - return null; + // this should not happen + return null; } } -function sidebarOverlayInit() -{ +function sidebarOverlayInit() { sidebar.datasource_uri = getSidebarDatasourceURI(PANELS_RDF_FILE); sidebar.resource = 'urn:sidebar:current-panel-list'; @@ -95,31 +93,29 @@ function sidebarOverlayInit() if (sidebar_element.getAttribute('hidden') == 'true') { sidebar_element.setAttribute('style', 'display:none') - if (sidebar_menuitem) + if (sidebar_menuitem) sidebar_menuitem.setAttribute('checked', 'false') } else { - if (sidebar_menuitem) + if (sidebar_menuitem) sidebar_menuitem.setAttribute('checked', 'true'); - debug("sidebar = " + sidebar); - debug("sidebar.resource = " + sidebar.resource); - debug("sidebar.datasource_uri = " + sidebar.datasource_uri); + debug("sidebar = " + sidebar); + debug("sidebar.resource = " + sidebar.resource); + debug("sidebar.datasource_uri = " + sidebar.datasource_uri); - // Add the user's current panel choices to the template builder, - // which will aggregate it with the other datasources that describe - // the individual panel's title, customize URL, and content URL. - var panels = document.getElementById('sidebar-panels'); - panels.database.AddDataSource(RDF.GetDataSource(sidebar.datasource_uri)); - - debug("Adding observer to database."); + // Add the user's current panel choices to the template builder, + // which will aggregate it with the other datasources that describe + // the individual panel's title, customize URL, and content URL. + var panels = document.getElementById('sidebar-panels'); + panels.database.AddDataSource(RDF.GetDataSource(sidebar.datasource_uri)); + + debug("Adding observer to database."); panels.database.AddObserver(panel_observer); - // XXX This is a hack to force re-display - panels.setAttribute('ref', 'urn:sidebar:current-panel-list'); + // XXX This is a hack to force re-display + panels.setAttribute('ref', 'urn:sidebar:current-panel-list'); - sidebarOpenDefaultPanel(100, 0); - - + sidebarOpenDefaultPanel(100, 0); } } @@ -132,19 +128,19 @@ function sidebarOpenDefaultPanel(wait, tries) { debug(" target="+target); if (children.length < 3) { - if (tries < 5) { + if (tries < 5) { // No children yet, try again later setTimeout('sidebarOpenDefaultPanel('+(wait*2)+','+(tries+1)+')',wait); - } + } return; } if (target && target != '') { for (var ii=0; ii < children.length; ii++) { - if (children.item(ii).getAttribute('src') == target) { - children.item(ii).removeAttribute('collapsed'); - return; - } - } + if (children.item(ii).getAttribute('src') == target) { + children.item(ii).removeAttribute('collapsed'); + return; + } + } } // Pick the first one var first_iframe = children.item(2); @@ -160,27 +156,27 @@ function sidebarOpenClosePanel(titledbutton) { var children = titledbutton.parentNode.childNodes; if (target == last_src) { - return; + return; } for (var ii=0; ii < children.length; ii++) { var src = children.item(ii).getAttribute('src') - if (src == target) { - children.item(ii).removeAttribute('collapsed'); - titledbutton.parentNode.setAttribute('open-panel-src',target); - } - if (src == last_src) { - children.item(ii).setAttribute('collapsed','true'); - } + if (src == target) { + children.item(ii).removeAttribute('collapsed'); + titledbutton.parentNode.setAttribute('open-panel-src',target); + } + if (src == last_src) { + children.item(ii).setAttribute('collapsed','true'); + } } } function sidebarReload() { - sidebarOverlayInit(sidebar) + sidebarOverlayInit(sidebar); } -// Set up a lame hack to avoid opening two customize +// Set up a lame hack to avoid opening two customize // windows on a double click. var gDisableCustomize = false; function enableCustomize() { @@ -195,24 +191,24 @@ function sidebarCustomize() { var windowManager = cwindowManager.QueryInterface(iwindowManager); var customizeWindow = windowManager.GetMostRecentWindow('sidebar:customize'); - - if (customizeWindow) { - debug("Reuse existing customize dialog"); - customizeWindow.focus(); - } else { - debug("Open a new customize dialog"); - if (true == gDisableCustomize) { - debug("Recently opened one. Wait a little bit."); - return; - } + if (customizeWindow) { + debug("Reuse existing customize dialog"); + customizeWindow.focus(); + } else { + debug("Open a new customize dialog"); + + if (true == gDisableCustomize) { + debug("Recently opened one. Wait a little bit."); + return; + } gDisableCustomize = true; - customizeWindow = window.openDialog( - 'chrome://sidebar/content/customize.xul', - '_blank','chrome', - sidebar.datasource_uri, sidebar.resource); - setTimeout(enableCustomize, 2000); + customizeWindow = window.openDialog( + 'chrome://sidebar/content/customize.xul', + '_blank','chrome', + sidebar.datasource_uri, sidebar.resource); + setTimeout(enableCustomize, 2000); } } @@ -225,7 +221,7 @@ function sidebarShowHide() { debug("Showing the sidebar") sidebar.setAttribute('hidden','') sidebar_splitter.setAttribute('hidden','') - //sidebarOverlayInit() + //sidebarOverlayInit() } else { debug("Hiding the sidebar") sidebar.setAttribute('hidden','true') diff --git a/xpfe/components/sidebar/resources/sidebarOverlay.js b/xpfe/components/sidebar/resources/sidebarOverlay.js index 0cf20b43c22f..30bf2f263c8c 100644 --- a/xpfe/components/sidebar/resources/sidebarOverlay.js +++ b/xpfe/components/sidebar/resources/sidebarOverlay.js @@ -3,7 +3,7 @@ * The contents of this file are subject to the Mozilla Public License * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ + * http://www.mozilla.org/MPL/ * * Software distributed under the License is distributed on an "AS IS" * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See @@ -30,8 +30,7 @@ var PANELS_RDF_FILE = 66626; // the default sidebar: var sidebar = new Object; -function debug(msg) -{ +function debug(msg) { // uncomment for noise // dump(msg+"\n"); } @@ -40,12 +39,12 @@ var panel_observer = new Object; panel_observer = { OnAssert : function(src,prop,target) { - debug("Setting timeout to open default"); + debug("Setting timeout to open default"); - //xxxslamm This timeout does not work. JS bug #???? (bugzilla is down). - // Brendan said that norris is working on this. - //setTimeout("sidebarOpenDefaultPanel(100, 0)",100); - }, + //xxxslamm This timeout does not work. JS bug #???? (bugzilla is down). + // Brendan said that norris is working on this. + //setTimeout("sidebarOpenDefaultPanel(100, 0)",100); + }, OnUnassert : function(src,prop,target) { debug("panel_observer: onUnassert"); }, OnChange : function(src,prop,old_target,new_target) @@ -57,35 +56,34 @@ panel_observer = { function getSidebarDatasourceURI(panels_file_id) { try { - var fileLocatorInterface = Components.interfaces.nsIFileLocator; - var fileLocatorProgID = 'component://netscape/filelocator'; - var fileLocatorService = Components.classes[fileLocatorProgID].getService(); - // use the fileLocator to look in the profile directory - // to find 'panels.rdf', which is the - // database of the user's currently selected panels. - fileLocatorService = fileLocatorService.QueryInterface(fileLocatorInterface); + var fileLocatorInterface = Components.interfaces.nsIFileLocator; + var fileLocatorProgID = 'component://netscape/filelocator'; + var fileLocatorService = Components.classes[fileLocatorProgID].getService(); + // use the fileLocator to look in the profile directory + // to find 'panels.rdf', which is the + // database of the user's currently selected panels. + fileLocatorService = fileLocatorService.QueryInterface(fileLocatorInterface); - // if /panels.rdf doesn't exist, GetFileLocation() will copy - // bin/defaults/profile/panels.rdf to /panels.rdf - var sidebar_file = fileLocatorService.GetFileLocation(panels_file_id); + // if /panels.rdf doesn't exist, GetFileLocation() will copy + // bin/defaults/profile/panels.rdf to /panels.rdf + var sidebar_file = fileLocatorService.GetFileLocation(panels_file_id); - if (!sidebar_file.exists()) { - // this should not happen, as GetFileLocation() should copy - // defaults/panels.rdf to the users profile directory - return null; - } + if (!sidebar_file.exists()) { + // this should not happen, as GetFileLocation() should copy + // defaults/panels.rdf to the users profile directory + return null; + } - debug("sidebar uri is " + sidebar_file.URLString); - return sidebar_file.URLString; + debug("sidebar uri is " + sidebar_file.URLString); + return sidebar_file.URLString; } catch (ex) { - // this should not happen - return null; + // this should not happen + return null; } } -function sidebarOverlayInit() -{ +function sidebarOverlayInit() { sidebar.datasource_uri = getSidebarDatasourceURI(PANELS_RDF_FILE); sidebar.resource = 'urn:sidebar:current-panel-list'; @@ -95,31 +93,29 @@ function sidebarOverlayInit() if (sidebar_element.getAttribute('hidden') == 'true') { sidebar_element.setAttribute('style', 'display:none') - if (sidebar_menuitem) + if (sidebar_menuitem) sidebar_menuitem.setAttribute('checked', 'false') } else { - if (sidebar_menuitem) + if (sidebar_menuitem) sidebar_menuitem.setAttribute('checked', 'true'); - debug("sidebar = " + sidebar); - debug("sidebar.resource = " + sidebar.resource); - debug("sidebar.datasource_uri = " + sidebar.datasource_uri); + debug("sidebar = " + sidebar); + debug("sidebar.resource = " + sidebar.resource); + debug("sidebar.datasource_uri = " + sidebar.datasource_uri); - // Add the user's current panel choices to the template builder, - // which will aggregate it with the other datasources that describe - // the individual panel's title, customize URL, and content URL. - var panels = document.getElementById('sidebar-panels'); - panels.database.AddDataSource(RDF.GetDataSource(sidebar.datasource_uri)); - - debug("Adding observer to database."); + // Add the user's current panel choices to the template builder, + // which will aggregate it with the other datasources that describe + // the individual panel's title, customize URL, and content URL. + var panels = document.getElementById('sidebar-panels'); + panels.database.AddDataSource(RDF.GetDataSource(sidebar.datasource_uri)); + + debug("Adding observer to database."); panels.database.AddObserver(panel_observer); - // XXX This is a hack to force re-display - panels.setAttribute('ref', 'urn:sidebar:current-panel-list'); + // XXX This is a hack to force re-display + panels.setAttribute('ref', 'urn:sidebar:current-panel-list'); - sidebarOpenDefaultPanel(100, 0); - - + sidebarOpenDefaultPanel(100, 0); } } @@ -132,19 +128,19 @@ function sidebarOpenDefaultPanel(wait, tries) { debug(" target="+target); if (children.length < 3) { - if (tries < 5) { + if (tries < 5) { // No children yet, try again later setTimeout('sidebarOpenDefaultPanel('+(wait*2)+','+(tries+1)+')',wait); - } + } return; } if (target && target != '') { for (var ii=0; ii < children.length; ii++) { - if (children.item(ii).getAttribute('src') == target) { - children.item(ii).removeAttribute('collapsed'); - return; - } - } + if (children.item(ii).getAttribute('src') == target) { + children.item(ii).removeAttribute('collapsed'); + return; + } + } } // Pick the first one var first_iframe = children.item(2); @@ -160,27 +156,27 @@ function sidebarOpenClosePanel(titledbutton) { var children = titledbutton.parentNode.childNodes; if (target == last_src) { - return; + return; } for (var ii=0; ii < children.length; ii++) { var src = children.item(ii).getAttribute('src') - if (src == target) { - children.item(ii).removeAttribute('collapsed'); - titledbutton.parentNode.setAttribute('open-panel-src',target); - } - if (src == last_src) { - children.item(ii).setAttribute('collapsed','true'); - } + if (src == target) { + children.item(ii).removeAttribute('collapsed'); + titledbutton.parentNode.setAttribute('open-panel-src',target); + } + if (src == last_src) { + children.item(ii).setAttribute('collapsed','true'); + } } } function sidebarReload() { - sidebarOverlayInit(sidebar) + sidebarOverlayInit(sidebar); } -// Set up a lame hack to avoid opening two customize +// Set up a lame hack to avoid opening two customize // windows on a double click. var gDisableCustomize = false; function enableCustomize() { @@ -195,24 +191,24 @@ function sidebarCustomize() { var windowManager = cwindowManager.QueryInterface(iwindowManager); var customizeWindow = windowManager.GetMostRecentWindow('sidebar:customize'); - - if (customizeWindow) { - debug("Reuse existing customize dialog"); - customizeWindow.focus(); - } else { - debug("Open a new customize dialog"); - if (true == gDisableCustomize) { - debug("Recently opened one. Wait a little bit."); - return; - } + if (customizeWindow) { + debug("Reuse existing customize dialog"); + customizeWindow.focus(); + } else { + debug("Open a new customize dialog"); + + if (true == gDisableCustomize) { + debug("Recently opened one. Wait a little bit."); + return; + } gDisableCustomize = true; - customizeWindow = window.openDialog( - 'chrome://sidebar/content/customize.xul', - '_blank','chrome', - sidebar.datasource_uri, sidebar.resource); - setTimeout(enableCustomize, 2000); + customizeWindow = window.openDialog( + 'chrome://sidebar/content/customize.xul', + '_blank','chrome', + sidebar.datasource_uri, sidebar.resource); + setTimeout(enableCustomize, 2000); } } @@ -225,7 +221,7 @@ function sidebarShowHide() { debug("Showing the sidebar") sidebar.setAttribute('hidden','') sidebar_splitter.setAttribute('hidden','') - //sidebarOverlayInit() + //sidebarOverlayInit() } else { debug("Hiding the sidebar") sidebar.setAttribute('hidden','true')