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

Fx60 compatibility: Fix access to translator object in sandbox

Browse Source 
There's almost certainly other sandbox breakage
This commit is contained in:
Dan Stillman 2018-02-25 01:15:24 -05:00
parent 676799271e
commit 95bb107867
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
chrome/content/zotero/xpcom/translation/translate.js
View File

@ -331,16 +331,6 @@ Zotero.Translate.Sandbox = {
* @inner * @inner
*/ */
var safeTranslator = {}; var safeTranslator = {};
safeTranslator.__exposedProps__ = {
"setSearch":"r",
"setDocument":"r",
"setHandler":"r",
"setString":"r",
"setTranslator":"r",
"getTranslators":"r",
"translate":"r",
"getTranslatorObject":"r"
};
safeTranslator.setSearch = function(arg) { safeTranslator.setSearch = function(arg) {
if(!Zotero.isBookmarklet) arg = JSON.parse(JSON.stringify(arg)); if(!Zotero.isBookmarklet) arg = JSON.parse(JSON.stringify(arg));
return translation.setSearch(arg); return translation.setSearch(arg);
@ -480,11 +470,10 @@ Zotero.Translate.Sandbox = {
if (Zotero.isFx) { if (Zotero.isFx) {
for(var i in safeTranslator) { for(var i in safeTranslator) {
if (typeof(safeTranslator[i]) === "function") { if (typeof(safeTranslator[i]) === "function") {
safeTranslator[i] = translate._sandboxManager._makeContentForwarder(function(func) { safeTranslator[i] = Components.utils.exportFunction(
return function() { safeTranslator[i],
func.apply(safeTranslator, this.args.wrappedJSObject || this.args); translate._sandboxManager.sandbox
} )
}(safeTranslator[i]));
} }
} }
} }