fix browser url. add findUtils.js

This commit is contained in:
blakeross%telocity.com 2002-04-05 10:08:14 +00:00
parent 73532b1bce
commit a950438f19
4 changed files with 117 additions and 11 deletions

View File

@ -65,7 +65,7 @@ Contributor(s): ______________________________________. -->
<script type="application/x-javascript" src="chrome://browser/content/nsBrowserContentListener.js"/>
<script type="application/x-javascript" src="chrome://communicator/content/contentAreaClick.js"/>
<script type="application/x-javascript" src="chrome://communicator/content/contentAreaDD.js"/>
<script type="application/x-javascript" src="chrome://communicator/content/findUtils.js"/>
<script type="application/x-javascript" src="chrome://browser/content/findUtils.js"/>
<script type="application/x-javascript" src="chrome://browser/content/bookmarks/bookmarksOverlay.js"/>
<script type="application/x-javascript" src="chrome://browser/content/personalToolbar.js"/>

View File

@ -0,0 +1,114 @@
/* -*- 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):
* Simon Fraser <sfraser@netscape.com>
* Dean Tessman <dean_tessman@hotmail.com>
*
* 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 ***** */
var gPromptService;
var gFindBundle;
// browser is the <browser> element
// rootSearchWindow is the window to constrain the search to (normally window._content)
// startSearchWindow is the frame to start searching (can be, and normally, rootSearchWindow)
function findInPage(browser, rootSearchWindow, startSearchWindow)
{
var findInst = browser.webBrowserFind;
// set up the find to search the focussedWindow, bounded by the content window.
var findInFrames = findInst.QueryInterface(Components.interfaces.nsIWebBrowserFindInFrames);
findInFrames.rootSearchFrame = rootSearchWindow;
findInFrames.currentSearchFrame = startSearchWindow;
// always search in frames for now. We could add a checkbox to the dialog for this.
findInst.searchFrames = true;
// is the dialog up already?
if ("findDialog" in window && window.findDialog)
window.findDialog.focus();
else
window.findDialog = window.openDialog("chrome://browser/content/find/findDialog.xul", "_blank", "chrome,resizable=no,dependent=yes", findInst);
}
function findAgainInPage(browser, rootSearchWindow, startSearchWindow)
{
if ("findDialog" in window && window.findDialog)
window.findDialog.focus();
else
{
var findInst = browser.webBrowserFind;
// set up the find to search the focussedWindow, bounded by the content window.
var findInFrames = findInst.QueryInterface(Components.interfaces.nsIWebBrowserFindInFrames);
findInFrames.rootSearchFrame = rootSearchWindow;
findInFrames.currentSearchFrame = startSearchWindow;
// always search in frames for now. We could add a checkbox to the dialog for this.
findInst.searchFrames = true;
// get the find service, which stores global find state, and init the
// nsIWebBrowser find with it. We don't assume that there was a previous
// Find that set this up.
var findService = Components.classes["@mozilla.org/find/find_service;1"]
.getService(Components.interfaces.nsIFindService);
findInst.searchString = findService.searchString;
findInst.matchCase = findService.matchCase;
findInst.wrapFind = findService.wrapFind;
findInst.entireWord = findService.entireWord;
findInst.findBackwards = findService.findBackwards;
var found = false;
if (findInst.searchString.length == 0)
// no previous find text
return findInPage(browser, rootSearchWindow, startSearchWindow);
found = findInst.findNext();
if (!found) {
if (!gPromptService)
gPromptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService()
.QueryInterface(Components.interfaces.nsIPromptService);
if (!gFindBundle)
gFindBundle = document.getElementById("findBundle");
gPromptService.alert(window, gFindBundle.getString("notFoundTitle"), gFindBundle.getString("notFoundWarning"));
}
}
}
function canFindAgainInPage()
{
var findService = Components.classes["@mozilla.org/find/find_service;1"]
.getService(Components.interfaces.nsIFindService);
return (findService.searchString.length > 0);
}

View File

@ -113,16 +113,7 @@ function setOfflineUI(offline)
var goPrefWindow = 0;
function getBrowserURL() {
try {
var prefs = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefBranch);
var url = prefs.getCharPref("browser.chromeURL");
if (url)
return url;
} catch(e) {
}
return "chrome://browser/content/navigator.xul";
return "chrome://browser/content/browser.xul";
}
function goPageSetup(printSettings)

View File

@ -18,6 +18,7 @@ browser.jar:
content/browser/viewsource.js (content/viewsource.js)
content/browser/viewSource.xul (content/viewSource.xul)
content/browser/utilityOverlay.js (content/utilityOverlay.js)
content/browser/findUtils.js (content/findUtils.js)
classic.jar:
skin/classic/browser/browser.css (skin/browser.css)
skin/classic/browser/contents.rdf (skin/contents.rdf)