From 7273675beca6d550cc422dd7d4f21da58cc76a30 Mon Sep 17 00:00:00 2001 From: "blakeross%telocity.com" Date: Fri, 23 Feb 2001 03:31:46 +0000 Subject: [PATCH] Forced reload, stop button, ability to use bookmark keywords in Open Web Location dialog, persist window choice, .8 -> .9, moving things to more appropriate places (60498, 62078, 49773, others). r=timeless/jag sr=alecf --- .../ui/composer/content/ComposerCommands.js | 2 +- .../en-DE/navigator/locale/openLocation.dtd | 0 .../navigator/locale/openLocation.properties | 0 .../en-GB/navigator/locale/makefile.win | 2 - .../en-GB/navigator/locale/openLocation.dtd | 0 .../navigator/locale/openLocation.properties | 0 modules/libpref/src/init/all.js | 3 +- xpfe/browser/jar.mn | 4 - xpfe/browser/resources/content/navigator.js | 41 ++--- xpfe/browser/resources/content/navigator.xul | 9 +- .../resources/content/navigatorOverlay.xul | 6 +- .../browser/resources/content/openLocation.js | 0 .../resources/content/openLocation.xul | 0 .../os2/platformNavigationBindings.xul | 2 +- .../resources/content/sessionHistoryUI.js | 2 +- .../win/platformNavigationBindings.xul | 3 +- xpfe/browser/resources/locale/en-US/Manifest | 7 - .../resources/locale/en-US/makefile.win | 2 - .../resources/locale/en-US/openLocation.dtd | 0 .../locale/en-US/openLocation.properties | 0 xpfe/communicator/jar.mn | 4 + .../resources/content/contentAreaClick.js | 2 +- .../resources/content/contentAreaDD.js | 2 +- .../resources/content/openLocation.js | 148 ++++++++++++++++++ .../resources/content/openLocation.xul | 89 +++++++++++ .../resources/locale/en-US/MANIFEST | 2 + 26 files changed, 281 insertions(+), 49 deletions(-) delete mode 100644 l10n/langpacks/en-DE/chrome/en-DE/navigator/locale/openLocation.dtd delete mode 100644 l10n/langpacks/en-DE/chrome/en-DE/navigator/locale/openLocation.properties delete mode 100644 l10n/langpacks/en-GB/chrome/en-GB/navigator/locale/openLocation.dtd delete mode 100644 l10n/langpacks/en-GB/chrome/en-GB/navigator/locale/openLocation.properties delete mode 100644 xpfe/browser/resources/content/openLocation.js delete mode 100644 xpfe/browser/resources/content/openLocation.xul delete mode 100644 xpfe/browser/resources/locale/en-US/openLocation.dtd delete mode 100644 xpfe/browser/resources/locale/en-US/openLocation.properties diff --git a/editor/ui/composer/content/ComposerCommands.js b/editor/ui/composer/content/ComposerCommands.js index 9c7f5597a0e..eb5e00f9a5c 100644 --- a/editor/ui/composer/content/ComposerCommands.js +++ b/editor/ui/composer/content/ComposerCommands.js @@ -439,7 +439,7 @@ var nsOpenRemoteCommand = Use 0 and the default checkbox will be to load into an editor and loading into existing browser option is removed */ - window.openDialog( "chrome://navigator/content/openLocation.xul", "_blank", "chrome,modal,titlebar", 0); + window.openDialog( "chrome://communicator/content/openLocation.xul", "_blank", "chrome,modal,titlebar", 0); window._content.focus(); } }; diff --git a/l10n/langpacks/en-DE/chrome/en-DE/navigator/locale/openLocation.dtd b/l10n/langpacks/en-DE/chrome/en-DE/navigator/locale/openLocation.dtd deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/l10n/langpacks/en-DE/chrome/en-DE/navigator/locale/openLocation.properties b/l10n/langpacks/en-DE/chrome/en-DE/navigator/locale/openLocation.properties deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/l10n/langpacks/en-GB/chrome/en-GB/navigator/locale/makefile.win b/l10n/langpacks/en-GB/chrome/en-GB/navigator/locale/makefile.win index 1d5452ad43a..22fe61c9099 100644 --- a/l10n/langpacks/en-GB/chrome/en-GB/navigator/locale/makefile.win +++ b/l10n/langpacks/en-GB/chrome/en-GB/navigator/locale/makefile.win @@ -28,8 +28,6 @@ include <$(THEME_ROOT_DEPTH)\theme.mk> install:: $(MAKE_INSTALL) navigator.dtd $(DIST)\bin\chrome\locales\$(THEME)\navigator\locale $(MAKE_INSTALL) navigator.properties $(DIST)\bin\chrome\locales\$(THEME)\navigator\locale - $(MAKE_INSTALL) openLocation.dtd $(DIST)\bin\chrome\locales\$(THEME)\navigator\locale - $(MAKE_INSTALL) openLocation.properties $(DIST)\bin\chrome\locales\$(THEME)\navigator\locale $(MAKE_INSTALL) viewSource.dtd $(DIST)\bin\chrome\locales\$(THEME)\navigator\locale clobber:: diff --git a/l10n/langpacks/en-GB/chrome/en-GB/navigator/locale/openLocation.dtd b/l10n/langpacks/en-GB/chrome/en-GB/navigator/locale/openLocation.dtd deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/l10n/langpacks/en-GB/chrome/en-GB/navigator/locale/openLocation.properties b/l10n/langpacks/en-GB/chrome/en-GB/navigator/locale/openLocation.properties deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js index b21f9bd945f..336142d74c3 100644 --- a/modules/libpref/src/init/all.js +++ b/modules/libpref/src/init/all.js @@ -28,7 +28,7 @@ pref("network.search.url","http://cgi.netscape.com/cgi-bin/url_search.cgi?search pref("keyword.URL", "http://keyword.netscape.com/keyword/"); pref("keyword.enabled", true); pref("general.useragent.locale", "chrome://navigator/locale/navigator.properties"); -pref("general.useragent.misc", "0.8"); +pref("general.useragent.misc", "0.9"); pref("general.startup.browser", true); pref("general.startup.mail", false); @@ -38,6 +38,7 @@ pref("general.startup.compose", false); pref("general.startup.addressbook", false); pref("general.open_location.last_url", ""); +pref("general.open_location.last_window_choice", 0); // 0 = blank, 1 = home (browser.startup.homepage), 2 = last pref("browser.startup.page", 1); diff --git a/xpfe/browser/jar.mn b/xpfe/browser/jar.mn index 6881604b0a8..4b51171c5e2 100644 --- a/xpfe/browser/jar.mn +++ b/xpfe/browser/jar.mn @@ -1,7 +1,5 @@ comm.jar: content/navigator/contents.rdf (resources/content/contents.rdf) - content/navigator/openLocation.js (resources/content/openLocation.js) - content/navigator/openLocation.xul (resources/content/openLocation.xul) content/navigator/viewsource.js (resources/content/viewsource.js) content/navigator/viewSource.xul (resources/content/viewSource.xul) content/navigator/pageInfo.js (resources/content/pageInfo.js) @@ -16,8 +14,6 @@ comm.jar: en-US.jar: locale/en-US/navigator/contents.rdf (resources/locale/en-US/contents.rdf) - locale/en-US/navigator/openLocation.dtd (resources/locale/en-US/openLocation.dtd) - locale/en-US/navigator/openLocation.properties (resources/locale/en-US/openLocation.properties) locale/en-US/navigator/viewSource.dtd (resources/locale/en-US/viewSource.dtd) locale/en-US/navigator/pageInfo.dtd (resources/locale/en-US/pageInfo.dtd) locale/en-US/navigator/navigator.dtd (resources/locale/en-US/navigator.dtd) diff --git a/xpfe/browser/resources/content/navigator.js b/xpfe/browser/resources/content/navigator.js index da21ec9b0d0..6f8fb9948dd 100644 --- a/xpfe/browser/resources/content/navigator.js +++ b/xpfe/browser/resources/content/navigator.js @@ -513,7 +513,7 @@ function Startup() if (startPage) loadURI(startPage); - + // Perform default browser checking. checkForDefaultBrowser(); } @@ -603,16 +603,25 @@ function BrowserStop() getWebNavigation().stop(); } -function BrowserReallyReload(event) +function BrowserReload() { - // Default is no flags. var reloadFlags = nsIWebNavigation.LOAD_FLAGS_NONE; - // See if the event was a shift-click. - if (event && event.shiftKey) { - // Shift key means bypass proxy and cache. - reloadFlags = nsIWebNavigation.LOAD_FLAGS_BYPASS_PROXY | nsIWebNavigation.LOAD_FLAGS_BYPASS_CACHE; + try { + getWebNavigation().reload(reloadFlags); + } + catch(ex) { + } +} + +function BrowserReloadSkipCache() +{ + // Bypass proxy and cache. + var reloadFlags = nsIWebNavigation.LOAD_FLAGS_BYPASS_PROXY | nsIWebNavigation.LOAD_FLAGS_BYPASS_CACHE; + try { + getWebNavigation().reload(reloadFlags); + } + catch(ex) { } - getWebNavigation().reload(reloadFlags); } function BrowserHome() @@ -760,7 +769,7 @@ function RevealSearchPanel() function BrowserOpenWindow() { //opens a window where users can select a web location to open - openDialog("chrome://navigator/content/openLocation.xul", "_blank", "chrome,modal,titlebar", window); + openDialog("chrome://communicator/content/openLocation.xul", "_blank", "chrome,modal,titlebar", window); } /* Called from the openLocation dialog. This allows that dialog to instruct @@ -890,10 +899,11 @@ function loadURI(uri) function BrowserLoadURL() { var url = gURLBar.value; - loadShortcutOrURI(url); + loadURI(getShortcutOrURI(url)); + _content.focus(); } -function loadShortcutOrURI(url) +function getShortcutOrURI(url) { // rjc: added support for URL shortcuts (3/30/1999) try { @@ -923,11 +933,8 @@ function loadShortcutOrURI(url) url = shortcutURL; } catch (ex) { - // stifle any exceptions so we're sure to load the URL. } - - loadURI(url); - _content.focus(); + return url; } function readFromClipboard() @@ -992,10 +999,6 @@ function BrowserPageInfo() "chrome,dialog=no"); } -function BrowserReload() -{ -} - function hiddenWindowStartup() { // Disable menus which are not appropriate diff --git a/xpfe/browser/resources/content/navigator.xul b/xpfe/browser/resources/content/navigator.xul index df6cf30326a..111f69f2901 100644 --- a/xpfe/browser/resources/content/navigator.xul +++ b/xpfe/browser/resources/content/navigator.xul @@ -87,7 +87,6 @@ Contributor(s): ______________________________________. --> - @@ -140,9 +139,9 @@ Contributor(s): ______________________________________. --> -