Bug 508277 - Merge strres.js into CZ's utils.js. r=silver@warwickcompsoc.co.uk (James Ross), a=NPOTFFB.
git-svn-id: svn://10.0.0.236/trunk@258570 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
6c14739e31
commit
5f74e84f80
@ -1495,6 +1495,33 @@ function strftime(format, time)
|
||||
return format.replace(/%%/, "%");
|
||||
}
|
||||
|
||||
// This used to be strres.js, copied here to help remove that...
|
||||
var strBundleService = null;
|
||||
function srGetStrBundle(path)
|
||||
{
|
||||
const STRBSCID = "@mozilla.org/intl/stringbundle;1";
|
||||
const STRBSIF = "nsIStringBundleService";
|
||||
var strBundle = null;
|
||||
if (!strBundleService)
|
||||
{
|
||||
try
|
||||
{
|
||||
strBundleService = getService(STRBSCID, STRBSIF);
|
||||
}
|
||||
catch (ex)
|
||||
{
|
||||
dump("\n--** strBundleService failed: " + ex + "\n");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
strBundle = strBundleService.createBundle(path);
|
||||
if (!strBundle)
|
||||
dump("\n--** strBundle createInstance failed **--\n");
|
||||
|
||||
return strBundle;
|
||||
}
|
||||
|
||||
// No-op window.getAttention if it's not found, this is for in-a-tab mode.
|
||||
if (typeof getAttention == "undefined")
|
||||
getAttention = function() {};
|
||||
|
||||
@ -47,7 +47,6 @@
|
||||
onunload="onUnload()"
|
||||
title="&window.title;">
|
||||
|
||||
<script src="chrome://global/content/strres.js"/>
|
||||
<script src="chrome://chatzilla/content/lib/js/utils.js"/>
|
||||
<script src="chrome://chatzilla/content/about/about.js"/>
|
||||
<script src="chrome://chatzilla/content/lib/js/message-manager.js"/>
|
||||
|
||||
@ -53,7 +53,6 @@
|
||||
onunload="gPrefWindow.onClose();"
|
||||
title="&window.title;">
|
||||
|
||||
<script src="chrome://global/content/strres.js"/>
|
||||
<script src="chrome://chatzilla/content/lib/js/utils.js"/>
|
||||
<script src="chrome://chatzilla/content/lib/js/file-utils.js"/>
|
||||
<script src="chrome://chatzilla/content/lib/js/pref-manager.js"/>
|
||||
|
||||
@ -44,7 +44,6 @@
|
||||
|
||||
<overlaytarget id="scripts-overlay-target">
|
||||
|
||||
<script src="chrome://global/content/strres.js"/>
|
||||
<script src="chrome://global/content/nsUserSettings.js"/>
|
||||
<script src="chrome://global/content/nsTransferable.js"/>
|
||||
<script src="chrome://global/content/nsClipboard.js"/>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user