Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced resource:// with resource:/ to be more compliant with our parsing rules.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@40440 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
gagan%netscape.com
1999-07-21 11:48:56 +00:00
parent c60cdf4c43
commit b1bd2ca61f
26 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/gfx/src/nsDeviceContext.cpp
View File

@@ -375,7 +375,7 @@ NS_IMETHODIMP DeviceContextImpl::LoadIconImage(PRInt32 aId, nsIImage*& aImage)
// Build the URL string
char url[128];
sprintf(url, "resource://res/gfx/icon_%d.gif", aId);
sprintf(url, "resource:/res/gfx/icon_%d.gif", aId);
// Use a sync net context
ilINetContext* netContext;

2
mozilla/intl/uconv/src/nsCharsetAliasImp.cpp
View File

@@ -62,7 +62,7 @@ nsCharsetAlias2::nsCharsetAlias2()
{
NS_INIT_REFCNT();
PR_AtomicIncrement(&g_InstanceCount);
nsAutoString propertyURL("resource://res/charsetalias.properties");
nsAutoString propertyURL("resource:/res/charsetalias.properties");
mDelegate = new nsURLProperties( propertyURL );
}
//--------------------------------------------------------------

2
mozilla/intl/uconv/src/nsMacCharset.cpp
View File

@@ -46,7 +46,7 @@ nsMacCharset::nsMacCharset()
{
NS_INIT_REFCNT();
PR_AtomicIncrement(&g_InstanceCount);
nsAutoString propertyURL("resource://res/maccharset.properties");
nsAutoString propertyURL("resource:/res/maccharset.properties");
nsURLProperties *info = new nsURLProperties( propertyURL );

2
mozilla/intl/uconv/src/nsUNIXCharset.cpp
View File

@@ -52,7 +52,7 @@ nsUNIXCharset::nsUNIXCharset()
char* locale = setlocale(LC_CTYPE, NULL);
if(locale)
{
nsAutoString propertyURL("resource://res/unixcharset.properties");
nsAutoString propertyURL("resource:/res/unixcharset.properties");
nsURLProperties *info = new nsURLProperties( propertyURL );
if( info )

2
mozilla/intl/uconv/src/nsWinCharset.cpp
View File

@@ -45,7 +45,7 @@ nsWinCharset::nsWinCharset()
{
NS_INIT_REFCNT();
PR_AtomicIncrement(&g_InstanceCount);
nsAutoString propertyURL("resource://res/wincharset.properties");
nsAutoString propertyURL("resource:/res/wincharset.properties");
nsURLProperties *info = new nsURLProperties( propertyURL );

2
mozilla/mailnews/addrbook/resources/content/addressbook.xul
View File

@@ -90,7 +90,7 @@
<html:script language="JavaScript" src="chrome://addressbook/content/editcard.js"/>
<!--
<html:script language="JavaScript" src="chrome://messenger/content/commandglue.js"/>
<html:script language="JavaScript" src="resource://res/samples/DumpDOM.js"/>
<html:script language="JavaScript" src="resource:/res/samples/DumpDOM.js"/>
-->
<menubar>
<menu id="fileMenu" name="&fileMenu.label;">

2
mozilla/mailnews/addrbook/resources/content/selectaddress.xul
View File

@@ -67,7 +67,7 @@ Rights Reserved.
<html:script language="JavaScript" src="chrome://addressbook/content/resultPane.js"/>
<html:script language="JavaScript" src="chrome://messengercompose/content/MsgComposeCommands.js"/>
<!--
<html:script language="JavaScript" src="resource://res/samples/DumpDOM.js"/>
<html:script language="JavaScript" src="resource:/res/samples/DumpDOM.js"/>
-->
<!-- Thin box across top, show names containing & stop, search buttons -->
<box align="horizontal" style="width:100%; padding:0px; padding-top:2px; padding-bottom:2px">

2
mozilla/netwerk/protocol/resource/src/nsResourceProtocolHandler.cpp
View File

@@ -144,7 +144,7 @@ nsResourceProtocolHandler::NewURI(const char *aSpec, nsIURI *aBaseURI,
}
/*
* Rewrite "resource://" URLs into file: URLs with the path of the
* Rewrite "resource:/" URLs into file: URLs with the path of the
* executable prepended to the file path...
*/
static char *

2
mozilla/network/module/nsNetService.cpp
View File

@@ -1490,7 +1490,7 @@ extern "C" void net_ReleaseContext(MWContext *context)
/*
* Rewrite "resource://" URLs into file: URLs with the path of the
* Rewrite "resource:/" URLs into file: URLs with the path of the
* executable prepended to the file path...
*/
char *mangleResourceIntoFileURL(const char* aResourceFileName)

2
mozilla/profile/resources/navFinishPreg.xul
View File

@@ -45,7 +45,7 @@
dump("Inside the Exit Wizard function...\n");
parent.frames[0].commit();
parent.Finish();
parent.location.replace("resource://res/profile/preg.html");
parent.location.replace("resource:/res/profile/preg.html");
//var toolkitCore = XPAppCoresManager.Find("toolkitCore");
//if (!toolkitCore) {

2
mozilla/profile/resources/pm.xul
View File

@@ -19,7 +19,7 @@ var currProfile = "";
function CreateProfile()
{
// Need to call CreateNewProfile xuls
// var win = window.openDialog('resource://res/profile/cpwManager.xul', 'Creator', 'chrome');
// var win = window.openDialog('resource:/res/profile/cpwManager.xul', 'Creator', 'chrome');
dump("\ngot here\n");
//this.location.replace(this.location);
this.location.replace("resource:/res/profile/cpwManager.xul");

4
mozilla/rdf/resources/customize.xul
View File

@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://sidebar/skin/" type="text/css"?>
<?xml-stylesheet href="resource://res/rdf/customize.css" type="text/css"?>
<?xml-stylesheet href="resource:/res/rdf/customize.css" type="text/css"?>
<!DOCTYPE window>
@@ -11,7 +11,7 @@
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="Init();">
<html:script src="resource://res/rdf/customize.js" />
<html:script src="resource:/res/rdf/customize.js" />
<box align="vertical" flex="100%" id="main-box">

12
mozilla/rdf/resources/sidebar-browser.rdf
View File

@@ -15,15 +15,15 @@
<RDF:li>
<RDF:Description ID="whats-related">
<NC:title>&sidebar.whats-related.label;</NC:title>
<NC:content>resource://res/samples/related-panel.xul</NC:content>
<NC:customize>resource://res/samples/related-panel-cust.xul</NC:customize>
<NC:content>resource:/res/samples/related-panel.xul</NC:content>
<NC:customize>resource:/res/samples/related-panel-cust.xul</NC:customize>
</RDF:Description>
</RDF:li>
<RDF:li>
<RDF:Description ID="flash">
<NC:title>&sidebar.flash.label;</NC:title>
<NC:content>resource://res/rdf/flash.xul</NC:content>
<NC:customize>resource://res/rdf/flash-cust.xul</NC:customize>
<NC:content>resource:/res/rdf/flash.xul</NC:content>
<NC:customize>resource:/res/rdf/flash-cust.xul</NC:customize>
<NC:height>5em</NC:height>
</RDF:Description>
</RDF:li>
@@ -36,8 +36,8 @@
<RDF:li>
<RDF:Description ID="bookmarks">
<NC:title>&sidebar.bookmarks.label;</NC:title>
<NC:content>resource://res/samples/bm-panel.xul</NC:content>
<NC:customize>resource://res/samples/bm-panel-cust.xul</NC:customize>
<NC:content>resource:/res/samples/bm-panel.xul</NC:content>
<NC:customize>resource:/res/samples/bm-panel-cust.xul</NC:customize>
</RDF:Description>
</RDF:li>
</RDF:Seq>

2
mozilla/rdf/resources/sidebar-browser.xul
View File

@@ -16,7 +16,7 @@
onload="Init('resource:/res/rdf/sidebar-browser.rdf',
'NC:BrowserSidebarRoot');" align="vertical">
<html:script src="resource://res/rdf/sidebar.js" />
<html:script src="resource:/res/rdf/sidebar.js" />
<box id="sidebox" align="vertical" flex="100%">
<box class="sidebartitle">
<html:div class="sidebartitlelabel">&sidebar.title.label;</html:div>

4
mozilla/rdf/resources/sidebar-registry.rdf
View File

@@ -16,14 +16,14 @@
<RDF:Description ID="Headlines">
<NC:title>Headlines</NC:title>
<NC:content>http://my.netscape.com/topstories_subchannel.tmpl</NC:content>
<NC:customize>resource://res/samples/related-panel-cust.xul</NC:customize>
<NC:customize>resource:/res/samples/related-panel-cust.xul</NC:customize>
</RDF:Description>
</RDF:li>
<RDF:li>
<RDF:Description ID="Local News">
<NC:title>Local News</NC:title>
<NC:content>http://my.netscape.com/localnews_content.tmpl</NC:content>
<NC:customize>resource://res/rdf/flash-cust.xul</NC:customize>
<NC:customize>resource:/res/rdf/flash-cust.xul</NC:customize>
</RDF:Description>
</RDF:li>
<RDF:li>

2
mozilla/rdf/resources/sidebar.js
View File

@@ -141,7 +141,7 @@ function resize(id) {
}
function customize() {
var newWin = window.openDialog('resource://res/rdf/customize.xul','New','chrome', sidebar.db, sidebar.resource);
var newWin = window.openDialog('resource:/res/rdf/customize.xul','New','chrome', sidebar.db, sidebar.resource);
return newWin;
}

4
mozilla/suite/browser/navigator.js
View File

@@ -549,7 +549,7 @@
}
}
if (toolkitCore) {
toolkitCore.ShowWindow("resource://res/samples/bookmarks.xul",window);
toolkitCore.ShowWindow("resource:/res/samples/bookmarks.xul",window);
}
}
@@ -563,7 +563,7 @@
}
}
if (toolkitCore) {
toolkitCore.ShowWindow("resource://res/samples/history.xul",window);
toolkitCore.ShowWindow("resource:/res/samples/history.xul",window);
}
}

