Skip to content

Commit

Permalink
fix: upgrade actions/checkout
Browse files Browse the repository at this point in the history
  • Loading branch information
sourcefilter committed Dec 20, 2024
1 parent 87ea747 commit e8adab9
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 14 deletions.
10 changes: 7 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,15 @@ on:
pull_request:
branches: [ main ]

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
cypress:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: 16
Expand All @@ -24,7 +28,7 @@ jobs:
# needs: cypress
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: 16
Expand Down Expand Up @@ -62,4 +66,4 @@ jobs:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_REGION: 'us-west-2'
SOURCE_DIR: 'dist'
DEST_DIR: ${{ env.DESTINATION_DIR }}
DEST_DIR: ${{ env.DESTINATION_DIR }}
15 changes: 5 additions & 10 deletions src/components/DLViewer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import axios from "axios";
import { defineAsyncComponent } from "vue";
import _has from "lodash/has"
import _get from "lodash/get"
export default {
Expand Down Expand Up @@ -56,20 +55,17 @@ export default {
const iiifServicePath = this.isV3Manifest ?
"iiif_manifest.items[0].items[0].items[0].body.service" :
"iiif_manifest.sequences[0].canvases[0].images[0].resource.service"
console.log(this.isV3Manifest, iiifServicePath, _get(this, iiifServicePath))
const parts = iiifServicePath.split(".")
for (let i = 0; i < parts.length - 1; i++) {
let path = parts.slice(0, i + 1).join(".")
console.log(path, _get(this, path))
}
return _has(this, iiifServicePath)
return !!_get(this, iiifServicePath)
},
isChoice() {
return (this.firstItemType == "Choice")
},
isCollection() {
// Have seen "'@type': 'sc:Collection'" and "'type': 'Collection'"
return _get(this, "iiif_manifest.@type", _get(this, "iiif_manifest.type", "")).includes("Collection")
return (
_get(this, "iiif_manifest.@type")
|| _get(this, "iiif_manifest.type", "")
).includes("Collection")
},
isImage() {
return (this.firstItemType == "Image")
Expand Down Expand Up @@ -136,7 +132,6 @@ export default {
}
},
viewer() {
console.log(this.isSinaiPalimpsest, this.isSinai, this.isCollection, this.isVideo, this.isSound, this.isImage, this.hasIiifService)
return (
this.isSinaiPalimpsest ? "MiradorPalimpsest" :
this.isSinai ? "Mirador" :
Expand Down
6 changes: 5 additions & 1 deletion src/components/ImageTag.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<template>
<img v-bind="options" class="image-tag" />
<img v-if="options.src" v-bind="options" class="image-tag" />
<div v-else class="image-tag">
<!-- CSS Placeholder w/o broken image icon -->
</div>
</template>

<script>
Expand All @@ -21,5 +24,6 @@ export default {
height: 100%;
object-fit: contain;
background-color: black;
}
</style>

0 comments on commit e8adab9

Please sign in to comment.