ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Quote . in regex, use literal not RegExp

Browse Source
This commit is contained in:
mohawk2
2020-06-27 00:28:19 +01:00
committed by Ed J
parent 4758b533d0
commit 2a9e109528
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/format/IIIFInfo.js
+6 -12
View File
@@ -145,15 +145,9 @@ IIIF_PROFILE_VALUES['none'] = {
}, },
}; };
const COMPLIANCE_VERSION1 = new RegExp( const COMPLIANCE_VERSION1 = /^https?:\/\/library\.stanford\.edu\/iiif\/image-api\/(?:1\.1\/)?compliance\.html#level[0-2]$/;
'^https?://library.stanford.edu/iiif/image-api/(1.1/)?compliance.html#level[0-2]$' const COMPLIANCE_VERSION2 = /^https?:\/\/iiif\.io\/api\/image\/2\/level[0-2](?:\.json)?$/;
); const COMPLIANCE_VERSION3 = /(^https?:\/\/iiif\.io\/api\/image\/3\/level[0-2](?:\.json)?$)|(^level[0-2]$)/;
const COMPLIANCE_VERSION2 = new RegExp(
'^https?://iiif.io/api/image/2/level[0-2](.json)?$'
);
const COMPLIANCE_VERSION3 = new RegExp(
'(^https?://iiif.io/api/image/3/level[0-2](.json)?$)|(^level[0-2]$)'
);
function generateVersion1Options(iiifInfo) { function generateVersion1Options(iiifInfo) {
let levelProfile = iiifInfo.getComplianceLevelSupportedFeatures(); let levelProfile = iiifInfo.getComplianceLevelSupportedFeatures();
@@ -165,7 +159,7 @@ function generateVersion1Options(iiifInfo) {
url: url:
iiifInfo.imageInfo['@id'] === undefined iiifInfo.imageInfo['@id'] === undefined
? undefined ? undefined
: iiifInfo.imageInfo['@id'].replace(/\/?(info.json)?$/g, ''), : iiifInfo.imageInfo['@id'].replace(/\/?(?:info\.json)?$/g, ''),
supports: levelProfile.supports, supports: levelProfile.supports,
formats: [ formats: [
...levelProfile.formats, ...levelProfile.formats,
@@ -209,7 +203,7 @@ function generateVersion2Options(iiifInfo) {
? iiifInfo.imageInfo.profile[1].qualities ? iiifInfo.imageInfo.profile[1].qualities
: []; : [];
return { return {
url: iiifInfo.imageInfo['@id'].replace(/\/?(info.json)?$/g, ''), url: iiifInfo.imageInfo['@id'].replace(/\/?(?:info\.json)?$/g, ''),
sizes: sizes:
iiifInfo.imageInfo.sizes === undefined iiifInfo.imageInfo.sizes === undefined
? undefined ? undefined
@@ -419,7 +413,7 @@ class IIIFInfo {
if (complianceLevel === undefined) { if (complianceLevel === undefined) {
return undefined; return undefined;
} }
const level = complianceLevel.match(/level[0-2](\.json)?$/g); const level = complianceLevel.match(/level[0-2](?:\.json)?$/g);
return Array.isArray(level) ? level[0].replace('.json', '') : undefined; return Array.isArray(level) ? level[0].replace('.json', '') : undefined;
} }