2
mozilla/suite/common/bookmarks/bookmarks.js
View File

@@ -31,7 +31,7 @@ function BookmarkProperties()
var type = select_list[0].getAttribute('type');
if (type != "http://home.netscape.com/NC-rdf#BookmarkSeparator")
{
var props = window.open("resource://res/samples/bm-props.xul", "BookmarkProperties", "chrome");
var props = window.open("resource:/res/samples/bm-props.xul", "BookmarkProperties", "chrome");
props.BookmarkURL = select_list[0].getAttribute("id");
}
} else {

2
mozilla/webshell/embed/ActiveX/MozillaBrowser.cpp
View File

@@ -43,7 +43,7 @@ extern "C" void NS_SetupRegistry();
static const std::string c_szPrefsFile = "prefs50.js";
static const std::string c_szPrefsHomePage = "browser.startup.homepage";
static const std::string c_szDefaultPage = "resource://res/MozillaControl.html";
static const std::string c_szDefaultPage = "resource:/res/MozillaControl.html";
BOOL CMozillaBrowser::m_bRegistryInitialized = FALSE;

2
mozilla/xpfe/AppCores/src/nsBrowserAppCore.cpp
View File

@@ -1803,7 +1803,7 @@ nsBrowserAppCore::DoDialog()
window = nsnull;
nsCOMPtr<nsIURI> urlObj;
char * urlstr = "resource://res/samples/Password.html";
char * urlstr = "resource:/res/samples/Password.html";
#ifndef NECKO
rv = NS_NewURL(getter_AddRefs(urlObj), urlstr);
#else

4
mozilla/xpfe/browser/resources/content/navigator.js
View File

@@ -549,7 +549,7 @@
}
}
if (toolkitCore) {
toolkitCore.ShowWindow("resource://res/samples/bookmarks.xul",window);
toolkitCore.ShowWindow("resource:/res/samples/bookmarks.xul",window);
}
}
@@ -563,7 +563,7 @@
}
}
if (toolkitCore) {
toolkitCore.ShowWindow("resource://res/samples/history.xul",window);
toolkitCore.ShowWindow("resource:/res/samples/history.xul",window);
}
}

