From ac048e9ec53f6f4c6ad9652ca27f819f4967ceda Mon Sep 17 00:00:00 2001 From: "hwaara%chello.se" Date: Thu, 6 Dec 2001 00:20:33 +0000 Subject: [PATCH] #84910, split up navigator.js. Checking in for Doron Rosenberg . r=jag, sr=alecf --- xpfe/browser/jar.mn | 5 +- xpfe/browser/resources/content/browser.js | 148 ++++++++++++++++++ xpfe/browser/resources/content/navigator.js | 110 ------------- xpfe/browser/resources/content/navigator.xul | 1 + xpfe/browser/resources/content/viewSource.xul | 3 +- xpfe/browser/resources/content/viewsource.js | 4 +- .../global/resources/content/hiddenWindow.xul | 1 + 7 files changed, 157 insertions(+), 115 deletions(-) create mode 100644 xpfe/browser/resources/content/browser.js diff --git a/xpfe/browser/jar.mn b/xpfe/browser/jar.mn index 7f21afcbc81c..b1a7e8210925 100644 --- a/xpfe/browser/jar.mn +++ b/xpfe/browser/jar.mn @@ -1,8 +1,7 @@ comm.jar: content/navigator/contents.rdf (resources/content/contents.rdf) content/navigator-region/contents.rdf (resources/content/contents-region.rdf) - content/navigator/viewsource.js (resources/content/viewsource.js) - content/navigator/viewSource.xul (resources/content/viewSource.xul) + content/navigator/browser.js (resources/content/browser.js) content/navigator/pageInfo.js (resources/content/pageInfo.js) content/navigator/pageInfo.xul (resources/content/pageInfo.xul) content/navigator/navigator.xul (resources/content/navigator.xul) @@ -24,6 +23,8 @@ comm.jar: content/navigator/linkToolbarOverlay.xul (resources/content/linkToolbarOverlay.xul) content/navigator/personalToolbar.js (resources/content/personalToolbar.js) content/navigator/turboDialog.xul (resources/content/turboDialog.xul) + content/navigator/viewsource.js (resources/content/viewsource.js) + content/navigator/viewSource.xul (resources/content/viewSource.xul) en-US.jar: locale/en-US/navigator/contents.rdf (resources/locale/en-US/contents.rdf) locale/en-US/navigator/viewSource.dtd (resources/locale/en-US/viewSource.dtd) diff --git a/xpfe/browser/resources/content/browser.js b/xpfe/browser/resources/content/browser.js new file mode 100644 index 000000000000..32b145ea66ee --- /dev/null +++ b/xpfe/browser/resources/content/browser.js @@ -0,0 +1,148 @@ +/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: NPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Netscape 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/NPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is mozilla.org code. + * + * The Initial Developer of the Original Code is + * Netscape Communications Corporation. + * Portions created by the Initial Developer are Copyright (C) 1998 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Blake Ross + * Peter Annema + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the NPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the NPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +const nsIWebNavigation = Components.interfaces.nsIWebNavigation; + +function getWebNavigation() +{ + try { + return getBrowser().webNavigation; + } catch (e) { + return null; + } +} + +function BrowserReloadWithFlags(reloadFlags) +{ + /* First, we'll try to use the session history object to reload so + * that framesets are handled properly. If we're in a special + * window (such as view-source) that has no session history, fall + * back on using the web navigation's reload method. + */ + + var webNav = getWebNavigation(); + try { + var sh = webNav.sessionHistory; + if (sh) + webNav = sh.QueryInterface(Components.interfaces.nsIWebNavigation); + } catch (e) { + } + + try { + webNav.reload(reloadFlags); + } catch (e) { + } +} + +function BrowserPrintPreview() +{ + // using _content.print() until printing becomes scriptable on docShell + try { + _content.printPreview(); + } catch (e) { + // Pressing cancel is expressed as an NS_ERROR_FAILURE return value, + // causing an exception to be thrown which we catch here. + // Unfortunately this will also consume helpful failures, so add a + // dump(e); // if you need to debug + } +} + +function BrowserPrintSetup() +{ + goPageSetup(); // from utilityOverlay.js +} + +function BrowserPrint() +{ + // using _content.print() until printing becomes scriptable on docShell + try { + _content.print(); + } catch (e) { + // Pressing cancel is expressed as an NS_ERROR_FAILURE return value, + // causing an exception to be thrown which we catch here. + // Unfortunately this will also consume helpful failures, so add a + // dump(e); // if you need to debug + } +} + +function BrowserSetDefaultCharacterSet(aCharset) +{ + // no longer needed; set when setting Force; see bug 79608 +} + +function BrowserSetForcedCharacterSet(aCharset) +{ + var docCharset = getBrowser().docShell.QueryInterface( + Components.interfaces.nsIDocCharset); + docCharset.charset = aCharset; + BrowserReloadWithFlags(nsIWebNavigation.LOAD_FLAGS_CHARSET_CHANGE); +} + +function BrowserSetForcedDetector() +{ + getBrowser().documentCharsetInfo.forcedDetector = true; +} + +function BrowserFind() +{ + var focusedWindow = document.commandDispatcher.focusedWindow; + if (!focusedWindow || focusedWindow == window) + focusedWindow = window._content; + + findInPage(getBrowser(), window._content, focusedWindow) +} + +function BrowserFindAgain() +{ + var focusedWindow = document.commandDispatcher.focusedWindow; + if (!focusedWindow || focusedWindow == window) + focusedWindow = window._content; + + findAgainInPage(getBrowser(), window._content, focusedWindow) +} + +function BrowserCanFindAgain() +{ + return canFindAgainInPage(); +} + +function getMarkupDocumentViewer() +{ + return getBrowser().markupDocumentViewer; +} diff --git a/xpfe/browser/resources/content/navigator.js b/xpfe/browser/resources/content/navigator.js index 64d7aee4eda1..5e596021e225 100644 --- a/xpfe/browser/resources/content/navigator.js +++ b/xpfe/browser/resources/content/navigator.js @@ -37,7 +37,6 @@ * * ***** END LICENSE BLOCK ***** */ -const nsIWebNavigation = Components.interfaces.nsIWebNavigation; const XREMOTESERVICE_CONTRACTID = "@mozilla.org/browser/xremoteservice;1"; var gURLBar = null; @@ -168,20 +167,6 @@ function getBrowser() return gBrowser; } -function getWebNavigation() -{ - try { - return getBrowser().webNavigation; - } catch (e) { - return null; - } -} - -function getMarkupDocumentViewer() -{ - return getBrowser().markupDocumentViewer; -} - function getHomePage() { var url; @@ -574,28 +559,6 @@ function BrowserReloadSkipCache() return BrowserReloadWithFlags(reloadFlags); } -function BrowserReloadWithFlags(reloadFlags) -{ - /* First, we'll try to use the session history object to reload so - * that framesets are handled properly. If we're in a special - * window (such as view-source) that has no session history, fall - * back on using the web navigation's reload method. - */ - - var webNav = getWebNavigation(); - try { - var sh = webNav.sessionHistory; - if (sh) - webNav = sh.QueryInterface(Components.interfaces.nsIWebNavigation); - } catch (e) { - } - - try { - webNav.reload(reloadFlags); - } catch (e) { - } -} - function BrowserHome() { var homePage = getHomePage(); @@ -875,56 +838,6 @@ function BrowserEditBookmarks() } } -function BrowserPrintPreview() -{ - // using _content.print() until printing becomes scriptable on docShell - try { - _content.printPreview(); - } catch (e) { - // Pressing cancel is expressed as an NS_ERROR_FAILURE return value, - // causing an exception to be thrown which we catch here. - // Unfortunately this will also consume helpful failures, so add a - // dump(e); // if you need to debug - } -} - - -function BrowserPrintSetup() -{ - goPageSetup(); // from utilityOverlay.js -} - -function BrowserPrint() -{ - // using _content.print() until printing becomes scriptable on docShell - try { - _content.print(); - } catch (e) { - // Pressing cancel is expressed as an NS_ERROR_ABORT return value, - // causing an exception to be thrown which we catch here. - // Unfortunately this will also consume helpful failures, so add a - // dump(e); // if you need to debug - } -} - -function BrowserSetDefaultCharacterSet(aCharset) -{ - // no longer needed; set when setting Force; see bug 79608 -} - -function BrowserSetForcedCharacterSet(aCharset) -{ - var docCharset = getBrowser().docShell.QueryInterface( - Components.interfaces.nsIDocCharset); - docCharset.charset = aCharset; - BrowserReloadWithFlags(nsIWebNavigation.LOAD_FLAGS_CHARSET_CHANGE); -} - -function BrowserSetForcedDetector() -{ - getBrowser().documentCharsetInfo.forcedDetector = true; -} - function BrowserCloseTabOrWindow() { var browser = getBrowser(); @@ -961,29 +874,6 @@ function BrowserCloseWindow() window.close(); } -function BrowserFind() -{ - var focusedWindow = document.commandDispatcher.focusedWindow; - if (!focusedWindow || focusedWindow == window) - focusedWindow = window._content; - - findInPage(getBrowser(), window._content, focusedWindow) -} - -function BrowserFindAgain() -{ - var focusedWindow = document.commandDispatcher.focusedWindow; - if (!focusedWindow || focusedWindow == window) - focusedWindow = window._content; - - findAgainInPage(getBrowser(), window._content, focusedWindow) -} - -function BrowserCanFindAgain() -{ - return canFindAgainInPage(); -} - function loadURI(uri) { try { diff --git a/xpfe/browser/resources/content/navigator.xul b/xpfe/browser/resources/content/navigator.xul index 7ce3b9ffb723..ac34a0b8fa24 100644 --- a/xpfe/browser/resources/content/navigator.xul +++ b/xpfe/browser/resources/content/navigator.xul @@ -75,6 +75,7 @@ Contributor(s): ______________________________________. -->