From 90b016e26eb9725e9c9bb8eaf946dd9833366517 Mon Sep 17 00:00:00 2001 From: "ben%netscape.com" Date: Thu, 10 Feb 2000 06:46:50 +0000 Subject: [PATCH] fixes for localisability of navigator package (removed hardcoded english strings ) (r=jst@citec.fi), small formatting fix for navigator to prevent whitespace at top of mac navigator window git-svn-id: svn://10.0.0.236/trunk@60291 18797224-902f-48f8-a5cc-f745e15eee43 --- .../browser/resources/content/navigator.js | 1572 +++++++---------- .../browser/resources/content/viewSource.xul | 158 +- .../locale/en-US/navigator.properties | 4 +- .../resources/locale/en-US/viewSource.dtd | 90 - .../xpfe/browser/resources/skin/navigator.css | 2 +- 5 files changed, 647 insertions(+), 1179 deletions(-) diff --git a/mozilla/xpfe/browser/resources/content/navigator.js b/mozilla/xpfe/browser/resources/content/navigator.js index e75ac9ed7ed..d68d5740803 100644 --- a/mozilla/xpfe/browser/resources/content/navigator.js +++ b/mozilla/xpfe/browser/resources/content/navigator.js @@ -27,7 +27,7 @@ var bundle = srGetStrBundle("chrome://navigator/locale/navigator.properties"); var startPageDefault = "about:blank"; // in case we fail to get the home page, load this -var homePageDefault = "http://www.mozilla.org/"; +var homePageDefault = bundle.GetStringFromName("startupHomepage") try { pref = Components.classes['component://netscape/preferences']; @@ -39,89 +39,72 @@ catch (ex) { pref = null; } - var appCore = null; - var defaultStatus = "default status text"; - var explicitURL = false; +var appCore = null; +var defaultStatus = bundle.GetStringFromName("defaultStatus"); +var explicitURL = false; function UpdateHistory(event) { - // This is registered as a capturing "load" event handler. When a - // document load completes in the content window, we'll be - // notified here. This allows us to update the global history and - // set the document's title information. - - // dump("UpdateHistory: content's location is '" + window.content.location.href + "',\n"); - //dump(" title is '" + window.content.document.title + "'\n"); - - if ((window.content.location.href) && (window.content.location.href != "")) + if( window.content.location.href ) { try { - var history = Components.classes["component://netscape/browser/global-history"].getService(); - if (history) history = history.QueryInterface(Components.interfaces.nsIGlobalHistory); + var history = getService( "component://netscape/browser/global-history", "nsIGlobalHistory" ); if (history) history.SetPageTitle(window.content.location.href, window.content.document.title); } catch (ex) { - dump("failed to set the page title.\n"); + dump("Failed to set the page title in history\n"); } } } -function savePage( url ) { - // Default is to save current page. - if ( !url ) { - url = window.content.location.href; - } - // Use stream xfer component to prompt for destination and save. - var xfer = Components - .classes[ "component://netscape/appshell/component/xfer" ] - .getService( Components.interfaces.nsIStreamTransfer ); - try { - // When Necko lands, we need to receive the real nsIChannel and - // do SelectFileAndTransferLocation! - - // Use this for now... - xfer.SelectFileAndTransferLocationSpec( url, window ); - } catch( exception ) { - // Failed (or cancelled), give them another chance. - dump( "SelectFileAndTransferLocationSpec failed, rv=" + exception + "\n" ); - } - return; - } +function savePage( url ) +{ + // Default is to save current page. + if ( !url ) + url = window.content.location.href; + // Use stream xfer component to prompt for destination and save. + var xfer = getService( "component://netscape/appshell/component/xfer", "nsIStreamTransfer" ); + try { + // When Necko lands, we need to receive the real nsIChannel and + // do SelectFileAndTransferLocation! + // Use this for now... + xfer.SelectFileAndTransferLocationSpec( url, window ); + } + catch( exception ) { + // Failed (or cancelled), give them another chance. + dump( "SelectFileAndTransferLocationSpec failed, rv=" + exception + "\n" ); + } + return; +} function UpdateBookmarksLastVisitedDate(event) { - if ((window.content.location.href) && (window.content.location.href != "")) + if( window.content.location.href ) { try { - // if the URL is bookmarked, update its "Last Visited" date - var bmks = Components.classes["component://netscape/browser/bookmarks-service"].getService(); - if (bmks) bmks = bmks.QueryInterface(Components.interfaces.nsIBookmarksService); + var bmks = getService( "component://netscape/browser/bookmarks-service", "nsIBookmarksService" ); if (bmks) bmks.UpdateBookmarkLastVisitedDate(window.content.location.href); } catch(ex) { - dump("failed to update bookmark last visited date.\n"); + dump("Failed to update bookmark last visited date.\n"); } } } - - function UpdateInternetSearchResults(event) { - if ((window.content.location.href) && (window.content.location.href != "")) + if( window.content.location.href ) { var searchInProgressFlag = false; - try { - var search = Components.classes["component://netscape/rdf/datasource?name=internetsearch"].getService(); - if (search) search = search.QueryInterface(Components.interfaces.nsIInternetSearchService); + var search = getService( "component://netscape/rdf/datasource?name=internetsearch", "nsIInternetSearchService" ); if (search) searchInProgressFlag = search.FindInternetSearchResults(window.content.location.href); } catch(ex) @@ -129,391 +112,305 @@ function UpdateInternetSearchResults(event) } if (searchInProgressFlag == true) - { RevealSearchPanel(); - } } } - - -function createBrowserInstance() +function Startup() { - appCore = Components - .classes[ "component://netscape/appshell/component/browser/instance" ] - .createInstance( Components.interfaces.nsIBrowserInstance ); - if ( !appCore ) { - alert( "Error creating browser instance\n" ); - } + // TileWindow(); + // Make sure window fits on screen initially + // FitToScreen(); + + try { + appCore = createInstance( "component://netscape/appshell/component/browser/instance", "nsIBrowserInstance" ); } - - function Startup() - { - // TileWindow(); - // Make sure window fits on screen initially - //FitToScreen(); - - // Create the browser instance component. - createBrowserInstance(); - if (appCore == null) { - // Give up. - window.close(); - } - - // Initialize browser instance.. - appCore.setWebShellWindow(window); - - tryToSetContentWindow(); - - // Add a capturing event listener to the content area - // (rjc note: not the entire window, otherwise we'll get sidebar pane loads too!) - // so we'll be notified when onloads complete. - var contentArea = document.getElementById("appcontent"); - if (contentArea) - { - contentArea.addEventListener("load", UpdateHistory, true); - contentArea.addEventListener("load", UpdateBookmarksLastVisitedDate, true); - contentArea.addEventListener("load", UpdateInternetSearchResults, true); - } - - // Check for window.arguments[0]. If present, go to that url. - if ( window.arguments && window.arguments[0] ) { - // Load it using yet another psuedo-onload handler. - onLoadViaOpenDialog(); - } + catch ( e ) { + // fail } - - function Shutdown() - { - try - { - // If bookmarks are dirty, flush 'em to disk - var bmks = Components.classes["component://netscape/browser/bookmarks-service"].getService(); - if (bmks) bmks = bmks.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource); - if (bmks) bmks.Flush(); - } - catch (ex) - { - } - - // Close the app core. - if ( appCore ) { - appCore.close(); - } - } - - function onLoadWithArgs() { - // See if Startup has been run. - if ( appCore ) { - // See if load in progress (loading default page). - if ( document.getElementById("Browser:Throbber").getAttribute("busy") == "true" ) { - dump( "Stopping load of default initial page\n" ); - appCore.stop(); - } - dump( "Loading page specified on ShowWindowWithArgs\n" ); - appCore.loadInitialPage(); - } else { - // onLoad handler timing is not correct yet. - dump( "onLoadWithArgs not needed yet\n" ); - // Remember that we want this url. - explicitURL = true; - } - } - - function onLoadViaOpenDialog() { - // See if load in progress (loading default page). - if ( document.getElementById("Browser:Throbber").getAttribute("busy") == "true" ) { - dump( "Stopping load of default initial page\n" ); - appCore.stop(); - } - dump( "Loading page specified via openDialog\n" ); - dump("Check if a view source window \n"); - if( window.arguments[1]=="view-source" ) - { - dump(" A view source window \n"); - var element = document.getElementById("main-window"); - - var preface = element.getAttribute("viewsourcetitlepreface"); - element.setAttribute( "titlepreface", preface ); - appCore.isViewSource = true; - element.setAttribute("windowtype","Browser:view-source"); - } - appCore.loadUrl( window.arguments[0] ); - } - - function tryToSetContentWindow() { - var startpage = startPageDefault; - if ( window.content ) { - dump("Setting content window\n"); - appCore.setContentWindow( window.content ); - // Have browser app core load appropriate initial page. - - if ( !explicitURL ) { - // if all else fails, use trusty "about:blank" as the start page - if (pref) { - // from mozilla/modules/libpref/src/init/all.js - // 0 = blank - // 1 = home (browser.startup.homepage) - // 2 = last - choice = 1; - try { - choice = pref.GetIntPref("browser.startup.page"); - } - catch (ex) { - dump("failed to get the browser.startup.page pref\n"); - } - dump("browser.startup.page = " + choice + "\n"); - switch (choice) { - case 0: - startpage = "about:blank"; - break; - case 1: - try { - startpage = pref.CopyCharPref("browser.startup.homepage"); - } - catch (ex) { - dump("failed to get the homepage!\n"); - startpage = startPageDefault; - } - break; - case 2: - var history = Components.classes['component://netscape/browser/global-history']; - if (history) { - history = history.getService(); - } - if (history) { - history = history.QueryInterface(Components.interfaces.nsIGlobalHistory); - } - if (history) { - startpage = history.GetLastPageVisted(); - } - break; - default: - startpage = startPageDefault; - } - } - else { - dump("failed to QI pref service\n"); - } - dump("startpage = " + startpage + "\n"); - var args = document.getElementById("args") - if (args) args.setAttribute("value", startpage); - } - appCore.loadInitialPage(); - } else { - // Try again. - dump("Scheduling later attempt to set content window\n"); - window.setTimeout( "tryToSetContentWindow()", 100 ); - } - } - - function Translate(src, dest, engine) - { - var service = "http://levis.alis.com:8080"; - service += "?AlisSourceLang=" + src; - service += "&AlisTargetLang=" + dest; - service += "&AlisMTEngine=" + engine; - - // if we're already viewing a translated page, the just get the - // last argument (which we expect to always be "AlisMTEngine") - var targetURI = window.content.location.href; - var targetURIIndex = targetURI.indexOf("AlisTargetURI="); - if (targetURIIndex >= 0) - { - targetURI = targetURI.substring(targetURIIndex + 14); - } - service += "&AlisTargetURI=" + targetURI; - - window.content.location.href = service; - } - - function RefreshUrlbar() - { - //Refresh the urlbar bar - document.getElementById('urlbar').value = window.content.location.href; - } - - function gotoHistoryIndex(index) - { - appCore.gotoHistoryIndex(index); - } - - function BrowserBack() - { - // Get a handle to the back-button - var bb = document.getElementById("canGoBack"); - // If the button is disabled, don't bother calling in to Appcore - if ( (bb.getAttribute("disabled")) == "true" ) - return; - - if (appCore != null) { - dump("Going Back\n"); - appCore.back(); - } else { - dump("BrowserAppCore has not been created!\n"); - } - } - - - function BrowserForward() - { - // Get a handle to the back-button - var fb = document.getElementById("canGoForward"); - // If the button is disabled, don't bother calling in to Appcore - if ( (fb.getAttribute("disabled")) == "true" ) - return; - - if (appCore != null) { - dump("Going Forward\n"); - appCore.forward(); - } else { - dump("BrowserAppCore has not been created!\n"); - } - } - - - - function BrowserCanStop() { - var stop = document.getElementById("canStop"); - if ( stop ) { - var stopDisabled = stop.getAttribute("disabled"); - var stopButton = document.getElementById( "stop-button" ); - if ( stopButton ) { - if ( stopDisabled == "true") { - stopButton.setAttribute( "disabled", "true" ); - } else { - stopButton.setAttribute( "disabled", "" ); - } - } - //Enable/disable the stop menu item - var stopMenu = document.getElementById( "menuitem-stop" ); - if ( stopMenu ) { - if ( stopDisabled == "true") { - stopMenu.setAttribute( "disabled", "true" ); - } else { - stopMenu.setAttribute( "disabled", "" ); - } - } - } - } - - function BrowserStop() { - // Get a handle to the "canStop" broadcast id - var stopBElem = document.getElementById("canStop"); - if (!stopBElem) { - dump("Couldn't obtain handle to stop Broadcast element\n"); - return; - } - - var canStop = stopBElem.getAttribute("disabled"); - var sb = document.getElementById("stop-button"); - - if (!sb) { - dump("Could not obtain handle to stop button\n"); - return; - } - - // If the stop button is currently disabled, just return - if ((sb.getAttribute("disabled")) == "true") { - return; - } - - //Stop button has just been pressed. Disable it. - sb.setAttribute("disabled", "true"); - - // Get a handle to the stop menu item. - var sm = document.getElementById("menuitem-stop"); - if (!sm) { - dump("Couldn't obtain menu item Stop\n"); - } else { - // Disable the stop menu-item. - sm.setAttribute("disabled", "true"); - } + if( !appCore ) + window.close(); - //Call in to BrowserAppcore to stop the current loading - if (appCore != null) { - dump("Going to Stop\n"); - appCore.stop(); - } else { - dump("BrowserAppCore has not been created!\n"); - } + // Initialize browser instance.. + appCore.setWebShellWindow(window); + + tryToSetContentWindow(); + + // Add a capturing event listener to the content area + // (rjc note: not the entire window, otherwise we'll get sidebar pane loads too!) + // so we'll be notified when onloads complete. + var contentArea = document.getElementById("appcontent"); + if (contentArea) + { + contentArea.addEventListener("load", UpdateHistory, true); + contentArea.addEventListener("load", UpdateBookmarksLastVisitedDate, true); + contentArea.addEventListener("load", UpdateInternetSearchResults, true); } + + // Check for window.arguments[0]. If present, go to that url. + if ( window.arguments && window.arguments[0] ) + onLoadViaOpenDialog(); +} + +function Shutdown() +{ + try + { + // If bookmarks are dirty, flush 'em to disk + var bmks = getService( "component://netscape/browser/bookmarks-service", "nsIRDFRemoteDataSource" ); + if (bmks) bmks.Flush(); + } + catch (ex) + { + } + + if ( appCore ) + appCore.close(); +} + +function onLoadWithArgs() +{ + // See if Startup has been run. + if ( appCore ) { + // See if load in progress (loading default page). + if ( document.getElementById("Browser:Throbber").getAttribute("busy") == "true" ) + appCore.stop(); + appCore.loadInitialPage(); + } else + explicitURL = true; +} + +function onLoadViaOpenDialog() +{ + // See if load in progress (loading default page). + if ( document.getElementById("Browser:Throbber").getAttribute("busy") == "true" ) + appCore.stop(); + if( window.arguments[1] == "view-source" ) + { + var element = document.getElementById("main-window"); + var preface = element.getAttribute("viewsourcetitlepreface"); + element.setAttribute( "titlepreface", preface ); + appCore.isViewSource = true; + element.setAttribute("windowtype","Browser:view-source"); + } + appCore.loadUrl( window.arguments[0] ); +} + +function tryToSetContentWindow() +{ + var startpage = startPageDefault; + if ( window.content ) { + appCore.setContentWindow( window.content ); + + if ( !explicitURL ) { + // if all else fails, use trusty "about:blank" as the start page + if (pref) { + // from mozilla/modules/libpref/src/init/all.js + // 0 = blank + // 1 = home (browser.startup.homepage) + // 2 = last + var choice = 1; + try { + choice = pref.GetIntPref("browser.startup.page"); + } + catch (ex) { + dump("failed to get the browser.startup.page pref\n"); + } + switch (choice) + { + case 0: + startpage = "about:blank"; + break; + case 1: + try { + startpage = pref.CopyCharPref("browser.startup.homepage"); + } + catch (ex) { + startpage = startPageDefault; + } + break; + case 2: + var history = getService( "component://netscape/browser/global-history", "nsIGlobalHistory" ); + if (history) + startpage = history.GetLastPageVisted(); + break; + default: + startpage = startPageDefault; + } + } + else + dump("Failed to retrieve pref service\n"); + var args = document.getElementById("args") + if (args) args.setAttribute("value", startpage); + } + appCore.loadInitialPage(); + } + else + window.setTimeout( "tryToSetContentWindow()", 100 ); +} + +function Translate(src, dest, engine) +{ + var service = "http://levis.alis.com:8080"; + service += "?AlisSourceLang=" + src; + service += "&AlisTargetLang=" + dest; + service += "&AlisMTEngine=" + engine; + + // if we're already viewing a translated page, the just get the + // last argument (which we expect to always be "AlisMTEngine") + var targetURI = window.content.location.href; + var targetURIIndex = targetURI.indexOf("AlisTargetURI="); + if (targetURIIndex >= 0) + targetURI = targetURI.substring(targetURIIndex + 14); + service += "&AlisTargetURI=" + targetURI; + window.content.location.href = service; +} + +function RefreshUrlbar() +{ + //Refresh the urlbar bar + document.getElementById('urlbar').value = window.content.location.href; +} + +function gotoHistoryIndex(index) +{ + appCore.gotoHistoryIndex(index); +} + +function BrowserBack() +{ + // Get a handle to the back-button + var bb = document.getElementById("canGoBack"); + // If the button is disabled, don't bother calling in to Appcore + if ( bb.getAttribute("disabled") == "true" ) + return; + if (appCore != null) + appCore.back(); +} + +function BrowserForward() +{ + // Get a handle to the back-button + var fb = document.getElementById("canGoForward"); + // If the button is disabled, don't bother calling in to Appcore + if ( fb.getAttribute("disabled") == "true" ) + return; + if (appCore != null) + appCore.forward(); +} + +function BrowserCanStop() +{ + var stop = document.getElementById("canStop"); + if ( stop ) { + var stopDisabled = stop.getAttribute("disabled"); + var stopButton = document.getElementById( "stop-button" ); + if ( stopButton ) { + if ( stopDisabled == "true") + stopButton.setAttribute( "disabled", "true" ); + else + stopButton.setAttribute( "disabled", "" ); + } + } + //Enable/disable the stop menu item + var stopMenu = document.getElementById( "menuitem-stop" ); + if ( stopMenu ) { + if ( stopDisabled == "true") + stopMenu.setAttribute( "disabled", "true" ); + else + stopMenu.setAttribute( "disabled", "" ); + } +} + +function BrowserStop() +{ + // Get a handle to the "canStop" broadcast id + var stopBElem = document.getElementById("canStop"); + if (!stopBElem) + return; + var canStop = stopBElem.getAttribute("disabled"); + + var sb = document.getElementById("stop-button"); + if (!sb) + return; + // If the stop button is currently disabled, just return + if ( sb.getAttribute("disabled") == "true") + return; + + //Stop button has just been pressed. Disable it. + sb.setAttribute("disabled", "true"); + + // Get a handle to the stop menu item. + var sm = document.getElementById("menuitem-stop"); + if( sm ) + sm.setAttribute("disabled", "true"); + + //Call in to BrowserAppcore to stop the current loading + if (appCore != null) + appCore.stop(); +} +function BrowserReallyReload(reloadType) +{ + // Get a handle to the "canReload" broadcast id + var reloadBElem = document.getElementById("canReload"); + if (!reloadBElem) + return; - function BrowserReallyReload(reloadType) { - // Get a handle to the "canReload" broadcast id - var reloadBElem = document.getElementById("canReload"); - if (!reloadBElem) { - dump("Couldn't obtain handle to reload Broadcast element\n"); - return; - } + var canreload = reloadBElem.getAttribute("disabled"); - var canreload = reloadBElem.getAttribute("disabled"); - + // If the reload button is currently disabled, just return + if ( canreload) + return; - // If the reload button is currently disabled, just return - if ( canreload) { - return; - } - - //Call in to BrowserAppcore to reload the current loading - if (appCore != null) { - dump("Going to reload\n"); - appCore.reload(reloadType); - } else { - dump("BrowserAppCore has not been created!\n"); - } - } + //Call in to BrowserAppcore to reload the current loading + if (appCore != null) + appCore.reload(reloadType); +} - function BrowserHome() +function BrowserHome() +{ + // this eventual calls nsGlobalWIndow::Home() + window.content.home(); + RefreshUrlbar(); +} + +function OpenBookmarkURL(node, datasources) +{ + if (node.getAttribute('container') == "true") + return false; + + var url = node.getAttribute('id'); + try { - // this eventual calls nsGlobalWIndow::Home() - window.content.home(); - RefreshUrlbar(); + // add support for IE favorites under Win32, and NetPositive URLs under BeOS + var rdf = getService( "component://netscape/rdf/rdf-service", "nsIRDFService" ); + if (rdf && datasources) + { + var src = rdf.GetResource(url, true); + var prop = rdf.GetResource("http://home.netscape.com/NC-rdf#URL", true); + var target = datasources.GetTarget(src, prop, true); + if (target) target = target.QueryInterface(Components.interfaces.nsIRDFLiteral); + if (target) target = target.Value; + if (target) url = target; + } } - - function OpenBookmarkURL(node, datasources) + catch(ex) { - if (node.getAttribute('container') == "true") { - return false; - } - - var url = node.getAttribute('id'); - try - { - // add support for IE favorites under Win32, and NetPositive URLs under BeOS - var rdf = Components.classes["component://netscape/rdf/rdf-service"].getService(); - if (rdf) rdf = rdf.QueryInterface(Components.interfaces.nsIRDFService); - if (rdf && datasources) - { - var src = rdf.GetResource(url, true); - var prop = rdf.GetResource("http://home.netscape.com/NC-rdf#URL", true); - var target = datasources.GetTarget(src, prop, true); - if (target) target = target.QueryInterface(Components.interfaces.nsIRDFLiteral); - if (target) target = target.Value; - if (target) url = target; - } - } - catch(ex) - { - } - - // Ignore "NC:" urls. - if (url.substring(0, 3) == "NC:") { - return false; - } - // Check if we have a browser window - if ( window.content == null ) - { - window.openDialog( "chrome://navigator/content/navigator.xul", "_blank", "chrome,all,dialog=no", url ); - } - else - { - window.content.location.href = url; - RefreshUrlbar(); - } } + // Ignore "NC:" urls. + if (url.substring(0, 3) == "NC:") + return false; + + // Check if we have a browser window + if ( window.content == null ) + window.openDialog( "chrome://navigator/content/navigator.xul", "_blank", "chrome,all,dialog=no", url ); + else + window.content.location.href = url; + RefreshUrlbar(); +} + function OpenSearch(tabName, forceDialogFlag, searchStr) { var searchMode = 0; @@ -527,86 +424,63 @@ function OpenSearch(tabName, forceDialogFlag, searchStr) autoOpenSearchPanel = pref.GetBoolPref("browser.search.opensidebarsearchpanel"); searchEngineURI = pref.CopyCharPref("browser.search.defaultengine"); defaultSearchURL = pref.CopyCharPref("browser.search.defaulturl"); - } catch(ex) { } - + if ((defaultSearchURL == null) || (defaultSearchURL == "")) { // Fallback to a Netscape default (one that we can get sidebar search results for) defaultSearchURL = "http://search.netscape.com/cgi-bin/search?search="; } - if (window.content.location.href == searchStr) + if ((searchMode == 1) || (forceDialogFlag == true)) { - dump(searchStr + ' Search: ' + defaultSearchURL + '\n'); - if (!(defaultSearchURL == "http://search.netscape.com/cgi-bin/search?search=")) { - window.content.location.href = defaultSearchURL; + var windowManager = getService( "component://netscape/rdf/datasource?name=window-mediator", "nsIWindowMediator" ); + var searchWindow = windowManager.getMostRecentWindow("search:window"); + if (searchWindow) + { + searchWindow.focus(); + if (searchWindow.loadPage) searchWindow.loadPage(tabName, searchStr); } else - { - window.content.location.href = "http://search.netscape.com/" - } + window.openDialog("chrome://search/content/search.xul", "SearchWindow", "dialog=no,close,chrome,resizable", tabName, searchStr); } else { - if ((searchMode == 1) || (forceDialogFlag == true)) + if ( !searchStr ) + return; + + var searchDS = getService( "component://netscape/rdf/datasource?name=internetsearch", "nsIInternetSearchService" ); + var escapedSearchStr = escape(searchStr); + defaultSearchURL += escapedSearchStr; + + if (searchDS) { - // Use a single search dialog - var cwindowManager = Components.classes["component://netscape/rdf/datasource?name=window-mediator"].getService(); - var iwindowManager = Components.interfaces.nsIWindowMediator; - var windowManager = cwindowManager.QueryInterface(iwindowManager); - var searchWindow = windowManager.getMostRecentWindow("search:window"); - if (searchWindow) + searchDS.RememberLastSearchText(escapedSearchStr); + + if ((searchEngineURI != null) && (searchEngineURI != "")) { - searchWindow.focus(); - if (searchWindow.loadPage) searchWindow.loadPage(tabName, searchStr); - } - else - { - window.openDialog("chrome://search/content/search.xul", "SearchWindow", "dialog=no,close,chrome,resizable", tabName, searchStr); - } - } - else - { - if ((!searchStr) || (searchStr == "")) return; - - var searchDS = Components.classes["component://netscape/rdf/datasource?name=internetsearch"].getService(); - if (searchDS) searchDS = searchDS.QueryInterface(Components.interfaces.nsIInternetSearchService); - - var escapedSearchStr = escape(searchStr); - defaultSearchURL += escapedSearchStr; - - if (searchDS) - { - searchDS.RememberLastSearchText(escapedSearchStr); - - if ((searchEngineURI != null) && (searchEngineURI != "")) + try { - try - { - var searchURL = searchDS.GetInternetSearchURL(searchEngineURI, escapedSearchStr); - if ((searchURL != null) && (searchURL != "")) - { - defaultSearchURL = searchURL; - } - } - catch(ex) + var searchURL = searchDS.GetInternetSearchURL(searchEngineURI, escapedSearchStr); + if ((searchURL != null) && (searchURL != "")) { + defaultSearchURL = searchURL; } } - } - window.content.location.href = defaultSearchURL; + catch(ex) + { + } + } } + window.content.location.href = defaultSearchURL; } // should we try and open up the sidebar to show the "Search Results" panel? if (autoOpenSearchPanel == true) - { RevealSearchPanel(); - } } function RevealSearchPanel() @@ -635,99 +509,94 @@ function RevealSearchPanel() } } - function BrowserNewWindow() - { - OpenBrowserWindow(); - } +function BrowserNewWindow() +{ + OpenBrowserWindow(); +} - function BrowserEditPage(url) - { - window.openDialog( "chrome://editor/content", "_blank", "chrome,all,dialog=no", url ); - } +function BrowserEditPage(url) +{ + window.openDialog( "chrome://editor/content", "_blank", "chrome,all,dialog=no", url ); +} //Note: BrowserNewEditorWindow() was moved to globalOverlay.xul and renamed to NewEditorWindow() - function BrowserOpenWindow() - { - //opens a window where users can select a web location to open - window.openDialog( "chrome://navigator/content/openLocation.xul", "_blank", "chrome,modal", appCore ); - } +function BrowserOpenWindow() +{ + //opens a window where users can select a web location to open + window.openDialog( "chrome://navigator/content/openLocation.xul", "_blank", "chrome,modal", appCore ); +} - function createInstance( progid, iidName ) { - var iid = eval( "Components.interfaces." + iidName ); - return Components.classes[ progid ].createInstance( iid ); - } +function createInstance( progid, iidName ) +{ + var iid = eval( "Components.interfaces." + iidName ); + return Components.classes[ progid ].createInstance( iid ); +} - function createInstanceById( cid, iidName ) { - var iid = eval( "Components.interfaces." + iidName ); - return Components.classesByID[ cid ].createInstance( iid ); - } +function createInstanceById( cid, iidName ) +{ + var iid = eval( "Components.interfaces." + iidName ); + return Components.classesByID[ cid ].createInstance( iid ); +} - function getService( progid, iidName ) { - var iid = eval( "Components.interfaces." + iidName ); - return Components.classes[ progid ].getService( iid ); - } +function getService( progid, iidName ) +{ + var iid = eval( "Components.interfaces." + iidName ); + return Components.classes[ progid ].getService( iid ); +} - function getServiceById( cid, iidName ) { - var iid = eval( "Components.interfaces." + iidName ); - return Components.classesByID[ cid ].getService( iid ); - } +function getServiceById( cid, iidName ) +{ + var iid = eval( "Components.interfaces." + iidName ); + return Components.classesByID[ cid ].getService( iid ); +} - function openNewWindowWith( url ) { - var newWin = window.openDialog( "chrome://navigator/content/navigator.xul", "_blank", "chrome,all,dialog=no", url ); - - // Fix new window. - newWin.saveFileAndPos = true; - } +function openNewWindowWith( url ) +{ + var newWin = window.openDialog( "chrome://navigator/content/navigator.xul", "_blank", "chrome,all,dialog=no", url ); + newWin.saveFileAndPos = true; +} - function BrowserOpenFileWindow() - { - // Get filespecwithui component. - var fileSpec = createInstance( "component://netscape/filespecwithui", "nsIFileSpecWithUI" ); - var url = null; - try { - fileSpec.parentWindow = window; - url = fileSpec.chooseFile( "Open File" ); - fileSpec.parentWindow = null; - } catch ( exception ) { - } - if ( url && url != "" ) { - openNewWindowWith( url ); - } +function BrowserOpenFileWindow() +{ + // Get filespecwithui component. + var fileSpec = createInstance( "component://netscape/filespecwithui", "nsIFileSpecWithUI" ); + var url = null; + try { + fileSpec.parentWindow = window; + url = fileSpec.chooseFile( bundle.GetStringFromName("openFile") ); + fileSpec.parentWindow = null; + } + catch ( exception ) { } - - function OpenFile(url) { - // Obsolete (called from C++ code that is no longer called). - dump( "OpenFile called?\n" ); + if ( url && url != "" ) openNewWindowWith( url ); - } +} - function BrowserCopy() - { - if (appCore != null) { - dump("Copying\n"); - appCore.copy(); - } else { - dump("BrowserAppCore has not been created!\n"); - } - } +function OpenFile(url) +{ + openNewWindowWith( url ); +} +function BrowserCopy() +{ + if (appCore != null) + appCore.copy(); +} - function BrowserAddBookmark(url,title) - { - var bmks = Components.classes["component://netscape/browser/bookmarks-service"].getService(); - bmks = bmks.QueryInterface(Components.interfaces.nsIBookmarksService); - if ((title == null) || (title == "")) - { - title = url; - } - bmks.AddBookmark(url, title); - } +function BrowserAddBookmark(url,title) +{ + var bmks = getService( "component://netscape/browser/bookmarks-service", "nsIBookmarksService" ); + if ( !title ) + title = url; + bmks.AddBookmark(url, title); +} // Set up a lame hack to avoid opening two bookmarks. // Could otherwise happen with two Ctrl-B's in a row. var gDisableBookmarks = false; -function enableBookmarks() { +function enableBookmarks() +{ gDisableBookmarks = false; } @@ -735,22 +604,14 @@ function BrowserEditBookmarks() { // Use a single sidebar bookmarks dialog - var cwindowManager = Components.classes['component://netscape/rdf/datasource?name=window-mediator'].getService(); - var iwindowManager = Components.interfaces.nsIWindowMediator; - var windowManager = cwindowManager.QueryInterface(iwindowManager); - + var windowManager = getService( "component://netscape/rdf/datasource?name=window-mediator", "nsIWindowMediator" ); var bookmarksWindow = windowManager.getMostRecentWindow('bookmarks:manager'); - if (bookmarksWindow) { - //debug("Reuse existing bookmarks window"); + if (bookmarksWindow) bookmarksWindow.focus(); - } else { - //debug("Open a new bookmarks dialog"); - - if (true == gDisableBookmarks) { - //debug("Recently opened one. Wait a little bit."); + else { + if (true == gDisableBookmarks) return; - } gDisableBookmarks = true; window.open("chrome://bookmarks/content/", "_blank", "chrome,menubar,resizable,scrollbars"); @@ -758,267 +619,226 @@ function BrowserEditBookmarks() } } - function BrowserPrintPreview() +function BrowserPrintPreview() +{ + if (appCore != null) + appCore.printPreview(); +} + +function BrowserPrint() +{ + if (appCore != null) + appCore.print(); +} + +function BrowserSetDefaultCharacterSet(aCharset) +{ + if (appCore != null) { + appCore.SetDocumentCharset(aCharset); + window.content.location.reload(); + } +} + +function BrowserClose() +{ + // This code replicates stuff in Shutdown(). It is here because + // window.screenX and window.screenY have real values. We need + // to fix this eventually but by replicating the code here, we + // provide a means of saving position (it just requires that the + // user close the window via File->Close (vs. close box). + + // Get the current window position/size. + var x = window.screenX; + var y = window.screenY; + var h = window.outerHeight; + var w = window.outerWidth; + + // Store these into the window attributes (for persistence). + var win = document.getElementById( "main-window" ); + win.setAttribute( "x", x ); + win.setAttribute( "y", y ); + win.setAttribute( "height", h ); + win.setAttribute( "width", w ); + + window.close(); +} + +function BrowserSelectAll() +{ + if (appCore != null) + appCore.selectAll(); +} + +function BrowserFind() +{ + if (appCore != null) + appCore.find(); +} + +function BrowserFindAgain() +{ + if (appCore != null) + appCore.findNext(); +} + +function BrowserLoadURL() +{ + if (appCore == null) + return; + + // rjc: added support for URL shortcuts (3/30/1999) + try { + var bmks = getService( "component://netscape/browser/bookmarks-service", "nsIBookmarksService" ); + var shortcutURL = bmks.FindShortcut(document.getElementById('urlbar').value); + dump("FindShortcut: in='" + document.getElementById('urlbar').value + "' out='" + shortcutURL + "'\n"); + if ( shortcutURL ) + document.getElementById('urlbar').value = shortcutURL; + } + catch (ex) { + // stifle any exceptions so we're sure to load the URL. + } + appCore.loadUrl( document.getElementById('urlbar').value ); +} + +function readFromClipboard() +{ + var clipboard = getService( "component://netscape/widget/clipboard", "nsIClipboard" ); + var trans = createInstance( "component://netscape/widget/transferable", "nsITransferable" ); + if ( !clipboard || !trans ) + return; + + trans.addDataFlavor( "text/plain" ); + clipboard.getData(trans); + + var data = new Object(); + var dataLen = new Object(); + trans.getTransferData("text/plain", data, dataLen); + var url = null; + if (data) { - // Borrowing this method to show how to - // dynamically change icons - dump("BrowserPrintPreview\n"); - if (appCore != null) { - dump("Changing Icons\n"); - appCore.printPreview(); - } else { - dump("BrowserAppCore has not been created!\n"); - } + data = data.value.QueryInterface(Components.interfaces.nsISupportsString); + url = data.data.substring(0, dataLen.value); } + return url; +} - function BrowserPrint() +function browserLoadClipboardURL(target) +{ + if (!((target.tagName.toUpperCase() == "INPUT" + && (target.type == "" || target.type.toUpperCase() == "TEXT")) + || target.tagName.toUpperCase() == "TEXTAREA")) { - // Borrowing this method to show how to - // dynamically change icons - if (appCore != null) { - appCore.print(); - } - } - - function BrowserSetDefaultCharacterSet(aCharset) - { - if (appCore != null) { - appCore.SetDocumentCharset(aCharset); - window.content.location.reload(); - } else { - dump("BrowserAppCore has not been created!\n"); - } - } - - function BrowserClose() - { - // This code replicates stuff in Shutdown(). It is here because - // window.screenX and window.screenY have real values. We need - // to fix this eventually but by replicating the code here, we - // provide a means of saving position (it just requires that the - // user close the window via File->Close (vs. close box). - - // Get the current window position/size. - var x = window.screenX; - var y = window.screenY; - var h = window.outerHeight; - var w = window.outerWidth; - - // Store these into the window attributes (for persistence). - var win = document.getElementById( "main-window" ); - win.setAttribute( "x", x ); - win.setAttribute( "y", y ); - win.setAttribute( "height", h ); - win.setAttribute( "width", w ); - - window.close(); - } - - - - function BrowserSelectAll() { - if (appCore != null) { - appCore.selectAll(); - } else { - dump("BrowserAppCore has not been created!\n"); - } - } - - function BrowserFind() { - if (appCore != null) { - appCore.find(); - } else { - dump("BrowserAppCore has not been created!\n"); - } - } - - function BrowserFindAgain() { - if (appCore != null) { - appCore.findNext(); - } else { - dump("BrowserAppCore has not been created!\n"); - } - } - - function BrowserLoadURL() - { - if (appCore == null) - { - dump("BrowserAppCore has not been initialized\n"); - return; - } - - // rjc: added support for URL shortcuts (3/30/1999) - try { - var bmks = Components.classes["component://netscape/browser/bookmarks-service"].getService(); - bmks = bmks.QueryInterface(Components.interfaces.nsIBookmarksService); - - var shortcutURL = bmks.FindShortcut(document.getElementById('urlbar').value); - - dump("FindShortcut: in='" + document.getElementById('urlbar').value + "' out='" + shortcutURL + "'\n"); - - if ((shortcutURL != null) && (shortcutURL != "")) { - document.getElementById('urlbar').value = shortcutURL; - } - } - catch (ex) { - // stifle any exceptions so we're sure to load the URL. - } - - appCore.loadUrl(document.getElementById('urlbar').value); - - } - - function readFromClipboard() - { - // Get clipboard. - var clipboard = Components - .classes["component://netscape/widget/clipboard"] - .getService ( Components.interfaces.nsIClipboard ); - // Create tranferable that will transfer the text. - var trans = Components - .classes["component://netscape/widget/transferable"] - .createInstance( Components.interfaces.nsITransferable ); - if ( !clipboard || !trans ) - return; - - trans.addDataFlavor( "text/plain" ); - clipboard.getData(trans); - - var data = new Object(); - var dataLen = new Object(); - trans.getTransferData("text/plain", data, dataLen); - var url = null; - if (data) + var url = readFromClipboard(); + dump ("URL on clipboard: '" + url + "'; length = " + url.length + "\n"); + if (url.length > 0) { - data = data.value.QueryInterface(Components.interfaces - .nsISupportsString); - url = data.data.substring(0, dataLen.value); + var urlBar = document.getElementById("urlbar"); + urlBar.value = url; + BrowserLoadURL(); } - return url; } +} - function browserLoadClipboardURL(target) - { - if (!((target.tagName.toUpperCase() == "INPUT" - && (target.type == "" || target.type.toUpperCase() == "TEXT")) - || target.tagName.toUpperCase() == "TEXTAREA")) - { - var url = readFromClipboard(); - dump ("URL on clipboard: '" + url + "'; length = " + url.length + "\n"); - if (url.length > 0) - { - var urlBar = document.getElementById("urlbar"); - urlBar.value = url; - BrowserLoadURL(); +function OpenMessenger() +{ + window.open("chrome://messenger/content/", "_blank", "chrome,menubar,toolbar,resizable"); +} + +function OpenAddressbook() +{ + window.open("chrome://addressbook/content/", "_blank", "chrome,menubar,toolbar,resizable"); +} + +function BrowserSendLink(pageUrl, pageTitle) +{ + window.openDialog( "chrome://messengercompose/content/", "_blank", + "chrome,all,dialog=no", + "body='" + pageUrl + "',subject='" + pageTitle + + "',bodyislink=true"); +} + +function BrowserSendPage(pageUrl, pageTitle) +{ + window.openDialog( "chrome://messengercompose/content/", "_blank", + "chrome,all,dialog=no", + "attachment='" + pageUrl + "',body='" + pageUrl + + "',subject='" + pageTitle + "',bodyislink=true"); +} + +function BrowserViewSource() +{ + window.openDialog( "chrome://navigator/content/", + "_blank", + "chrome,menubar,status,dialog=no,resizable", + window.content.location, + "view-source" ); +} + +var bindCount = 0; +function onStatus() +{ + var status = document.getElementById("Browser:Status"); + if ( status ) { + var text = status.getAttribute("value"); + if ( text == "" ) + text = defaultStatus; + var statusText = document.getElementById("statusText"); + if ( statusText ) + statusText.setAttribute( "value", text ); + } +} + +function doTests() +{ +} + +var startTime = 0; +function onProgress() +{ + var throbber = document.getElementById("Browser:Throbber"); + var meter = document.getElementById("Browser:LoadingProgress"); + if ( throbber && meter ) { + var busy = throbber.getAttribute("busy"); + var wasBusy = meter.getAttribute("mode") == "undetermined" ? "true" : "false"; + if ( busy == "true" ) { + if ( wasBusy == "false" ) { + // Remember when loading commenced. + startTime = (new Date()).getTime(); + // Turn progress meter on. + meter.setAttribute("mode","undetermined"); } + // Update status bar. + } + else if ( busy == "false" && wasBusy == "true" ) { + // Record page loading time. + var status = document.getElementById("Browser:Status"); + if ( status ) { + var elapsed = ( (new Date()).getTime() - startTime ) / 1000; + var msg = bundle.GetStringFromName("nv_done") + " (" + elapsed + " secs)"; + dump( msg + "\n" ); + status.setAttribute("value",msg); + defaultStatus = msg; + } + // Turn progress meter off. + meter.setAttribute("mode","normal"); } } +} - function OpenMessenger() - { - window.open("chrome://messenger/content/", "_blank", "chrome,menubar,toolbar,resizable"); - } +function dumpProgress() +{ + var broadcaster = document.getElementById("Browser:LoadingProgress"); + var meter = document.getElementById("meter"); + dump( "bindCount=" + bindCount + "\n" ); + dump( "broadcaster mode=" + broadcaster.getAttribute("mode") + "\n" ); + dump( "broadcaster value=" + broadcaster.getAttribute("value") + "\n" ); + dump( "meter mode=" + meter.getAttribute("mode") + "\n" ); + dump( "meter value=" + meter.getAttribute("value") + "\n" ); +} - function OpenAddressbook() - { - window.open("chrome://addressbook/content/", "_blank", "chrome,menubar,toolbar,resizable"); - } - - function BrowserSendLink(pageUrl, pageTitle) - { - window.openDialog( "chrome://messengercompose/content/", "_blank", - "chrome,all,dialog=no", - "body='" + pageUrl + "',subject='" + pageTitle + - "',bodyislink=true"); - } - - function BrowserSendPage(pageUrl, pageTitle) - { - window.openDialog( "chrome://messengercompose/content/", "_blank", - "chrome,all,dialog=no", - "attachment='" + pageUrl + "',body='" + pageUrl + - "',subject='" + pageTitle + "',bodyislink=true"); - } - - function BrowserViewSource() - { - dump("BrowserViewSource(); \n "); - // Use a browser window to view source - window.openDialog( "chrome://navigator/content/", - "_blank", - "chrome,menubar,status,dialog=no,resizable", - window.content.location, - "view-source" ); - } - - - var bindCount = 0; - function onStatus() { - var status = document.getElementById("Browser:Status"); - if ( status ) { - var text = status.getAttribute("value"); - if ( text == "" ) { -//dump( "Setting default status text\n" ); - text = defaultStatus; - } - var statusText = document.getElementById("statusText"); - if ( statusText ) { -//dump( "Setting status text: " + text + "\n" ); - statusText.setAttribute( "value", text ); - } else { -//dump( "Missing statusText when setting status text: " + text + "\n" ); - } - } else { - dump("Can't find status broadcaster!\n"); - } - } - - function doTests() { - } - - var startTime = 0; - function onProgress() { - var throbber = document.getElementById("Browser:Throbber"); - var meter = document.getElementById("Browser:LoadingProgress"); - if ( throbber && meter ) { - var busy = throbber.getAttribute("busy"); - var wasBusy = meter.getAttribute("mode") == "undetermined" ? "true" : "false"; - if ( busy == "true" ) { - if ( wasBusy == "false" ) { - // Remember when loading commenced. - startTime = (new Date()).getTime(); - // Turn progress meter on. - meter.setAttribute("mode","undetermined"); - } - // Update status bar. - } else if ( busy == "false" && wasBusy == "true" ) { - // Record page loading time. - var status = document.getElementById("Browser:Status"); - if ( status ) { - var elapsed = ( (new Date()).getTime() - startTime ) / 1000; - var msg = bundle.GetStringFromName("nv_done") + " (" + elapsed + " secs)"; - dump( msg + "\n" ); - status.setAttribute("value",msg); - defaultStatus = msg; - } - // Turn progress meter off. - meter.setAttribute("mode","normal"); - } - } - } - function dumpProgress() { - var broadcaster = document.getElementById("Browser:LoadingProgress"); - var meter = document.getElementById("meter"); - dump( "bindCount=" + bindCount + "\n" ); - dump( "broadcaster mode=" + broadcaster.getAttribute("mode") + "\n" ); - dump( "broadcaster value=" + broadcaster.getAttribute("value") + "\n" ); - dump( "meter mode=" + meter.getAttribute("mode") + "\n" ); - dump( "meter value=" + meter.getAttribute("value") + "\n" ); - } - -function BrowserReload() { - dump( "Sorry, command not implemented.\n" ); +function BrowserReload() +{ + dump( "Sorry, command not implemented.\n" ); } function hiddenWindowStartup() @@ -1036,153 +856,39 @@ function hiddenWindowStartup() } } -// Tile -function TileWindow() -{ - var xShift = 25; - var yShift = 50; - var done = false; - var windowManager = Components.classes['component://netscape/rdf/datasource?name=window-mediator'].getService(); - dump("got window Manager \n"); - var windowManagerInterface = windowManager.QueryInterface( Components.interfaces.nsIWindowMediator); - - var enumerator = windowManagerInterface.getEnumerator( null ); - - var xOffset = screen.availLeft; - var yOffset = screen.availRight; - do - { - var currentWindow = windowManagerInterface.convertISupportsToDOMWindow ( enumerator.GetNext() ); - if ( currentWindow.screenX == screenX && currentWindow.screenY == screenY ) - { - alreadyThere = true; - break; - } - } while ( enumerator.HasMoreElements() ) - - if ( alreadyThere ) - { - enumerator = windowManagerInterface.getEnumerator( null ); - do - { - var currentWindow = windowManagerInterface.convertISupportsToDOMWindow ( enumerator.GetNext() ); - if ( currentWindow.screenX == screenX+xOffset*xShift+yOffset*xShift && currentWindow.screenY == screenY+yShift*xOffset && window != currentWindow ) - { - xOffset++; - if ( (screenY+outerHeight < screen.availHeight) && (screenY+outerHeight+yShift*xOffset > screen.availHeight ) ) - { - dump(" increment yOffset"); - yOffset++; - xOffset = 0; - } - enumerator = windowManagerInterface.getEnumerator( null ); - } - } while ( enumerator.HasMoreElements() ) - } - - if ( xOffset > 0 || yOffset >0 ) - { - dump( "offsets:"+xOffset+" "+yOffset+"\n"); - dump("Move by ("+ xOffset*xShift + yOffset*xShift +","+ yShift*xOffset +")\n"); - moveBy( xOffset*xShift + yOffset*xShift, yShift*xOffset ); - } -} -// Make sure that a window fits fully on the screen. Will move to preserve size, and then shrink to fit -function FitToScreen() -{ - var moveX = screenX; - var sizeX = outerWidth; - var moveY = screenY; - var sizeY = outerHeight; - - dump( " move to ("+moveX+","+moveY+") size to ("+sizeX+","+sizeY+") \n"); - var totalWidth = screenX+outerWidth; - if ( totalWidth > screen.availWidth ) - { - if( outerWidth > screen.availWidth ) - { - sizeX = screen.availWidth; - moveX = screen.availLeft; - } - else - { - moveX = screen.availWidth- outerWidth; - } - } - - var totalHeight = screenY+outerHeight; - if ( totalHeight > screen.availHeight ) - { - if( outerWidth > screen.availHeight ) - { - sizeY = screen.availHeight; - moveY = screen.availTop; - } - else - { - moveY = screen.availHeight- outerHeight; - } - } - - - dump( " move to ("+moveX+","+moveY+") size to ("+sizeX+","+sizeY+") \n"); - if ( (moveY- screenY != 0 ) || (moveX-screenX != 0 ) ) - moveTo( moveX,moveY ); - - // Maintain a minimum size - if ( sizeY< 100 ) - sizeY = 100; - if ( sizeX < 100 ) - sizeX = 100; - if ( (sizeY- outerHeight != 0 ) || (sizeX-outerWidth != 0 ) ) - { - //outerHeight = sizeY; - //outerWidth = sizeX; - resizeTo( sizeX,sizeY ); - } -} - // Dumps all properties of anObject. -function dumpObject( anObject, prefix ) { - if ( prefix == null ) { - prefix = anObject; - } - for ( prop in anObject ) { - dump( prefix + "." + prop + " = " + anObject[prop] + "\n" ); - } +function dumpObject( anObject, prefix ) +{ + if ( prefix == null ) + prefix = anObject; + for ( prop in anObject ) + dump( prefix + "." + prop + " = " + anObject[prop] + "\n" ); } // Takes JS expression and dumps "expr="+expr+"\n" -function dumpExpr( expr ) { - dump( expr+"="+eval(expr)+"\n" ); +function dumpExpr( expr ) +{ + dump( expr+"="+eval(expr)+"\n" ); } var leakDetector = null; - // Dumps current set of memory leaks. -function dumpMemoryLeaks() { +function dumpMemoryLeaks() +{ if (leakDetector == null) leakDetector = createInstance("component://netscape/xpcom/leakdetector", "nsILeakDetector"); if (leakDetector != null) leakDetector.dumpLeaks(); } -function enableUriLoading() { - var pref = Components.classes['component://netscape/preferences']; - if (pref) - { - pref = pref.getService(); - pref = pref.QueryInterface(Components.interfaces.nsIPref); - pref.SetDefaultBoolPref("browser.uriloader", true); - } +function enableUriLoading() +{ + if( pref ) + pref.SetDefaultBoolPref("browser.uriloader", true); } -function disableUriLoading() { - var pref = Components.classes['component://netscape/preferences']; - if (pref) - { - pref = pref.getService(); - pref = pref.QueryInterface(Components.interfaces.nsIPref); - pref.SetDefaultBoolPref("browser.uriloader", false); - } +function disableUriLoading() +{ + if( pref ) + pref.SetDefaultBoolPref("browser.uriloader", false); } diff --git a/mozilla/xpfe/browser/resources/content/viewSource.xul b/mozilla/xpfe/browser/resources/content/viewSource.xul index acdc86c49a6..2a841204428 100644 --- a/mozilla/xpfe/browser/resources/content/viewSource.xul +++ b/mozilla/xpfe/browser/resources/content/viewSource.xul @@ -1,5 +1,6 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -201,7 +51,7 @@ - + diff --git a/mozilla/xpfe/browser/resources/locale/en-US/navigator.properties b/mozilla/xpfe/browser/resources/locale/en-US/navigator.properties index a502dc8e81e..ca2a45ec589 100644 --- a/mozilla/xpfe/browser/resources/locale/en-US/navigator.properties +++ b/mozilla/xpfe/browser/resources/locale/en-US/navigator.properties @@ -1 +1,3 @@ -nv_done=Document Done \ No newline at end of file +nv_done=Document: Done +homePageDefault=http://www.mozilla.org/ +openFile=Open File diff --git a/mozilla/xpfe/browser/resources/locale/en-US/viewSource.dtd b/mozilla/xpfe/browser/resources/locale/en-US/viewSource.dtd index 66d127284d3..21affdb37c7 100644 --- a/mozilla/xpfe/browser/resources/locale/en-US/viewSource.dtd +++ b/mozilla/xpfe/browser/resources/locale/en-US/viewSource.dtd @@ -7,93 +7,3 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mozilla/xpfe/browser/resources/skin/navigator.css b/mozilla/xpfe/browser/resources/skin/navigator.css index 14544250457..01b7c4d01e0 100644 --- a/mozilla/xpfe/browser/resources/skin/navigator.css +++ b/mozilla/xpfe/browser/resources/skin/navigator.css @@ -108,7 +108,6 @@ input[type="text"]#urlbar { toolbox#main-toolbox { min-width: 10px; background-color: #CCCCCC; - margin-top: 2px; margin-right: 2px; } @@ -153,6 +152,7 @@ titledbutton.bookmarkbutton:active { } titledbutton.bookmarkFolder { + background-color: transparent; list-style-image: url("chrome://global/skin/toolbar-dropdown.gif"); }