Use Z.File.getResourceAsync to load local resources

This commit is contained in:
Sylvester Keil 2018-08-03 13:22:22 +02:00
parent b0fe7d546d
commit ad0c8aad53
No known key found for this signature in database
GPG key ID: 878933BCEAB25A10

View file

@ -103,8 +103,9 @@ Zotero.Styles = new function() {
var localeFile = {}; var localeFile = {};
var locales = {}; var locales = {};
var primaryDialects = {}; var primaryDialects = {};
var localesLocation = "chrome://zotero/content/locale/csl/locales.json"; localeFile = JSON.parse(
localeFile = JSON.parse(yield Zotero.File.getContentsFromURLAsync(localesLocation)); yield Zotero.File.getResourceAsync("chrome://zotero/content/locale/csl/locales.json")
);
primaryDialects = localeFile["primary-dialects"]; primaryDialects = localeFile["primary-dialects"];
@ -117,19 +118,10 @@ Zotero.Styles = new function() {
this.primaryDialects = primaryDialects; this.primaryDialects = primaryDialects;
// Load renamed styles // Load renamed styles
_renamedStyles = {}; _renamedStyles = JSON.parse(
var xmlhttp = yield Zotero.HTTP.request( yield Zotero.File.getResourceAsync("resource://zotero/schema/renamed-styles.json")
"GET",
"resource://zotero/schema/renamed-styles.json",
{
responseType: 'json'
}
); );
// Map some obsolete styles to current ones
if (xmlhttp.response) {
_renamedStyles = xmlhttp.response;
}
_initializationDeferred.resolve(); _initializationDeferred.resolve();
_initialized = true; _initialized = true;