mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Unpromisify a couple Zotero.Translator.get() calls

Browse source 
More to be done to fix translation
This commit is contained in:
Dan Stillman 2015-04-15 00:49:22 -04:00
parent 71d2aa9337
commit a8d1080cd6
1 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
chrome/content/zotero/xpcom/translation/translate.js
View file

@ -321,10 +321,8 @@ Zotero.Translate.Sandbox = {
} }
var translator = translation.translator[0]; var translator = translation.translator[0];
(typeof translator === "object" ? Zotero.Promise.resolve(translator) : Zotero.Translators.get(translator)). translator = typeof translator === "object" ? translator : Zotero.Translators.get(translator);
then(function(translator) { translation._loadTranslator(translator).then(function() {
return translation._loadTranslator(translator);
}).then(function() {
if(Zotero.isFx && !Zotero.isBookmarklet) { if(Zotero.isFx && !Zotero.isBookmarklet) {
// do same origin check // do same origin check
var secMan = Components.classes["@mozilla.org/scriptsecuritymanager;1"] var secMan = Components.classes["@mozilla.org/scriptsecuritymanager;1"]
@ -1161,11 +1159,9 @@ Zotero.Translate.Base.prototype = {
this._loadTranslator(this.translator[0]).then(function() { me._translateTranslatorLoaded() }); this._loadTranslator(this.translator[0]).then(function() { me._translateTranslatorLoaded() });
} else { } else {
// need to get translator first // need to get translator first
Zotero.Translators.get(this.translator[0]). let translator = Zotero.Translators.get(this.translator[0]);
then(function(translator) { this.translator[0] = translator;
me.translator[0] = translator; this._loadTranslator(translator).then(function() { me._translateTranslatorLoaded() });
me._loadTranslator(translator).then(function() { me._translateTranslatorLoaded() });
});
} }
}, },