mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Don't point to content and locale files from chrome://navigator/.

This commit is contained in:
bryner%netscape.com 2002-04-04 04:54:32 +00:00
Родитель bc7a1e56d5
Коммит fb76f51425
10 изменённых файлов: 36 добавлений и 35 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
browser/base/resources/content/browser.js
Просмотреть файл

@ -1099,7 +1099,7 @@ function BrowserViewSource()
function BrowserViewSourceOfURL(url, charset)
{
// try to open a view-source window while inheriting the charset (if any)
openDialog("chrome://navigator/content/viewSource.xul",
openDialog("chrome://browser/content/viewSource.xul",
"_blank",
"scrollbars,resizable,chrome,dialog=no",
url, charset);
@ -1108,7 +1108,7 @@ function BrowserViewSourceOfURL(url, charset)
// doc=null for regular page info, doc=owner document for frame info.
function BrowserPageInfo(doc)
{
window.openDialog("chrome://navigator/content/pageInfo.xul",
window.openDialog("chrome://browser/content/pageInfo.xul",
"_blank",
"chrome,dialog=no",
doc);

23
browser/base/resources/content/browser.xul
Просмотреть файл

@ -23,8 +23,8 @@ Contributor(s): ______________________________________. -->
<?xml-stylesheet href="chrome://navigator/skin/" type="text/css"?>
<?xul-overlay href="chrome://navigator/content/navigatorOverlay.xul"?>
<?xul-overlay href="chrome://navigator/content/navExtraOverlay.xul"?>
<?xul-overlay href="chrome://browser/content/navigatorOverlay.xul"?>
<?xul-overlay href="chrome://browser/content/navExtraOverlay.xul"?>
<?xul-overlay href="chrome://communicator/content/sidebar/sidebarOverlay.xul"?>
<?xul-overlay href="chrome://communicator/content/securityOverlay.xul"?>
<?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>
@ -36,7 +36,7 @@ Contributor(s): ______________________________________. -->
%brandDTD;
<!ENTITY % buildDTD SYSTEM "chrome://global/content/build.dtd" >
%buildDTD;
<!ENTITY % navigatorDTD SYSTEM "chrome://navigator/locale/navigator.dtd" >
<!ENTITY % navigatorDTD SYSTEM "chrome://browser/locale/navigator.dtd" >
%navigatorDTD;
]>
@ -62,25 +62,26 @@ Contributor(s): ______________________________________. -->
<script type="application/x-javascript" src="chrome://global/content/fullScreen.js"/>
<!-- Content Area -->
<script type="application/x-javascript" src="chrome://navigator/content/nsBrowserStatusHandler.js"/>
<script type="application/x-javascript" src="chrome://navigator/content/nsBrowserContentListener.js"/>
<script type="application/x-javascript" src="chrome://browser/content/nsBrowserStatusHandler.js"/>
<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"/>
<!-- Shared Bookmarks Utility Library -->
<script type="application/x-javascript" src="chrome://browser/content/bookmarks/bookmarksOverlay.js"/>
<script type="application/x-javascript" src="chrome://navigator/content/personalToolbar.js"/>
<script type="application/x-javascript" src="chrome://browser/content/personalToolbar.js"/>
<!-- Navigator -->
<script type="application/x-javascript" src="chrome://navigator/content/browser.js"/>
<script type="application/x-javascript" src="chrome://navigator/content/navigator.js"/>
<script type="application/x-javascript" src="chrome://navigator/content/navigatorDD.js"/>
<script type="application/x-javascript" src="chrome://navigator/content/sessionHistoryUI.js"/>
<script type="application/x-javascript" src="chrome://browser/content/browser.js"/>
<script type="application/x-javascript" src="chrome://browser/content/browser-2.js"/>
<script type="application/x-javascript" src="chrome://browser/content/navigator.js"/>
<script type="application/x-javascript" src="chrome://browser/content/navigatorDD.js"/>
<script type="application/x-javascript" src="chrome://browser/content/sessionHistoryUI.js"/>
<!-- hook for stringbundle overlays -->
<stringbundleset id="stringbundleset">
<stringbundle id="bundle_navigator" src="chrome://navigator/locale/navigator.properties"/>
<stringbundle id="bundle_navigator" src="chrome://browser/locale/navigator.properties"/>
<stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
<stringbundle id="bundle_navigator_region" src="chrome://navigator-region/locale/region.properties"/>
<stringbundle id="bundle_brand_region" src="chrome://global-region/locale/region.properties"/>

6
browser/base/resources/content/metadata.xul
Просмотреть файл

@ -40,7 +40,7 @@
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
<!DOCTYPE window [
<!ENTITY % metadataDTD SYSTEM "chrome://navigator/locale/metadata.dtd" >
<!ENTITY % metadataDTD SYSTEM "chrome://browser/locale/metadata.dtd" >
%metadataDTD;
]>
@ -52,9 +52,9 @@
persist="screenX screenY"
screenX="24" screenY="24">
<script type="application/x-javascript" src="chrome://navigator/content/metadata.js"/>
<script type="application/x-javascript" src="chrome://browser/content/metadata.js"/>
<stringbundle src="chrome://navigator/locale/metadata.properties" id="bundle_metadata"/>
<stringbundle src="chrome://browser/locale/metadata.properties" id="bundle_metadata"/>
<stringbundle src="chrome://global/locale/languageNames.properties" id="bundle_languages"/>
<stringbundle src="chrome://global/locale/regionNames.properties" id="bundle_regions"/>

8
browser/base/resources/content/navigator.css
Просмотреть файл

@ -7,19 +7,19 @@
/* ::::: urlbar autocomplete ::::: */
#urlbar {
-moz-binding: url("chrome://navigator/content/urlbarBindings.xml#urlbar");
-moz-binding: url("chrome://browser/content/urlbarBindings.xml#urlbar");
}
.autocomplete-result-popup[for="urlbar"] {
-moz-binding: url("chrome://navigator/content/urlbarBindings.xml#autocomplete-result-popup") !important;
-moz-binding: url("chrome://browser/content/urlbarBindings.xml#autocomplete-result-popup") !important;
}
.autocomplete-search-box {
-moz-binding: url("chrome://navigator/content/urlbarBindings.xml#autocomplete-search-box");
-moz-binding: url("chrome://browser/content/urlbarBindings.xml#autocomplete-search-box");
}
.autocomplete-search-engine {
-moz-binding: url("chrome://navigator/content/urlbarBindings.xml#autocomplete-search-engine");
-moz-binding: url("chrome://browser/content/urlbarBindings.xml#autocomplete-search-engine");
}

4
browser/base/resources/content/navigatorOverlay.xul
Просмотреть файл

@ -28,10 +28,10 @@
<?xul-overlay href="chrome://communicator/content/viewZoomOverlay.xul"?>
<?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
<?xul-overlay href="chrome://global/content/charsetOverlay.xul"?>
<?xul-overlay href="chrome://navigator/content/platformNavigationBindings.xul"?>
<?xul-overlay href="chrome://browser/content/platformNavigationBindings.xul"?>
<!DOCTYPE window [
<!ENTITY % navigatorDTD SYSTEM "chrome://navigator/locale/navigator.dtd" >
<!ENTITY % navigatorDTD SYSTEM "chrome://browser/locale/navigator.dtd" >
%navigatorDTD;
<!ENTITY % contentAreaCommandsDTD SYSTEM "chrome://communicator/locale/contentAreaCommands.dtd" >
%contentAreaCommandsDTD;

8
browser/base/resources/content/pageInfo.xul
Просмотреть файл

@ -31,9 +31,9 @@
<!DOCTYPE window [
<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd">
%brandDTD;
<!ENTITY % navigatorDTD SYSTEM "chrome://navigator/locale/navigator.dtd">
<!ENTITY % navigatorDTD SYSTEM "chrome://browser/locale/navigator.dtd">
%navigatorDTD;
<!ENTITY % pageInfoDTD SYSTEM "chrome://navigator/locale/pageInfo.dtd">
<!ENTITY % pageInfoDTD SYSTEM "chrome://browser/locale/pageInfo.dtd">
%pageInfoDTD;
]>
@ -47,7 +47,7 @@
persist="screenX screenY width height sizemode">
<script type="application/x-javascript" src="chrome://communicator/content/contentAreaUtils.js"/>
<script type="application/x-javascript" src="chrome://navigator/content/pageInfo.js"/>
<script type="application/x-javascript" src="chrome://browser/content/pageInfo.js"/>
<keyset>
<key id="closeWindow" key="&closeWindow;" modifiers="accel" oncommand="window.close()"/>
@ -56,7 +56,7 @@
<!-- keys are appended from the overlay -->
<keyset id="dialogKeys"/>
<stringbundle id="pageinfobundle" src="chrome://navigator/locale/pageInfo.properties"/>
<stringbundle id="pageinfobundle" src="chrome://browser/locale/pageInfo.properties"/>
<tabbox id="tabbox" flex="1">
<tabs id="tabs">

4
browser/base/resources/content/toolbarTest.xul
Просмотреть файл

@ -107,7 +107,7 @@
</popupset>
<toolbox id="main-toolbox"
datasources="chrome://navigator/content/toolbarTest.rdf rdf:bookmarks"
datasources="chrome://browser/content/toolbarTest.rdf rdf:bookmarks"
ref="urn:mozilla:navigator:toolbars:root">
<template>
@ -241,7 +241,7 @@
</toolbox>
<!--
<tree id="dispTree" datasources="rdf:bookmarks chrome://navigator/content/toolbarTest.rdf"
<tree id="dispTree" datasources="rdf:bookmarks chrome://browser/content/toolbarTest.rdf"
ref="urn:mozilla:navigator:toolbars:root"
style="height: 0px; width: 0px;" flex="1">

2
browser/base/resources/content/turboDialog.xul
Просмотреть файл

@ -25,7 +25,7 @@
<?xml-stylesheet href="chrome://communicator/skin/dialogs.css" type="text/css"?>
<!DOCTYPE window [
<!ENTITY % turboDialogDTD SYSTEM "chrome://navigator/locale/turboDialog.dtd" >
<!ENTITY % turboDialogDTD SYSTEM "chrome://browser/locale/turboDialog.dtd" >
%turboDialogDTD;
<!ENTITY % dialogOverlayDTD SYSTEM "chrome://global-platform/locale/platformDialogOverlay.dtd" >
%dialogOverlayDTD;

2
browser/base/resources/content/urlbarBindings.xml
Просмотреть файл

@ -386,7 +386,7 @@
<setter><![CDATA[
this.mSearchValue = val;
var kids = this.childNodes;
var searchForStrBundle = srGetStrBundle("chrome://navigator/locale/navigator.properties");
var searchForStrBundle = srGetStrBundle("chrome://browser/locale/navigator.properties");
for (var i = 0; i < kids.length; ++i) {
var name = kids[i].getAttribute("name");
var searchForStr = searchForStrBundle.formatStringFromName("searchFor", [name, val], 2);

10
browser/base/resources/content/viewSource.xul
Просмотреть файл

@ -23,14 +23,14 @@
- Doron Rosenberg (doronr@naboonline.com)
-->
<?xul-overlay href="chrome://navigator/content/navigatorOverlay.xul"?>
<?xul-overlay href="chrome://browser/content/navigatorOverlay.xul"?>
<!DOCTYPE window [
<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
%brandDTD;
<!ENTITY % sourceDTD SYSTEM "chrome://navigator/locale/viewSource.dtd" >
<!ENTITY % sourceDTD SYSTEM "chrome://browser/locale/viewSource.dtd" >
%sourceDTD;
<!ENTITY % navigatorDTD SYSTEM "chrome://navigator/locale/navigator.dtd" >
<!ENTITY % navigatorDTD SYSTEM "chrome://browser/locale/navigator.dtd" >
%navigatorDTD;
<!ENTITY % contentAreaCommandsDTD SYSTEM "chrome://communicator/locale/contentAreaCommands.dtd" >
%contentAreaCommandsDTD;
@ -54,8 +54,8 @@
<script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
<script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
<script type="application/x-javascript" src="chrome://communicator/content/contentAreaDD.js"/>
<script type="application/x-javascript" src="chrome://navigator/content/browser.js"/>
<script type="application/x-javascript" src="chrome://navigator/content/viewsource.js"/>
<script type="application/x-javascript" src="chrome://browser/content/browser.js"/>
<script type="application/x-javascript" src="chrome://browser/content/viewsource.js"/>
<script type="application/x-javascript" src="chrome://communicator/content/findUtils.js"/>
<script type="application/x-javascript" src="chrome://communicator/content/contentAreaUtils.js"/>