Merge pull request #1 from britishlibrary/upgradeTo202

Upgrade to v2.0.2
britishlibrary · Nov 28, 2017 · d283746 · d283746
2 parents 5059c61 + 6355d92
commit d283746
Show file tree

Hide file tree

Showing 646 changed files with 12,337 additions and 5,999 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,9 @@
 #################
-## Bower Components
+## libs
 #################
 
 lib
+src/lib/bundle.min.js
 !src/lib
 !src/extensions/**/lib
 !dist/**/lib
@@ -19,12 +20,6 @@ lib
 
 .idea
 
-#################
-## VSCode
-#################
-
-##.vscode
-
 #################
 ## Node
 #################

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -8,4 +8,6 @@
     "**/*.js": { "when": "$(basename).ts"},
     "**/*.js.map": true
   }
+,
+"typescript.check.workspaceVersion": false
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,11 @@
+<a name="2.0.1"></a>
+## [2.0.1](https://github.com/universalviewer/universalviewer/compare/v2.0.0...v2.0.1) (2017-02-15)
+
+
+### Bug Fixes
+
+* **preserve zoom:** fix for [#433](https://github.com/universalviewer/universalviewer/issues/433) ([a4341e8](https://github.com/universalviewer/universalviewer/commit/a4341e8))
+* **versioning:** load package.json relative to app.html and only when dialogue is opened ([0b9500f](https://github.com/universalviewer/universalviewer/commit/0b9500f))
+
+
+
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,4 +1,3 @@
-var version = require('./tasks/version');
 var configure = require('./tasks/configure');
 var theme = require('./tasks/theme');
 var c = require('./config');
@@ -75,6 +74,14 @@ module.exports = function (grunt) {
             },
             build: {
                 files: [
+                    // package.json
+                    {
+                        expand: true,
+                        flatten: true,
+                        cwd: '.',
+                        src: ['package.json'],
+                        dest: '<%= config.directories.build %>'
+                    },
                     // html
                     {
                         expand: true,
@@ -273,7 +280,7 @@ module.exports = function (grunt) {
             // concatenate and compress with r.js
             build: {
                 cmd: 'node node_modules/requirejs/bin/r.js -o app.build.js' // optimize=none'
-            }
+            },
         },
 
         replace: {
@@ -371,15 +378,6 @@ module.exports = function (grunt) {
             }
         },
 
-        version: {
-            bump: {
-            },
-            apply: {
-                src: './VersionTemplate.ts',
-                dest: './src/_Version.ts'
-            }
-        },
-
         configure: {
             apply: {
                 options: {
@@ -425,15 +423,9 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks('grunt-sync');
     grunt.loadNpmTasks('grunt-text-replace');
 
-    version(grunt);
     configure(grunt);
     theme(grunt);
 
-    // to change version manually, edit package.json
-    grunt.registerTask('bump:patch', ['version:bump', 'version:apply']);
-    grunt.registerTask('bump:minor', ['version:bump:minor', 'version:apply']);
-    grunt.registerTask('bump:major', ['version:bump:major', 'version:apply']);
-
     grunt.registerTask('default', '', function(){
 
         grunt.task.run(

diff --git a/README.md b/README.md
@@ -1,14 +1,13 @@
 # Universal Viewer
 
-test
+[![Backers on Open Collective](https://opencollective.com/universalviewer/backers/badge.svg)](#backers)
+[![Sponsors on Open Collective](https://opencollective.com/universalviewer/sponsors/badge.svg)](#sponsors)
+[![Build Status](https://travis-ci.org/UniversalViewer/universalviewer.svg?branch=master)](https://travis-ci.org/UniversalViewer/universalviewer) 
+&nbsp;&nbsp;
+<a href="https://universalviewerinvite.herokuapp.com"><img src="https://worldvectorlogo.com/logos/slack.svg" width="60" /></a>
 
-[![Build Status](https://travis-ci.org/UniversalViewer/universalviewer.svg?branch=master)](https://travis-ci.org/UniversalViewer/universalviewer) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/UniversalViewer/universalviewer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-    npm install universalviewer
-
-or
-
-    bower install uv
+    npm install universalviewer --save
 
 [Examples](http://universalviewer.io/examples/)
 
@@ -18,25 +17,20 @@ or
 
 ## Contributors
 
-![Wellcome Library](https://raw.githubusercontent.com/UniversalViewer/assets/master/wellcome_logo.png "Wellcome Library")
-![British Library](https://raw.githubusercontent.com/UniversalViewer/assets/master/bl_logo.png "British Library")
-![National Library of Wales](https://raw.githubusercontent.com/UniversalViewer/assets/master/nlw_logo.png "National Library of Wales")
-![Villanova University, Falvey Memorial Library](https://raw.githubusercontent.com/UniversalViewer/assets/master/vufalvey_logo.png "Villanova University, Falvey Memorial Library")
-![Riksarkivet](https://raw.githubusercontent.com/Riksarkivet/assets/master/logo-en.png "Riksarkivet, The Swedish National Archives")
-
-## About
+![Contributors](https://raw.githubusercontent.com/UniversalViewer/assets/master/logos.jpg "Contributors")
 
-The Universal Viewer is an [open source](https://github.com/UniversalViewer/universalviewer/blob/master/LICENSE.txt) project to enable cultural heritage institutions to present their digital artifacts in an [IIIF-compliant](http://iiif.io/) and highly customisable user interface. 
+## Features:
 
-Features:
-
-- [OpenSeadragon](https://openseadragon.github.io/) image zooming using the [IIIF image API](http://iiif.io/api/image/2.0/).
-- YouTube-style embedding with deep links to specific pages/zoom regions.
-- [Themable](https://universalviewer.gitbooks.io/custom-themes/content/), fork the [UV theme](https://github.com/UniversalViewer/uv-en-GB-theme) on github to create your own.
-- Highly [configurable](https://github.com/UniversalViewer/universalviewer/wiki/Configuration) and [extensible](http://universalviewer.gitbooks.io/custom-extensions/content/).
-- Supports "IxIF" out of the box, allowing [3D](http://universalviewer.io/examples/?manifest=http://files.universalviewer.io/manifests/nelis/ecorche.json), [audio](http://universalviewer.io/examples/?manifest=http://wellcomelibrary.org/iiif/b17307922/manifest), [video](http://universalviewer.io/examples/?manifest=http://wellcomelibrary.org/iiif/b16659090/manifest), and [pdf](http://universalviewer.io/examples/?manifest=http://wellcomelibrary.org/iiif/b17502792/manifest) viewing experiences.
-- Supports search and autocomplete service integration with overlayed search results.
-- Internationalised UI using [transifex.com](https://www.transifex.com/) (currently supports English and Welsh. Volunteers for more translations gratefully accepted!)
+- **Zoomable**
+  <p><a href="https://openseadragon.github.io/">OpenSeadragon</a> image zooming using the <a href="http://iiif.io/api/image/2.0/">IIIF image API</a></p>
+- **Embeddable**
+  <p>YouTube-style embedding with deep links to specific pages/zoom regions.</p>
+- **Themable**
+  <p>Fork the <a href="https://github.com/UniversalViewer/uv-en-GB-theme">UV theme</a> on github to create your own.</p>
+- **Configurable**
+  <p>The UV has its own visual configuration editor allowing all settings to be customised.</p>
+- **Extensible**
+  <p>Supports "IxIF" out of the box, allowing <a href="http://universalviewer.io/examples/?manifest=http://files.universalviewer.io/manifests/nelis/ecorche.json">3D</a>, <a href="http://universalviewer.io/examples/?manifest=http://wellcomelibrary.org/iiif/b17307922/manifest">audio</a>, <a href="http://universalviewer.io/examples/?manifest=http://wellcomelibrary.org/iiif/b16659090/manifest">video</a>, and <a href="http://universalviewer.io/examples/?manifest=http://wellcomelibrary.org/iiif/b17502792/manifest">pdf</a> viewing experiences.</p>
 
 [More about the Universal Viewer](https://github.com/UniversalViewer/universalviewer/wiki/About)
 
@@ -91,11 +85,9 @@ To build the distribution version of the UV, just run (on the command line, in t
 
 A versioned `uv-major.minor.patch` folder along with compressed .zip and .tar files will appear in the `/dist` folder. Use these in your website, or alternatively use:
 
-    bower install uv --save
+    npm install universalviewer --save
 
-which will download the distribution folder to `bower_components`.
-
-See https://github.com/UniversalViewer/demo-site for examples.
+which will download the distribution folder to `node_modules`.
 
 ### Examples
 
@@ -104,6 +96,80 @@ To view the examples run:
     grunt
     grunt examples
 
+
+## Backers
+
+Support us with a monthly donation and help us continue our activities. [[Become a backer](https://opencollective.com/universalviewer#backer)]
+
+<a href="https://opencollective.com/universalviewer/backer/0/website" target="_blank"><img src="https://opencollective.com/universalviewer/backer/0/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/backer/1/website" target="_blank"><img src="https://opencollective.com/universalviewer/backer/1/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/backer/2/website" target="_blank"><img src="https://opencollective.com/universalviewer/backer/2/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/backer/3/website" target="_blank"><img src="https://opencollective.com/universalviewer/backer/3/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/backer/4/website" target="_blank"><img src="https://opencollective.com/universalviewer/backer/4/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/backer/5/website" target="_blank"><img src="https://opencollective.com/universalviewer/backer/5/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/backer/6/website" target="_blank"><img src="https://opencollective.com/universalviewer/backer/6/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/backer/7/website" target="_blank"><img src="https://opencollective.com/universalviewer/backer/7/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/backer/8/website" target="_blank"><img src="https://opencollective.com/universalviewer/backer/8/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/backer/9/website" target="_blank"><img src="https://opencollective.com/universalviewer/backer/9/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/backer/10/website" target="_blank"><img src="https://opencollective.com/universalviewer/backer/10/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/backer/11/website" target="_blank"><img src="https://opencollective.com/universalviewer/backer/11/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/backer/12/website" target="_blank"><img src="https://opencollective.com/universalviewer/backer/12/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/backer/13/website" target="_blank"><img src="https://opencollective.com/universalviewer/backer/13/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/backer/14/website" target="_blank"><img src="https://opencollective.com/universalviewer/backer/14/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/backer/15/website" target="_blank"><img src="https://opencollective.com/universalviewer/backer/15/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/backer/16/website" target="_blank"><img src="https://opencollective.com/universalviewer/backer/16/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/backer/17/website" target="_blank"><img src="https://opencollective.com/universalviewer/backer/17/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/backer/18/website" target="_blank"><img src="https://opencollective.com/universalviewer/backer/18/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/backer/19/website" target="_blank"><img src="https://opencollective.com/universalviewer/backer/19/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/backer/20/website" target="_blank"><img src="https://opencollective.com/universalviewer/backer/20/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/backer/21/website" target="_blank"><img src="https://opencollective.com/universalviewer/backer/21/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/backer/22/website" target="_blank"><img src="https://opencollective.com/universalviewer/backer/22/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/backer/23/website" target="_blank"><img src="https://opencollective.com/universalviewer/backer/23/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/backer/24/website" target="_blank"><img src="https://opencollective.com/universalviewer/backer/24/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/backer/25/website" target="_blank"><img src="https://opencollective.com/universalviewer/backer/25/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/backer/26/website" target="_blank"><img src="https://opencollective.com/universalviewer/backer/26/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/backer/27/website" target="_blank"><img src="https://opencollective.com/universalviewer/backer/27/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/backer/28/website" target="_blank"><img src="https://opencollective.com/universalviewer/backer/28/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/backer/29/website" target="_blank"><img src="https://opencollective.com/universalviewer/backer/29/avatar.svg"></a>
+
+
+## Sponsors
+
+Become a sponsor and get your logo on our README on Github with a link to your site. [[Become a sponsor](https://opencollective.com/universalviewer#sponsor)]
+
+<a href="https://opencollective.com/universalviewer/sponsor/0/website" target="_blank"><img src="https://opencollective.com/universalviewer/sponsor/0/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/sponsor/1/website" target="_blank"><img src="https://opencollective.com/universalviewer/sponsor/1/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/sponsor/2/website" target="_blank"><img src="https://opencollective.com/universalviewer/sponsor/2/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/sponsor/3/website" target="_blank"><img src="https://opencollective.com/universalviewer/sponsor/3/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/sponsor/4/website" target="_blank"><img src="https://opencollective.com/universalviewer/sponsor/4/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/sponsor/5/website" target="_blank"><img src="https://opencollective.com/universalviewer/sponsor/5/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/sponsor/6/website" target="_blank"><img src="https://opencollective.com/universalviewer/sponsor/6/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/sponsor/7/website" target="_blank"><img src="https://opencollective.com/universalviewer/sponsor/7/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/sponsor/8/website" target="_blank"><img src="https://opencollective.com/universalviewer/sponsor/8/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/sponsor/9/website" target="_blank"><img src="https://opencollective.com/universalviewer/sponsor/9/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/sponsor/10/website" target="_blank"><img src="https://opencollective.com/universalviewer/sponsor/10/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/sponsor/11/website" target="_blank"><img src="https://opencollective.com/universalviewer/sponsor/11/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/sponsor/12/website" target="_blank"><img src="https://opencollective.com/universalviewer/sponsor/12/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/sponsor/13/website" target="_blank"><img src="https://opencollective.com/universalviewer/sponsor/13/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/sponsor/14/website" target="_blank"><img src="https://opencollective.com/universalviewer/sponsor/14/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/sponsor/15/website" target="_blank"><img src="https://opencollective.com/universalviewer/sponsor/15/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/sponsor/16/website" target="_blank"><img src="https://opencollective.com/universalviewer/sponsor/16/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/sponsor/17/website" target="_blank"><img src="https://opencollective.com/universalviewer/sponsor/17/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/sponsor/18/website" target="_blank"><img src="https://opencollective.com/universalviewer/sponsor/18/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/sponsor/19/website" target="_blank"><img src="https://opencollective.com/universalviewer/sponsor/19/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/sponsor/20/website" target="_blank"><img src="https://opencollective.com/universalviewer/sponsor/20/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/sponsor/21/website" target="_blank"><img src="https://opencollective.com/universalviewer/sponsor/21/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/sponsor/22/website" target="_blank"><img src="https://opencollective.com/universalviewer/sponsor/22/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/sponsor/23/website" target="_blank"><img src="https://opencollective.com/universalviewer/sponsor/23/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/sponsor/24/website" target="_blank"><img src="https://opencollective.com/universalviewer/sponsor/24/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/sponsor/25/website" target="_blank"><img src="https://opencollective.com/universalviewer/sponsor/25/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/sponsor/26/website" target="_blank"><img src="https://opencollective.com/universalviewer/sponsor/26/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/sponsor/27/website" target="_blank"><img src="https://opencollective.com/universalviewer/sponsor/27/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/sponsor/28/website" target="_blank"><img src="https://opencollective.com/universalviewer/sponsor/28/avatar.svg"></a>
+<a href="https://opencollective.com/universalviewer/sponsor/29/website" target="_blank"><img src="https://opencollective.com/universalviewer/sponsor/29/avatar.svg"></a>
+
+
 ## License
 
 The Universal Viewer is released under the [MIT license](https://github.com/UniversalViewer/universalviewer/blob/master/LICENSE.txt).
+
diff --git a/VersionTemplate.ts b/VersionTemplate.ts
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "Universal Viewer",
-  "version": "1.8.39",
+  "version": "2.0.2",
   "description": "The Universal Viewer is an open source project to enable cultural heritage institutions to present their digital artifacts in an IIIF-compliant and highly customisable user interface.",
   "repository": {
     "type": "git",

diff --git a/config.js b/config.js
@@ -16,6 +16,8 @@ var Config = (function () {
             ],
             typings: [
                 'node_modules/base-component/dist/base-component.d.ts',
+                'node_modules/base-component/typings/corejs.d.ts',
+                'node_modules/base-component/typings/jquery.d.ts',
                 'node_modules/jquery-plugins/typings/jquery-plugins.d.ts',
                 'node_modules/key-codes/dist/key-codes.d.ts',
                 'node_modules/manifold/dist/manifold.bundle.d.ts',

diff --git a/dist/uv-1.8.39/lib/app.js b/dist/uv-1.8.39/lib/app.js
diff --git a/dist/uv-1.8.39/lib/bundle.min.js b/dist/uv-1.8.39/lib/bundle.min.js
diff --git a/dist/uv-1.8.39/lib/openseadragon.min.js b/dist/uv-1.8.39/lib/openseadragon.min.js