diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/Tile.vue | 2 | ||||
| -rw-r--r-- | src/components/TileInfoModal.vue | 19 |
2 files changed, 11 insertions, 10 deletions
diff --git a/src/components/Tile.vue b/src/components/Tile.vue index da3c29c..1b765e8 100644 --- a/src/components/Tile.vue +++ b/src/components/Tile.vue @@ -30,7 +30,7 @@ export default defineComponent({ // Used to hide overflow on tile expansion, but not hide a sepSweptArea on subsequent transitions clickHoldTimer: 0, // Used to recognise click-and-hold events scrollOffset: 0, // Used to track scroll offset when displaying with overflow - pendingScrollHdlr: false, + pendingScrollHdlr: 0, }; }, computed: { diff --git a/src/components/TileInfoModal.vue b/src/components/TileInfoModal.vue index 625f02f..0ffeb5c 100644 --- a/src/components/TileInfoModal.vue +++ b/src/components/TileInfoModal.vue @@ -11,8 +11,7 @@ export default defineComponent({ data(){ return { tolNode: null as null | TolNode, - desc: null as null | string, - fromRedirect: false, + descObj: null as null | {text: string, fromRedirect: boolean, wikiId: number, fromDbp: boolean}, imgInfo: null as null | {eolId: string, sourceUrl: string, license: string, copyrightOwner: string}, }; }, @@ -60,10 +59,7 @@ export default defineComponent({ .then(obj => { if (obj != null){ this.tolNode = obj.nodeObj; - if (obj.desc != null){ - this.desc = obj.desc.text; - this.fromRedirect = obj.desc.fromRedirect; - } + this.descObj = obj.descObj; this.imgInfo = obj.imgInfo; } }); @@ -97,12 +93,17 @@ export default defineComponent({ </ul> </div> </div> - <div v-if="desc != null"> + <div v-if="descObj != null"> <div> - Redirected: {{fromRedirect}} + Redirected: {{descObj.fromRedirect}} <br/> + Short-description from {{descObj.fromDbp ? 'DBpedia' : 'Wikipedia'}} <br/> + <a :href="'https://en.wikipedia.org/?curid=' + descObj.wikiId" class="underline"> + Wikipedia Link + </a> </div> + <hr/> <div> - {{desc}} + {{descObj.text}} </div> </div> <div v-else> |