diff --git a/css/less/window.less b/css/less/window.less index b3b372bbaf07be50c4d243585d8d2020f4889189..6ce39067c1b1d0903304bfe01849e6c23cfe7e91 100644 --- a/css/less/window.less +++ b/css/less/window.less @@ -6,6 +6,7 @@ overflow: hidden; background-color: @black-33; top: 0%; + z-index: 1; } .manifest-info { diff --git a/docs/getting-started.md b/docs/getting-started.md index e74f03bcacf6dfd4fff427fb4d4dd56cd50faf24..f7ed08466ab284e2ba13379ce68b8c7f1ef2f10c 100644 --- a/docs/getting-started.md +++ b/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> diff --git a/js/lib/isfahan.js b/js/lib/isfahan.js index b3f7d1fb57ae9e9d14ebf60d0c9803bfa652d992..0ea81c7a2012b741584fd553f18c3df53d7ca95e 100644 --- a/js/lib/isfahan.js +++ b/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) { diff --git a/js/src/annotations/osd-region-draw-tool.js b/js/src/annotations/osd-region-draw-tool.js index ac7e01305517e90f5f2ffc01543769e483aeab07..4c19af40a66f07d930ff4c3a5b8cafb8ea27408f 100644 --- a/js/src/annotations/osd-region-draw-tool.js +++ b/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; } } diff --git a/js/src/utils/saveController.js b/js/src/utils/saveController.js index 395df1161f96be2399a40ef0da78e99a4b3c2c28..16a39204e81f37052c0c288f67999f4526aed240 100755 --- a/js/src/utils/saveController.js +++ b/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. diff --git a/js/src/viewer/manifestListItem.js b/js/src/viewer/manifestListItem.js index 793fa19b875e08caccf039b0eb27e53843c17848..f55c7391dd8a6cd1553da31ba33a20a56c809b2d 100644 --- a/js/src/viewer/manifestListItem.js +++ b/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, diff --git a/js/src/widgets/searchTab.js b/js/src/widgets/searchTab.js index 71698d9198b70396c4542c09dd7f29f7827b1a63..362cdea987960b6c378698a6911949afd2203767 100644 --- a/js/src/widgets/searchTab.js +++ b/js/src/widgets/searchTab.js @@ -137,7 +137,7 @@ }; }); - templateData = { + var templateData = { searchService: searchServiceIdArray }; diff --git a/js/src/widgets/searchWithinResults.js b/js/src/widgets/searchWithinResults.js index 4b603904f23def5ff191aaf848e01c7d43472c93..c5953c5d183ed43d0d01ea9ed18df887920c2f51 100644 --- a/js/src/widgets/searchWithinResults.js +++ b/js/src/widgets/searchWithinResults.js @@ -2,7 +2,7 @@ /** * UI + logic to get search results for a given search query. On initialization, - * the provided search query is given tothe provided IIIF Search service. + * the provided search query is given to the provided IIIF Search service. * The response is displayed as a list. * * Parameter 'query_params': {q: query, motivation: motivation, date: date, user: user} diff --git a/locales/nl/translation.json b/locales/nl/translation.json index 228504b94f71f3e6254b4268e58c154231bbd4d3..a43d39f503db44131471e97dc664b05e96b13a56 100644 --- a/locales/nl/translation.json +++ b/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" } diff --git a/package.json b/package.json index 35cece2039b6fe93c82c5d7e56cf00858daeb860..460279e4cd440d96430b25dee3ea0e27f7e10473 100644 --- a/package.json +++ b/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",