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

Ignore trailing period in domain for Quick Copy

Browse source 
From @aurimasv
This commit is contained in:
Dan Stillman 2015-07-03 23:46:39 -04:00
parent 899e33c993
commit f07fe7184d
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
chrome/content/zotero/xpcom/quickCopy.js
View file

@ -123,7 +123,8 @@ Zotero.QuickCopy = new function() {
var sql = "SELECT key AS domainPath, value AS format FROM settings " var sql = "SELECT key AS domainPath, value AS format FROM settings "
+ "WHERE setting='quickCopySite' AND (key LIKE ? OR key LIKE ?)"; + "WHERE setting='quickCopySite' AND (key LIKE ? OR key LIKE ?)";
var urlDomain = urlHostPort.match(/(?:[^\.]+\.)?[^\.]+$/); // Match last one or two sections of domain, not counting trailing period
var urlDomain = urlHostPort.match(/(?:[^.]+\.)?[^.]+(?=\.?$)/);
// Hopefully can't happen, but until we're sure // Hopefully can't happen, but until we're sure
if (!urlDomain) { if (!urlDomain) {
Zotero.logError("Quick Copy host '" + urlHostPort + "' not matched"); Zotero.logError("Quick Copy host '" + urlHostPort + "' not matched");

4
test/tests/quickCopyTest.js
View file

@ -21,6 +21,10 @@ describe("Zotero.QuickCopy", function() {
assert.deepEqual(Zotero.QuickCopy.getFormatFromURL('http://foo/'), quickCopyPref); assert.deepEqual(Zotero.QuickCopy.getFormatFromURL('http://foo/'), quickCopyPref);
}) })
it("should handle a domain with a trailing period", function () {
assert.deepEqual(Zotero.QuickCopy.getFormatFromURL('http://foo.com.'), quickCopyPref);
})
it("should handle an about: URL", function () { it("should handle an about: URL", function () {
assert.deepEqual(Zotero.QuickCopy.getFormatFromURL('about:blank'), quickCopyPref); assert.deepEqual(Zotero.QuickCopy.getFormatFromURL('about:blank'), quickCopyPref);
}) })