From 0662593a42d5110744aad394d41f64dc0d88513f Mon Sep 17 00:00:00 2001 From: edsilv Date: Sun, 30 Sep 2018 20:24:28 +0100 Subject: [PATCH] updated manifesto and manifold --- examples | 2 +- package-lock.json | 139 +++++++++++++++++++++++++++++-------------- package.json | 4 +- src/lib/manifesto.js | 8 ++- src/lib/manifold.js | 14 ++++- 5 files changed, 117 insertions(+), 50 deletions(-) diff --git a/examples b/examples index 0cfc55940..8b3f41010 160000 --- a/examples +++ b/examples @@ -1 +1 @@ -Subproject commit 0cfc55940ad2f21d3a2da46bba542f553f778f9b +Subproject commit 8b3f4101023d80f3a0296f96b30ea320956e3b1a diff --git a/package-lock.json b/package-lock.json index 94095623c..1aaa4c769 100644 --- a/package-lock.json +++ b/package-lock.json @@ -185,9 +185,9 @@ } }, "@iiif/manifold": { - "version": "1.2.35", - "resolved": "https://registry.npmjs.org/@iiif/manifold/-/manifold-1.2.35.tgz", - "integrity": "sha512-fNBpyOANJ2S7szpmWhHz6SdhDDswqMGakjRAEWmg9jEwNACs4D4ZNAyW73nIEOcet4oabo4DgDR63gh/TVwxfQ==", + "version": "1.2.36", + "resolved": "https://registry.npmjs.org/@iiif/manifold/-/manifold-1.2.36.tgz", + "integrity": "sha512-0WrvgyMhQs8Hz8USjOjAIdY1HN8RtZU5vUWen3YPlQJDoFqt6O0+lm+aWLDB9PITgLLVaTwhbyiDmL9nIxG7Gg==", "requires": { "@types/jquery": "^2.0.40" } @@ -1277,11 +1277,11 @@ "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=", "dev": true, "requires": { - "ansi-styles": "1.1.0", - "escape-string-regexp": "1.0.5", - "has-ansi": "0.1.0", - "strip-ansi": "0.3.0", - "supports-color": "0.2.0" + "ansi-styles": "^1.1.0", + "escape-string-regexp": "^1.0.0", + "has-ansi": "^0.1.0", + "strip-ansi": "^0.3.0", + "supports-color": "^0.2.0" }, "dependencies": { "ansi-regex": { @@ -1311,7 +1311,7 @@ "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=", "dev": true, "requires": { - "ansi-regex": "0.2.1" + "ansi-regex": "^0.2.1" } }, "supports-color": { @@ -2470,9 +2470,9 @@ "resolved": "http://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz", "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==", "requires": { - "chardet": "0.4.2", - "iconv-lite": "0.4.24", - "tmp": "0.0.33" + "chardet": "^0.4.0", + "iconv-lite": "^0.4.17", + "tmp": "^0.0.33" } }, "extglob": { @@ -2965,12 +2965,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2985,17 +2987,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -3112,7 +3117,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -3124,6 +3130,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -3138,6 +3145,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -3145,12 +3153,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -3169,6 +3179,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -3249,7 +3260,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -3261,6 +3273,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -3382,6 +3395,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -4287,11 +4301,7 @@ "requires": { "@iiif/manifold": "1.2.26", "@types/jquery": "^3.2.16", - "base-component": "github:iiif-commons/base-component#a6e743e45238ebf2251e3e086060554b0d6e213a", - "exjs": "github:BSick7/exjs#98195810790c0e61cb5beb510da4b756528f92f2", - "jquery-plugins": "github:edsilv/jquery-plugins#f5ea03caee86235db7cf3493091b0df14b17fc74", - "manifesto.js": "2.2.25", - "utils": "github:edsilv/utils#5410970a977df6a86826fed022b09be3a8b642af" + "manifesto.js": "2.2.25" }, "dependencies": { "@iiif/manifold": { @@ -4314,41 +4324,77 @@ "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.6.tgz", "integrity": "sha512-403D4wN95Mtzt2EoQHARf5oe/jEPhzBOBNrunk+ydQGW8WmkQ/E8rViRAEB1qEt/vssfGfNVD6ujP4FVeegrLg==" }, + "@types/node": { + "version": "7.0.70", + "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.70.tgz", + "integrity": "sha512-bAcW/1aM8/s5iFKhRpu/YJiQf/b1ZwnMRqqsWRCmAqEDQF2zY8Ez3Iu9AcZKFKc3vCJc8KJVpJ6Pn54sJ1BvXQ==" + }, + "base-component": { + "version": "github:iiif-commons/base-component#a6e743e45238ebf2251e3e086060554b0d6e213a", + "from": "github:iiif-commons/base-component#a6e743e45238ebf2251e3e086060554b0d6e213a", + "requires": { + "@types/jquery": "^2.0.40", + "@types/node": "^7.0.5" + }, + "dependencies": { + "@types/jquery": { + "version": "2.0.50", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-2.0.50.tgz", + "integrity": "sha512-VnMd+TAdv4E96CsZ99FsOaeP2Eonv8wYSNyBS5PYRNYWFZNDyoxmtcLm8nc/cChe4P8k70OvF0sdCBde0FFxjw==" + } + } + }, "exjs": { "version": "github:BSick7/exjs#98195810790c0e61cb5beb510da4b756528f92f2", - "from": "github:BSick7/exjs#0.5.0" + "from": "github:BSick7/exjs#98195810790c0e61cb5beb510da4b756528f92f2" }, "http-status-codes": { "version": "github:edsilv/http-status-codes#af3a8ab9970b1f291a79b03c7382dc16aebee749", "from": "github:edsilv/http-status-codes#v0.0.7" }, + "jquery-plugins": { + "version": "github:edsilv/jquery-plugins#f5ea03caee86235db7cf3493091b0df14b17fc74", + "from": "github:edsilv/jquery-plugins#f5ea03caee86235db7cf3493091b0df14b17fc74", + "requires": { + "@types/jquery": "^2.0.40" + }, + "dependencies": { + "@types/jquery": { + "version": "2.0.50", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-2.0.50.tgz", + "integrity": "sha512-VnMd+TAdv4E96CsZ99FsOaeP2Eonv8wYSNyBS5PYRNYWFZNDyoxmtcLm8nc/cChe4P8k70OvF0sdCBde0FFxjw==" + } + } + }, "manifesto.js": { "version": "2.2.25", "resolved": "https://registry.npmjs.org/manifesto.js/-/manifesto.js-2.2.25.tgz", "integrity": "sha1-Ds9Hym05rnndGO0zDdAYxH5/LW8=", "requires": { - "exjs": "github:BSick7/exjs#98195810790c0e61cb5beb510da4b756528f92f2", - "http-status-codes": "github:edsilv/http-status-codes#af3a8ab9970b1f291a79b03c7382dc16aebee749", "request": "^2.83.0" }, "dependencies": { "exjs": { "version": "github:BSick7/exjs#98195810790c0e61cb5beb510da4b756528f92f2", - "from": "github:BSick7/exjs#0.5.0" + "from": "github:BSick7/exjs#98195810790c0e61cb5beb510da4b756528f92f2" + }, + "http-status-codes": { + "version": "github:edsilv/http-status-codes#af3a8ab9970b1f291a79b03c7382dc16aebee749", + "from": "github:edsilv/http-status-codes#af3a8ab9970b1f291a79b03c7382dc16aebee749" } } }, "utils": { "version": "github:edsilv/utils#5410970a977df6a86826fed022b09be3a8b642af", - "from": "github:edsilv/utils#v0.2.1", + "from": "github:edsilv/utils#5410970a977df6a86826fed022b09be3a8b642af", "requires": { "@types/jquery": "^2.0.40" }, "dependencies": { "@types/jquery": { - "version": "2.0.49", - "resolved": "http://registry.npmjs.org/@types/jquery/-/jquery-2.0.49.tgz", - "integrity": "sha512-/9xLnYmohN/vD2gDnLS4cym8TUmrJu7DvZa/LELKzZjdPsvWVJiedsdu2SXNtb/DA7FGimqL2g0IoyhbNKLl8g==" + "version": "2.0.50", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-2.0.50.tgz", + "integrity": "sha512-VnMd+TAdv4E96CsZ99FsOaeP2Eonv8wYSNyBS5PYRNYWFZNDyoxmtcLm8nc/cChe4P8k70OvF0sdCBde0FFxjw==" } } } @@ -4462,11 +4508,11 @@ "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" } }, "lodash": { @@ -7113,9 +7159,9 @@ } }, "manifesto.js": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/manifesto.js/-/manifesto.js-3.0.7.tgz", - "integrity": "sha512-bM3QmHZcSrinFqeyHuNJz64qBCWiX7Q2BpLvDKSgbQCA25OpR0vyr6849ysnV9rTXVyKueFcn8W244UuerhHRg==", + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/manifesto.js/-/manifesto.js-3.0.9.tgz", + "integrity": "sha512-sblQSbDmPszfwqdcSVOZp0eXIFMg7vUYJKIVTGRoO65HBppjS9ipRZ+jReV3dt5WQhI5J58KXJL97z5mcKL/pA==", "requires": { "exjs": "github:BSick7/exjs#98195810790c0e61cb5beb510da4b756528f92f2", "http-status-codes": "github:edsilv/http-status-codes#af3a8ab9970b1f291a79b03c7382dc16aebee749", @@ -7509,8 +7555,8 @@ "resolved": "http://registry.npmjs.org/node-fetch/-/node-fetch-1.6.3.tgz", "integrity": "sha1-3CNO3WSJmC1Y6PDbT2lQKavNjAQ=", "requires": { - "encoding": "0.1.12", - "is-stream": "1.1.0" + "encoding": "^0.1.11", + "is-stream": "^1.0.1" } }, "node-int64": { @@ -7793,8 +7839,8 @@ "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", "dev": true, "requires": { - "minimist": "0.0.10", - "wordwrap": "0.0.2" + "minimist": "~0.0.1", + "wordwrap": "~0.0.2" }, "dependencies": { "minimist": { @@ -10077,7 +10123,6 @@ "requires": { "@types/three": "0.91.0", "@types/webvr-api": "0.0.31", - "key-codes": "github:edsilv/key-codes#c18ff040b716097af23b18ecdbc4e4c1a559691e", "three": "0.91.0" }, "dependencies": { @@ -10093,6 +10138,10 @@ "version": "0.0.31", "resolved": "https://registry.npmjs.org/@types/webvr-api/-/webvr-api-0.0.31.tgz", "integrity": "sha1-9gYf6IoDXTSotqDFX4dYkB7IoI4=" + }, + "key-codes": { + "version": "github:edsilv/key-codes#c18ff040b716097af23b18ecdbc4e4c1a559691e", + "from": "github:edsilv/key-codes#c18ff040b716097af23b18ecdbc4e4c1a559691e" } } }, diff --git a/package.json b/package.json index ee5467cb0..fab9e4f42 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "typescript": "2.7.2" }, "dependencies": { - "@iiif/manifold": "1.2.35", + "@iiif/manifold": "1.2.36", "@types/modernizr": "3.2.29", "@types/requirejs": "2.1.28", "@types/three": "0.84.20", @@ -82,7 +82,7 @@ "jquery-ui-touch-punch": "0.2.3", "jsviews": "0.9.83", "key-codes": "github:edsilv/key-codes#v0.0.7", - "manifesto.js": "3.0.7", + "manifesto.js": "3.0.9", "mediaelement": "4.0.2", "opencollective": "1.0.3", "openseadragon": "2.2.1", diff --git a/src/lib/manifesto.js b/src/lib/manifesto.js index edef3233b..ab520da78 100644 --- a/src/lib/manifesto.js +++ b/src/lib/manifesto.js @@ -1,4 +1,4 @@ -// manifesto v3.0.7 https://github.com/iiif-commons/manifesto +// manifesto v3.0.9 https://github.com/iiif-commons/manifesto (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.manifesto = 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