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

closes #644, washingtonpost.com translator broken

Browse Source 
for some reason, passing the DOM window, rather than the URL, when creating the sandbox fixed this issue. i'm not entirely sure why this is, but it seems like the javascript on the washingtonpost.com site might be modifying document.domain in such a way that this is necessary.
This commit is contained in:
Simon Kornblith 2007-06-17 21:38:07 +00:00
parent d1de380ba5
commit 7bf8979333
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
chrome/content/zotero/browser.js
View File

@ -63,7 +63,8 @@ var Zotero_Browser = new function() {
"googlesyndication.com", "googlesyndication.com",
"doubleclick.net", "doubleclick.net",
"questionmarket.com", "questionmarket.com",
"atdmt.com" "atdmt.com",
"aggregateknowledge.com"
]; ];
var tools = { var tools = {

17
chrome/content/zotero/xpcom/translate.js
View File

@ -636,10 +636,11 @@ Zotero.Translate.prototype._generateSandbox = function() {
if(this.type == "web" || this.type == "search") { if(this.type == "web" || this.type == "search") {
// get sandbox URL // get sandbox URL
var sandboxURL = "http://www.example.com/"; var sandboxLocation = "http://www.example.com/";
if(this.type == "web") { if(this.type == "web") {
// use real URL, not proxied version, to create sandbox // use real URL, not proxied version, to create sandbox
sandboxURL = this.document.location.href; sandboxLocation = this.document.defaultView;
Zotero.debug("binding sandbox to "+this.document.location.href);
} else { } else {
// generate sandbox for search by extracting domain from translator // generate sandbox for search by extracting domain from translator
// target, if one exists // target, if one exists
@ -648,12 +649,13 @@ Zotero.Translate.prototype._generateSandbox = function() {
var tempURL = this.translator[0].target.replace(/\\/g, "").replace(/\^/g, ""); var tempURL = this.translator[0].target.replace(/\\/g, "").replace(/\^/g, "");
var m = Zotero.Translate._searchSandboxRegexp.exec(tempURL); var m = Zotero.Translate._searchSandboxRegexp.exec(tempURL);
if(m) { if(m) {
sandboxURL = m[0]; sandboxLocation = m[0];
} }
} }
Zotero.debug("binding sandbox to "+sandboxLocation);
} }
Zotero.debug("binding sandbox to "+sandboxURL); this._sandbox = new Components.utils.Sandbox(sandboxLocation);
this._sandbox = new Components.utils.Sandbox(sandboxURL);
this._sandbox.Zotero = new Object(); this._sandbox.Zotero = new Object();
// add ingester utilities // add ingester utilities
@ -2059,7 +2061,6 @@ Zotero.Translate.TranslatorSearch = function(translate, translators) {
*/ */
Zotero.Translate.TranslatorSearch.prototype.execute = function() { Zotero.Translate.TranslatorSearch.prototype.execute = function() {
if(!this.running) return; if(!this.running) return;
if(this.checkDone()) return; if(this.checkDone()) return;
// get next translator // get next translator
@ -2133,6 +2134,7 @@ Zotero.Translate.TranslatorSearch.prototype.execute = function() {
(this.translate.type == "import" && this.translate._sandbox.detectImport)) { (this.translate.type == "import" && this.translate._sandbox.detectImport)) {
var returnValue; var returnValue;
this.currentTranslator = translator;
try { try {
if(this.translate.type == "web") { if(this.translate.type == "web") {
returnValue = this.translate._sandbox.detectWeb(this.translate.document, this.translate.location); returnValue = this.translate._sandbox.detectWeb(this.translate.document, this.translate.location);
@ -2149,10 +2151,9 @@ Zotero.Translate.TranslatorSearch.prototype.execute = function() {
Zotero.debug("executed detectCode for "+translator.label); Zotero.debug("executed detectCode for "+translator.label);
if(this.translate.type == "web" && this.translate.waitForCompletion) { if(this.translate.type == "web" && this.translate.waitForCompletion) {
this.currentTranslator = translator;
this.asyncMode = true; this.asyncMode = true;
// don't immediately execute // don't immediately execute next
return; return;
} else if(returnValue) { } else if(returnValue) {
this.processReturnValue(translator, returnValue); this.processReturnValue(translator, returnValue);