normalise canvas ids

IIIF-Commons · Sep 13, 2018 · 203916b · 203916b
1 parent 4bd9157
commit 203916b
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 18 deletions.
diff --git a/dist/iiif-av-component.bundle.js b/dist/iiif-av-component.bundle.js
diff --git a/dist/iiif-av-component.d.ts b/dist/iiif-av-component.d.ts
@@ -1,4 +1,4 @@
-// iiif-av-component v0.0.79 https://github.com/iiif-commons/iiif-av-component#readme
+// iiif-av-component v0.0.80 https://github.com/iiif-commons/iiif-av-component#readme
 interface Array<T> {
  /**
  * Determines whether an array includes a certain element, returning true or false as appropriate.
@@ -47,6 +47,7 @@ declare namespace IIIFComponents {
  private _prevRange();
  private _nextRange();
  private _setCanvasInstanceVolumes(volume);
+ private _getNormaliseCanvasId(canvasId);
  private _getCanvasInstanceById(canvasId);
  private _getCurrentCanvas();
  private _rewind();

diff --git a/dist/iiif-av-component.js b/dist/iiif-av-component.js
@@ -1,4 +1,4 @@
-// iiif-av-component v0.0.79 https://github.com/iiif-commons/iiif-av-component#readme
+// iiif-av-component v0.0.80 https://github.com/iiif-commons/iiif-av-component#readme
 (function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.iiifAvComponent = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
 (function (global){
 
@@ -347,14 +347,21 @@ var IIIFComponents;
  });
  });
  };
+ AVComponent.prototype._getNormaliseCanvasId = function (canvasId) {
+ return (canvasId.includes('://')) ? Manifesto.Utils.normaliseUrl(canvasId) : canvasId;
+ };
  AVComponent.prototype._getCanvasInstanceById = function (canvasId) {
- canvasId = (canvasId.includes('://')) ? Manifesto.Utils.normaliseUrl(canvasId) : canvasId;
+ canvasId = this._getNormaliseCanvasId(canvasId);
  // if virtual canvas is enabled, check for that first
  if (this._data.virtualCanvasEnabled) {
  for (var i = 0; i < this.canvasInstances.length; i++) {
  var canvasInstance = this.canvasInstances[i];
- if (canvasInstance.isVirtual() && canvasInstance.getCanvasId() === canvasId || canvasInstance.includesVirtualSubCanvas(canvasId)) {
- return canvasInstance;
+ var currentCanvasId = canvasInstance.getCanvasId();
+ if (currentCanvasId) {
+ currentCanvasId = this._getNormaliseCanvasId(currentCanvasId);
+ if (canvasInstance.isVirtual() && currentCanvasId === canvasId || canvasInstance.includesVirtualSubCanvas(canvasId)) {
+ return canvasInstance;
+ }
  }
  }
  }

diff --git a/dist/iiif-av-component.min.js b/dist/iiif-av-component.min.js
diff --git a/examples/js/iiif-av-component.js b/examples/js/iiif-av-component.js
@@ -1,4 +1,4 @@
-// iiif-av-component v0.0.79 https://github.com/iiif-commons/iiif-av-component#readme
+// iiif-av-component v0.0.80 https://github.com/iiif-commons/iiif-av-component#readme
 (function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.iiifAvComponent = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
 (function (global){
 
@@ -347,14 +347,21 @@ var IIIFComponents;
  });
  });
  };
+ AVComponent.prototype._getNormaliseCanvasId = function (canvasId) {
+ return (canvasId.includes('://')) ? Manifesto.Utils.normaliseUrl(canvasId) : canvasId;
+ };
  AVComponent.prototype._getCanvasInstanceById = function (canvasId) {
- canvasId = (canvasId.includes('://')) ? Manifesto.Utils.normaliseUrl(canvasId) : canvasId;
+ canvasId = this._getNormaliseCanvasId(canvasId);
  // if virtual canvas is enabled, check for that first
  if (this._data.virtualCanvasEnabled) {
  for (var i = 0; i < this.canvasInstances.length; i++) {
  var canvasInstance = this.canvasInstances[i];
- if (canvasInstance.isVirtual() && canvasInstance.getCanvasId() === canvasId || canvasInstance.includesVirtualSubCanvas(canvasId)) {
- return canvasInstance;
+ var currentCanvasId = canvasInstance.getCanvasId();
+ if (currentCanvasId) {
+ currentCanvasId = this._getNormaliseCanvasId(currentCanvasId);
+ if (canvasInstance.isVirtual() && currentCanvasId === canvasId || canvasInstance.includesVirtualSubCanvas(canvasId)) {
+ return canvasInstance;
+ }
  }
  }
  }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "iiif-av-component",
- "version": "0.0.79",
+ "version": "0.0.80",
  "description": "",
  "main": "index.js",
  "types": "./dist/iiif-av-component.d.ts",

diff --git a/src/AVComponent.ts b/src/AVComponent.ts
@@ -442,9 +442,13 @@ namespace IIIFComponents {
  });
  }
 
+ private _getNormaliseCanvasId(canvasId: string): string {
+ return (canvasId.includes('://')) ? Manifesto.Utils.normaliseUrl(canvasId) : canvasId;
+ }
+
  private _getCanvasInstanceById(canvasId: string): CanvasInstance | undefined {
 
- canvasId = (canvasId.includes('://')) ? Manifesto.Utils.normaliseUrl(canvasId) : canvasId;
+ canvasId = this._getNormaliseCanvasId(canvasId);
 
  // if virtual canvas is enabled, check for that first
  if (this._data.virtualCanvasEnabled) {
@@ -453,9 +457,18 @@ namespace IIIFComponents {
 
  const canvasInstance: IIIFComponents.CanvasInstance = this.canvasInstances[i];
 
- if (canvasInstance.isVirtual() && canvasInstance.getCanvasId() === canvasId || canvasInstance.includesVirtualSubCanvas(canvasId)) {
- return canvasInstance;
+ let currentCanvasId: string | undefined = canvasInstance.getCanvasId();
+
+ if (currentCanvasId) {
+
+ currentCanvasId = this._getNormaliseCanvasId(currentCanvasId);
+
+ if (canvasInstance.isVirtual() && currentCanvasId === canvasId || canvasInstance.includesVirtualSubCanvas(canvasId)) {
+ return canvasInstance;
+ }
+
  }
+
  }
 
  } else {