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

Don't run detectWeb/doWeb in Scaffold if target doesn't match

Browse source 
Closes #1728
This commit is contained in:
Dan Stillman 2019-08-30 01:02:12 -04:00
parent 8f00fa2603
commit 0bd04877bf
2 changed files with 31 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

48
chrome/content/scaffold/scaffold.js
View file

@ -506,13 +506,14 @@ var Scaffold = new function() {
if (functionToRun == "detectWeb" || functionToRun == "doWeb") { if (functionToRun == "detectWeb" || functionToRun == "doWeb") {
var translate = new Zotero.Translate.Web(); var translate = new Zotero.Translate.Web();
var utilities = new Zotero.Utilities.Translate(translate); var utilities = new Zotero.Utilities.Translate(translate);
// If this is a string, assume it's a URL if (!_testTargetRegex(input)) {
if (typeof input == 'string') { _logOutput("Target did not match " + _getDocumentURL(input));
var doc = await new Promise(r => utilities.processDocuments(input, (doc) => r(doc))); if (done) {
translate.setDocument(doc); done();
} else { }
translate.setDocument(input); return;
} }
translate.setDocument(input);
} else if (functionToRun == "detectImport" || functionToRun == "doImport") { } else if (functionToRun == "detectImport" || functionToRun == "doImport") {
var translate = new Zotero.Translate.Import(); var translate = new Zotero.Translate.Import();
translate.setString(input); translate.setString(input);
@ -586,23 +587,30 @@ var Scaffold = new function() {
this.generateTranslatorID = function() { this.generateTranslatorID = function() {
document.getElementById("textbox-translatorID").value = _generateGUID(); document.getElementById("textbox-translatorID").value = _generateGUID();
} }
/* /**
* test target regular expression against document URL * Test target regular expression against document URL and log the result
*/ */
this.testTargetRegex = function() { this.logTargetRegex = function () {
var testDoc = _getDocument(); _logOutput(_testTargetRegex(_getDocument()));
var url = Zotero.Proxies.proxyToProper(testDoc.location.href); };
/**
* Test target regular expression against document URL and return the result
*/
function _testTargetRegex(doc) {
var url = _getDocumentURL(doc);
try { try {
var targetRe = new RegExp(document.getElementById('textbox-target').value, "i"); var targetRe = new RegExp(document.getElementById('textbox-target').value, "i");
} catch(e) {
_logOutput("Regex parse error:\n"+JSON.stringify(e, null, "\t"));
} }
catch (e) {
_logOutput(targetRe.test(url)); _logOutput("Regex parse error:\n" + JSON.stringify(e, null, "\t"));
}
return targetRe.test(url);
} }
/* /*
* called to select items * called to select items
*/ */
@ -1371,6 +1379,10 @@ var Scaffold = new function() {
function _getDocument() { function _getDocument() {
return _frames[_document.getElementById("menulist-testFrame").selectedIndex]; return _frames[_document.getElementById("menulist-testFrame").selectedIndex];
} }
function _getDocumentURL(doc) {
return Zotero.Proxies.proxyToProper(doc.location.href);
}
} }
window.addEventListener("load", function(e) { Scaffold.onLoad(e); }, false); window.addEventListener("load", function(e) { Scaffold.onLoad(e); }, false);

2
chrome/content/scaffold/scaffold.xul
View file

@ -123,7 +123,7 @@
<hbox> <hbox>
<label class="label-metadata" value="&scaffold.metadata.target.label;" control="textbox-target"/> <label class="label-metadata" value="&scaffold.metadata.target.label;" control="textbox-target"/>
<textbox id="textbox-target" flex="1"/> <textbox id="textbox-target" flex="1"/>
<button label="&scaffold.metadata.target.testRegex;" oncommand="Scaffold.testTargetRegex()"/> <button label="&scaffold.metadata.target.testRegex;" oncommand="Scaffold.logTargetRegex()"/>
</hbox> </hbox>
<hbox style="display:none"> <hbox style="display:none">
<label class="label-metadata" value="&scaffold.metadata.targetAll.label;" control="textbox-target-all"/> <label class="label-metadata" value="&scaffold.metadata.targetAll.label;" control="textbox-target-all"/>