6
mozilla/xpfe/browser/samples/dexparammaster.xul
View File

@@ -18,13 +18,13 @@
// show a nonmodal dialog, sending parameters as part of the URL
function MakeURLDialog() {
var newWin = window.open("resource://res/samples/dexparamdialog.xul?remind=true;prompt=Give me your money and convertible bonds", "New", "chrome");
var newWin = window.open("resource:/res/samples/dexparamdialog.xul?remind=true;prompt=Give me your money and convertible bonds", "New", "chrome");
return newWin;
}
// show a nonmodal dialog, sending parameters as part of the function call
function MakeParamDialog() {
var newWin = window.openDialog("resource://res/samples/dexparamdialog.xul",
var newWin = window.openDialog("resource:/res/samples/dexparamdialog.xul",
"New", "chrome", {remind:true, prompt:"Give me your money and convertible bonds"});
return newWin;
}
@@ -33,7 +33,7 @@
function ModalDialog() {
var toolkitCore = GetToolkitCore();
if (toolkitCore)
toolkitCore.ShowModalDialog("resource://res/samples/dexparamdialog.xul",
toolkitCore.ShowModalDialog("resource:/res/samples/dexparamdialog.xul",
window);
}

2
mozilla/xpfe/browser/src/navigator-test1.xul
View File

@@ -137,7 +137,7 @@
}
}
if (toolkitCore) {
toolkitCore.ShowWindow("resource://res/rdf/bookmarks.xul",window);
toolkitCore.ShowWindow("resource:/res/rdf/bookmarks.xul",window);
}
}

2
mozilla/xpfe/components/bookmarks/resources/bookmarks.js
View File

@@ -31,7 +31,7 @@ function BookmarkProperties()
var type = select_list[0].getAttribute('type');
if (type != "http://home.netscape.com/NC-rdf#BookmarkSeparator")
{
var props = window.open("resource://res/samples/bm-props.xul", "BookmarkProperties", "chrome");
var props = window.open("resource:/res/samples/bm-props.xul", "BookmarkProperties", "chrome");
props.BookmarkURL = select_list[0].getAttribute("id");
}
} else {

2
mozilla/xpinstall/notifier/SoftwareUpdate.js
View File

@@ -17,7 +17,7 @@
}
// the location of the flash registry.
var localSoftwareUpdateRegistry = 'resource://res/rdf/SoftwareUpdates.rdf';
var localSoftwareUpdateRegistry = 'resource:/res/rdf/SoftwareUpdates.rdf';
function Init()
{

2
mozilla/xpinstall/res/xpistatus.xul
View File

@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome:/global/skin/xul.css" type="text/css"?>
<?xml-stylesheet href="chrome://global/skin/xul.css" type="text/css"?>
<?xml-stylesheet href="resource:/res/xpinstall/xpistatus.css" type="text/css"?>
<!DOCTYPE window