Merge branch 'develop' into minor-ui-improvement

css/less/window.less

@@ -6,6 +6,7 @@
     overflow: hidden;
     background-color: @black-33;
     top: 0%;
+    z-index: 1;
   }
 
   .manifest-info {

docs/getting-started.md

@@ -30,7 +30,7 @@ To initialize Mirador, it needs to be attached to an existing HTML **div** throu
       $(function() {
         Mirador({
           id: "viewer",
-          data: [/* Manifests and collections here *]
+          data: [/* Manifests and collections here */]
         });
       });
     </script>

js/lib/isfahan.js

@@ -45,6 +45,7 @@ var Isfahan = function(configObject) {
     n = group.length,
     x = rect.x,
     y = rect.y,
+    d,
     o;
     var offset = 0;
     while (++i < n) {

js/src/annotations/osd-region-draw-tool.js

@@ -137,7 +137,7 @@
       if (typeof annotation === 'object' && annotation.on) {
         for (var i = 0; i < strategies.length; i++) {
           if (strategies[i].isThisType(annotation)) {
-            shapeArray = strategies[i].parseRegion(annotation, this);
+            var shapeArray = strategies[i].parseRegion(annotation, this);
             return shapeArray;
           }
         }

js/src/utils/saveController.js

@@ -87,8 +87,8 @@
         return false;
       }
 
-      saveModule = config.jsonStorageEndpoint.module,
-      saveOptions = config.jsonStorageEndpoint.options;
+      var saveModule = config.jsonStorageEndpoint.module;
+      var saveOptions = config.jsonStorageEndpoint.options;
       _this.storageModule = new $[saveModule](saveOptions);
 
       var sessionID = window.location.hash.substring(1); // will return empty string if none exists, causing the or statement below to evaluate to false, generating a new sesssionID.

js/src/viewer/manifestListItem.js

@@ -108,7 +108,7 @@
 
         var aspectRatio = canvas.height/canvas.width,
         width = (_this.thumbHeight/aspectRatio);
-        url = _this.manifest.getThumbnailForCanvas(canvas, width);
+        var url = _this.manifest.getThumbnailForCanvas(canvas, width);
 
         _this.allImages.push({
           url: url,

js/src/widgets/searchTab.js

@@ -137,7 +137,7 @@
         };
       });
 
-      templateData = {
+      var templateData = {
         searchService: searchServiceIdArray
       };
 

locales/nl/translation.json

@@ -21,11 +21,11 @@
     "addSlotBelow": "Voeg Slot toe onderaan",
     "imageView": "Beeld presentatie",
     "bookView": "Boek presentatie",
-    "scrollView": "Navigeer door presentatie",
-    "thumbnailsView": "Galerie presentatie",
+    "scrollView": "Scroll view",
+    "thumbnailsView": "Bekijk thumbnail",
     "comments": "Commentaar",
     "addTagsHere": "Voeg hier tags toe",
-    "save": "Bewaren",
+    "save": "Opslaan",
     "cancel": "Annuleren",
     "edit": "Bewerken",
     "delete": "Verwijderen",
@@ -34,6 +34,6 @@
     "objectMetadata": "Object Metadata",
     "fullScreen": "Volledig scherm",
     "logo": "Logo",
-    "load": "Opladen",
-    "dropToLoad": "Vallen hier om object te laden"
+    "load": "Laad",
+    "dropToLoad": "Drop hier om the laden"
 }

package.json

@@ -23,7 +23,7 @@
     "grunt-contrib-connect": "*",
     "grunt-contrib-copy": "*",
     "grunt-contrib-cssmin": "*",
-    "grunt-contrib-jasmine": "*",
+    "grunt-contrib-jasmine": "^1.2.0",
     "grunt-contrib-jshint": "*",
     "grunt-contrib-less": "^1.4.0",
     "grunt-contrib-uglify": "*",
@@ -61,11 +61,11 @@
     "bootstrap": "^3.3.7",
     "d3": "^3.5.17",
     "font-awesome": "^4.7.0",
-    "handlebars": "^1.3.0",
+    "handlebars": "^4.0.11",
     "i18next": "^4.2.0",
     "i18next-browser-languagedetector": "^1.0.1",
     "i18next-xhr-backend": "^1.3.0",
-    "iiif-evented-canvas": "0.0.1-alpha-5",
+    "iiif-evented-canvas": "^0.0.3-beta",
     "iiif-layout-functions": "0.0.2-alpha",
     "javascript-state-machine": "^2.3.4",
     "jquery": "^3.1.1",