suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
Show Stats 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];
(typeof translator === "object" ? Zotero.Promise.resolve(translator) : Zotero.Translators.get(translator)).
then(function(translator) {
return translation._loadTranslator(translator);
}).then(function() {
translator = typeof translator === "object" ? translator : Zotero.Translators.get(translator);
translation._loadTranslator(translator).then(function() {
if(Zotero.isFx && !Zotero.isBookmarklet) {
// do same origin check
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() });
} else {
// need to get translator first
Zotero.Translators.get(this.translator[0]).
then(function(translator) {
me.translator[0] = translator;
me._loadTranslator(translator).then(function() { me._translateTranslatorLoaded() });
});
let translator = Zotero.Translators.get(this.translator[0]);
this.translator[0] = translator;
this._loadTranslator(translator).then(function() { me._translateTranslatorLoaded() });
}
},