Skip to content

Commit

Permalink
Mirador upgrade (#562)
Browse files Browse the repository at this point in the history
* Bump @babel/traverse from 7.11.5 to 7.23.7

Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.11.5 to 7.23.7.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.7/packages/babel-traverse)

---
updated-dependencies:
- dependency-name: "@babel/traverse"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

* Update yarn.lock

* Mirador upgrade to latest

* Update yarn.lock

* Yarn: add levenary

* Update index.js

Remove code to remove dev env deprecation warnings.

* Update _mirador.scss

Remove main element background

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
ewlarson and dependabot[bot] authored Jan 9, 2024
1 parent 898e992 commit ba3445f
Show file tree
Hide file tree
Showing 5 changed files with 2,553 additions and 3,173 deletions.
1 change: 0 additions & 1 deletion app/assets/javascripts/geoportal/viewers/iiif_manifest.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ GeoBlacklight.Viewer.IiifManifest = GeoBlacklight.Viewer.extend({
enabled: false,
}
}, [
OSDReferencesPlugin,
miradorDownloadDialogPlugin,
miradorDownloadPlugin,
customIconPlugin
Expand Down
1 change: 1 addition & 0 deletions app/assets/stylesheets/geoportal/_mirador.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
main.mirador-viewer {
margin-top:2rem;
background: none;
}
4 changes: 1 addition & 3 deletions app/javascript/m3/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@
import Mirador from 'mirador/dist/es/src/index.js';
import miradorDownloadPlugin from 'mirador-dl-plugin/es/miradorDownloadPlugin.js';
import miradorDownloadDialogPlugin from 'mirador-dl-plugin/es/MiradorDownloadDialog.js';
import OSDReferencesPlugin from 'mirador/dist/es/src/plugins/OSDReferences';
import customIconPlugin from 'm3/plugins/customIconPlugin';

window.Mirador = Mirador;
window.miradorDownloadPlugin = miradorDownloadPlugin;
window.miradorDownloadDialogPlugin = miradorDownloadDialogPlugin;
window.OSDReferencesPlugin = OSDReferencesPlugin;
window.customIconPlugin = customIconPlugin;
window.customIconPlugin = customIconPlugin;
11 changes: 7 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
"@babel/preset-env": "^7.7.1",
"@babel/preset-react": "^7.7.4",
"@blueprintjs/core": "^3.26.0",
"@material-ui/core": "4.11.3",
"@material-ui/icons": "^4.9.1",
"@nathanvda/cocoon": "^1.2.14",
"@rails/actioncable": "^7.0.7-2",
"@rails/activestorage": "^7.0.7-2",
Expand All @@ -50,16 +52,17 @@
"inputmask": "^5.0.8",
"jquery": "3.5.1",
"js-cookie": "^2.2.1",
"levenary": "^1.1.1",
"linkifyjs": "^2.1.9",
"lodash": "^4.17.13",
"lodash.template": "^4.5.0",
"mirador": "3.0.0-beta.7",
"mirador-dl-plugin": "0.11.0",
"mirador": "^3.3.0",
"mirador-dl-plugin": "^0.13.0",
"moment": "^2.29.4",
"node-forge": "^1.3.1",
"popper.js": "^1.16.1",
"react": "^16.12.0",
"react-dom": "^16.12.0",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"serialize-javascript": "^6.0.1",
"shave": "^5.0.3",
"stimulus": "^1.1.1",
Expand Down
Loading

0 comments on commit ba3445f

Please sign in to comment.