From 4393f8f25025ea600dae30be2d6ad9067496ba40 Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Sat, 20 Jun 2020 06:04:39 +0200
Subject: viewer: component dispatch (no functional change)

a cleaner way to add new components to LdGallery
---
 viewer/src/components/LdAudioViewer.vue            |  58 ----------
 viewer/src/components/LdDownload.vue               |  57 ---------
 viewer/src/components/LdPdfViewer.vue              |  46 --------
 viewer/src/components/LdPicture.vue                | 121 --------------------
 viewer/src/components/LdPlainTextViewer.vue        |  55 ---------
 viewer/src/components/LdVideoViewer.vue            |  54 ---------
 viewer/src/components/index.ts                     |   2 +-
 .../src/components/item_handlers/LdAudioViewer.vue |  58 ++++++++++
 .../src/components/item_handlers/LdDirectory.vue   |  43 +++++++
 viewer/src/components/item_handlers/LdDownload.vue |  57 +++++++++
 .../src/components/item_handlers/LdPdfViewer.vue   |  46 ++++++++
 viewer/src/components/item_handlers/LdPicture.vue  | 127 +++++++++++++++++++++
 .../components/item_handlers/LdPlainTextViewer.vue |  55 +++++++++
 .../src/components/item_handlers/LdVideoViewer.vue |  54 +++++++++
 viewer/src/views/GalleryDirectory.vue              |  43 -------
 viewer/src/views/GalleryNavigation.vue             |  44 +++----
 16 files changed, 465 insertions(+), 455 deletions(-)
 delete mode 100644 viewer/src/components/LdAudioViewer.vue
 delete mode 100644 viewer/src/components/LdDownload.vue
 delete mode 100644 viewer/src/components/LdPdfViewer.vue
 delete mode 100644 viewer/src/components/LdPicture.vue
 delete mode 100644 viewer/src/components/LdPlainTextViewer.vue
 delete mode 100644 viewer/src/components/LdVideoViewer.vue
 create mode 100644 viewer/src/components/item_handlers/LdAudioViewer.vue
 create mode 100644 viewer/src/components/item_handlers/LdDirectory.vue
 create mode 100644 viewer/src/components/item_handlers/LdDownload.vue
 create mode 100644 viewer/src/components/item_handlers/LdPdfViewer.vue
 create mode 100644 viewer/src/components/item_handlers/LdPicture.vue
 create mode 100644 viewer/src/components/item_handlers/LdPlainTextViewer.vue
 create mode 100644 viewer/src/components/item_handlers/LdVideoViewer.vue
 delete mode 100644 viewer/src/views/GalleryDirectory.vue

(limited to 'viewer')

diff --git a/viewer/src/components/LdAudioViewer.vue b/viewer/src/components/LdAudioViewer.vue
deleted file mode 100644
index 739d36a..0000000
--- a/viewer/src/components/LdAudioViewer.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-<!--
--- ldgallery - A static generator which turns a collection of tagged
---             pictures into a searchable web gallery.
---
--- Copyright (C) 2020  Pacien TRAN-GIRARD
---
--- This program is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as
--- published by the Free Software Foundation, either version 3 of the
--- License, or (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
--->
-
-<template>
-  <div class="flex-column container-vh-centering">
-    <ld-thumbnail :item="audioItem" />
-    <audio :class="$style.player" :src="itemResourceUrl" preload="auto" controls>
-      <a
-        :download="itemFileName"
-        :href="itemResourceUrl"
-      >{{ $t("download.download-file-fmt", [itemFileName]) }}</a>
-    </audio>
-  </div>
-</template>
-
-<script lang="ts">
-import { Component, Prop, Vue } from "vue-property-decorator";
-import Navigation from "@/services/navigation";
-
-@Component
-export default class LdAudioViewer extends Vue {
-  @Prop({ required: true }) readonly audioItem!: Gallery.Audio;
-
-  get itemResourceUrl(): string {
-    return this.$galleryStore.resourceRoot + this.audioItem.properties.resource;
-  }
-
-  get itemFileName(): string {
-    return Navigation.getFileName(this.audioItem);
-  }
-}
-</script>
-
-<style lang="scss" module>
-.player {
-  width: 100%;
-  max-width: 500px;
-  margin-top: 1em;
-  text-align: center; // for fallback download link
-}
-</style>
diff --git a/viewer/src/components/LdDownload.vue b/viewer/src/components/LdDownload.vue
deleted file mode 100644
index 7b09dab..0000000
--- a/viewer/src/components/LdDownload.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-<!--
--- ldgallery - A static generator which turns a collection of tagged
---             pictures into a searchable web gallery.
---
--- Copyright (C) 2020  Pacien TRAN-GIRARD
---
--- This program is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as
--- published by the Free Software Foundation, either version 3 of the
--- License, or (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
--->
-
-<template>
-  <div class="container-vh-centering">
-    <a :class="$style.content" :download="itemFileName" :href="itemDownloadUrl">
-      <!-- TODO: show thumbnail instead of this generic file download icon? -->
-      <fa-icon :class="$style.icon" icon="file-download" size="6x" />
-      <div>{{ $t("download.download-file-fmt", [itemFileName]) }}</div>
-    </a>
-  </div>
-</template>
-
-<script lang="ts">
-import { Component, Prop, Vue } from "vue-property-decorator";
-import Navigation from "@/services/navigation";
-
-@Component
-export default class LdDownload extends Vue {
-  @Prop({ required: true }) readonly item!: Gallery.Other;
-
-  get itemFileName(): string {
-    return Navigation.getFileName(this.item);
-  }
-
-  get itemDownloadUrl(): string {
-    return this.$galleryStore.resourceRoot + this.item.properties.resource;
-  }
-}
-</script>
-
-<style lang="scss" module>
-.content {
-  text-align: center;
-}
-
-.icon {
-  margin-bottom: 0.15em;
-}
-</style>
diff --git a/viewer/src/components/LdPdfViewer.vue b/viewer/src/components/LdPdfViewer.vue
deleted file mode 100644
index b1f6c64..0000000
--- a/viewer/src/components/LdPdfViewer.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--
--- ldgallery - A static generator which turns a collection of tagged
---             pictures into a searchable web gallery.
---
--- Copyright (C) 2020  Pacien TRAN-GIRARD
---
--- This program is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as
--- published by the Free Software Foundation, either version 3 of the
--- License, or (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
--->
-
-<template>
-  <!-- intermediate container necessary to eliminate the double scrollbar -->
-  <div class="fill no-scroll">
-    <!-- prefer native browser PDF viewer if available -->
-    <object class="fill" :data="itemResourceUrl" type="application/pdf">
-      <!-- TODO: fallback to PDF.js (https://github.com/pacien/ldgallery/issues/212) -->
-      <ld-download :item="pdfItem" />
-    </object>
-  </div>
-</template>
-
-<script lang="ts">
-import { Component, Prop, Vue } from "vue-property-decorator";
-
-@Component
-export default class LdPdfViewer extends Vue {
-  @Prop({ required: true }) readonly pdfItem!: Gallery.PDF;
-
-  get itemResourceUrl(): string {
-    return this.$galleryStore.resourceRoot + this.pdfItem.properties.resource;
-  }
-}
-</script>
-
-<style lang="scss" module>
-</style>
diff --git a/viewer/src/components/LdPicture.vue b/viewer/src/components/LdPicture.vue
deleted file mode 100644
index 78829ec..0000000
--- a/viewer/src/components/LdPicture.vue
+++ /dev/null
@@ -1,121 +0,0 @@
-<!-- ldgallery - A static generator which turns a collection of tagged
---             pictures into a searchable web gallery.
---
--- Copyright (C) 2019-2020  Guillaume FOUET
---
--- This program is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as
--- published by the Free Software Foundation, either version 3 of the
--- License, or (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
--->
-
-<template>
-  <!-- FIXME: v-dragscroll interferes with pinch-to-zoom -->
-  <div
-    ref="containerElement"
-    v-dragscroll
-    class="scrollbar ld-picture-container"
-    @click.capture="e => dragScrollClickFix.onClickCapture(e)"
-    @dblclick="$uiStore.toggleFullscreen()"
-    @dragstart.prevent
-    @dragscrollstart="dragScrollClickFix.onDragScrollStart()"
-    @dragscrollend="dragScrollClickFix.onDragScrollEnd()"
-  >
-    <v-lazy-image
-      ref="imageElement"
-      :src="pictureSrc(picture.properties.resource)"
-      class="ld-picture-element"
-      :class="{'slow-loading': Boolean(slowLoadingStyle)}"
-      :style="slowLoadingStyle"
-      @load="clearSlowLoading"
-    />
-    <b-loading :active="loader" :is-full-page="false" class="ld-picture-loader" />
-  </div>
-</template>
-
-<script lang="ts">
-import { Component, Vue, Prop, Ref } from "vue-property-decorator";
-import LdZoom from "@/services/ldzoom";
-import DragScrollClickFix from "@/services/dragscrollclickfix";
-
-@Component
-export default class LdPicture extends Vue {
-  @Prop({ required: true }) readonly picture!: Gallery.Picture;
-  @Ref() readonly containerElement!: HTMLDivElement;
-  @Ref() readonly imageElement!: Vue;
-
-  readonly SLOW_LOADING_TIMEOUT_MS: number = 1500;
-  readonly dragScrollClickFix = new DragScrollClickFix();
-
-  slowLoadingStyle: string | null = null;
-  loader: boolean = false;
-  timer: NodeJS.Timeout | null = null;
-
-  mounted() {
-    this.timer = setTimeout(this.generateSlowLoadingStyle, this.SLOW_LOADING_TIMEOUT_MS);
-    new LdZoom(this.containerElement, this.imageElement.$el as HTMLImageElement, this.picture.properties, 10, 1 / 5).install();
-  }
-
-  destroyed() {
-    this.clearSlowLoading();
-  }
-
-  clearSlowLoading() {
-    if (this.timer) clearTimeout(this.timer);
-    this.timer = null;
-    this.slowLoadingStyle = null;
-    this.loader = false;
-  }
-
-  pictureSrc(resource: string) {
-    return this.$galleryStore.resourceRoot + resource;
-  }
-
-  generateSlowLoadingStyle() {
-    this.clearSlowLoading();
-    this.loader = true;
-    if (this.picture.thumbnail) {
-      const url = this.pictureSrc(this.picture.thumbnail.resource);
-      this.slowLoadingStyle = `background-image: url('${url}');`;
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-@import "~@/assets/scss/theme.scss";
-
-.ld-picture-container {
-  height: 100%;
-}
-
-.ld-picture-element {
-  max-width: unset;
-  max-height: unset;
-  cursor: grab;
-}
-
-.slow-loading {
-  background-repeat: no-repeat;
-  background-position: center;
-  background-size: contain;
-  background-color: $content-bgcolor;
-  background-blend-mode: soft-light;
-  opacity: 1 !important;
-}
-
-.ld-picture-loader {
-  position: relative;
-  & .loading-background {
-    background: none !important;
-  }
-}
-</style>
diff --git a/viewer/src/components/LdPlainTextViewer.vue b/viewer/src/components/LdPlainTextViewer.vue
deleted file mode 100644
index 5c32470..0000000
--- a/viewer/src/components/LdPlainTextViewer.vue
+++ /dev/null
@@ -1,55 +0,0 @@
-<!--
--- ldgallery - A static generator which turns a collection of tagged
---             pictures into a searchable web gallery.
---
--- Copyright (C) 2020  Pacien TRAN-GIRARD
---
--- This program is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as
--- published by the Free Software Foundation, either version 3 of the
--- License, or (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
--->
-
-<template>
-  <!-- Outer div necessary for the resize handle to appear on Firefox. -->
-  <div :class="$style.content" class="fill">
-    <!-- Using an iframe here to let the browser deal with content encoding detection. -->
-    <iframe class="fill" :src="itemResourceUrl" />
-  </div>
-</template>
-
-<script lang="ts">
-import { Component, Prop, Vue } from "vue-property-decorator";
-
-@Component
-export default class LdPlainTextViewer extends Vue {
-  @Prop({ required: true }) readonly plainTextItem!: Gallery.PlainText;
-
-  get itemResourceUrl(): string {
-    return this.$galleryStore.resourceRoot + this.plainTextItem.properties.resource;
-  }
-}
-</script>
-
-<style lang="scss" module>
-.content {
-  margin: auto; // Old-school horizontal centering.
-
-  // Allow the user to adjust the width of the text view for easier column reading.
-  resize: horizontal;
-  max-width: 100%; // Forbid overflow when resizing.
-  overflow: hidden; // Necessary for the resize handle to be shown in Chromium.
-  padding: 0.5em; // Necessary for the resize handle to be selectable on qutebrowser.
-
-  // Re-normalise page colour.
-  background-color: white;
-}
-</style>
diff --git a/viewer/src/components/LdVideoViewer.vue b/viewer/src/components/LdVideoViewer.vue
deleted file mode 100644
index b7a7c35..0000000
--- a/viewer/src/components/LdVideoViewer.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-<!--
--- ldgallery - A static generator which turns a collection of tagged
---             pictures into a searchable web gallery.
---
--- Copyright (C) 2020  Pacien TRAN-GIRARD
---
--- This program is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as
--- published by the Free Software Foundation, either version 3 of the
--- License, or (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
--->
-
-<template>
-  <!-- intermediate container necessary to eliminate the scrollbar -->
-  <div class="fill no-scroll">
-    <video
-      class="fill"
-      :src="itemResourceUrl"
-      :poster="thumbnailResourceUrl"
-      preload="auto"
-      controls
-    >
-      <ld-download :item="videoItem" />
-    </video>
-  </div>
-</template>
-
-<script lang="ts">
-import { Component, Prop, Vue } from "vue-property-decorator";
-
-@Component
-export default class LdVideoViewer extends Vue {
-  @Prop({ required: true }) readonly videoItem!: Gallery.Video;
-
-  get itemResourceUrl(): string {
-    return this.$galleryStore.resourceRoot + this.videoItem.properties.resource;
-  }
-
-  get thumbnailResourceUrl(): string {
-    return this.videoItem.thumbnail ? this.$galleryStore.resourceRoot + this.videoItem.thumbnail.resource : "";
-  }
-}
-</script>
-
-<style lang="scss" module>
-</style>
diff --git a/viewer/src/components/index.ts b/viewer/src/components/index.ts
index 559000e..043087d 100644
--- a/viewer/src/components/index.ts
+++ b/viewer/src/components/index.ts
@@ -21,7 +21,7 @@ import Vue from "vue"
 
 const requireComponent = require.context(
   "@/components",
-  false, // Whether or not to look in subfolders
+  true, // Whether or not to look in subfolders
   // The regular expression used to match base component filenames
   /Ld[A-Z]\w+\.vue$/
 )
diff --git a/viewer/src/components/item_handlers/LdAudioViewer.vue b/viewer/src/components/item_handlers/LdAudioViewer.vue
new file mode 100644
index 0000000..8c8ce2b
--- /dev/null
+++ b/viewer/src/components/item_handlers/LdAudioViewer.vue
@@ -0,0 +1,58 @@
+<!--
+-- ldgallery - A static generator which turns a collection of tagged
+--             pictures into a searchable web gallery.
+--
+-- Copyright (C) 2020  Pacien TRAN-GIRARD
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU Affero General Public License as
+-- published by the Free Software Foundation, either version 3 of the
+-- License, or (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU Affero General Public License for more details.
+--
+-- You should have received a copy of the GNU Affero General Public License
+-- along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<template>
+  <div class="flex-column container-vh-centering">
+    <ld-thumbnail :item="item" />
+    <audio :class="$style.player" :src="itemResourceUrl" preload="auto" controls>
+      <a
+        :download="itemFileName"
+        :href="itemResourceUrl"
+      >{{ $t("download.download-file-fmt", [itemFileName]) }}</a>
+    </audio>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue } from "vue-property-decorator";
+import Navigation from "@/services/navigation";
+
+@Component
+export default class LdAudioViewer extends Vue {
+  @Prop({ required: true }) readonly item!: Gallery.Audio;
+
+  get itemResourceUrl(): string {
+    return this.$galleryStore.resourceRoot + this.item.properties.resource;
+  }
+
+  get itemFileName(): string {
+    return Navigation.getFileName(this.item);
+  }
+}
+</script>
+
+<style lang="scss" module>
+.player {
+  width: 100%;
+  max-width: 500px;
+  margin-top: 1em;
+  text-align: center; // for fallback download link
+}
+</style>
diff --git a/viewer/src/components/item_handlers/LdDirectory.vue b/viewer/src/components/item_handlers/LdDirectory.vue
new file mode 100644
index 0000000..f7fa33f
--- /dev/null
+++ b/viewer/src/components/item_handlers/LdDirectory.vue
@@ -0,0 +1,43 @@
+<!-- ldgallery - A static generator which turns a collection of tagged
+--             pictures into a searchable web gallery.
+--
+-- Copyright (C) 2019-2020  Guillaume FOUET
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU Affero General Public License as
+-- published by the Free Software Foundation, either version 3 of the
+-- License, or (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU Affero General Public License for more details.
+--
+-- You should have received a copy of the GNU Affero General Public License
+-- along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<template>
+  <ld-gallery :items="orderedItems" :noresult="$t('directory.no-results')" />
+</template>
+
+<script lang="ts">
+import { Component, Vue, Prop } from "vue-property-decorator";
+import Navigation from "@/services/navigation";
+
+@Component
+export default class LdDirectory extends Vue {
+  @Prop({ required: true }) readonly item!: Gallery.Directory;
+
+  mounted() {
+    this.$uiStore.toggleFullscreen(false);
+  }
+
+  get orderedItems() {
+    return Navigation.directoriesFirst(this.item.properties.items);
+  }
+}
+</script>
+
+<style lang="scss">
+</style>
diff --git a/viewer/src/components/item_handlers/LdDownload.vue b/viewer/src/components/item_handlers/LdDownload.vue
new file mode 100644
index 0000000..7b09dab
--- /dev/null
+++ b/viewer/src/components/item_handlers/LdDownload.vue
@@ -0,0 +1,57 @@
+<!--
+-- ldgallery - A static generator which turns a collection of tagged
+--             pictures into a searchable web gallery.
+--
+-- Copyright (C) 2020  Pacien TRAN-GIRARD
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU Affero General Public License as
+-- published by the Free Software Foundation, either version 3 of the
+-- License, or (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU Affero General Public License for more details.
+--
+-- You should have received a copy of the GNU Affero General Public License
+-- along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<template>
+  <div class="container-vh-centering">
+    <a :class="$style.content" :download="itemFileName" :href="itemDownloadUrl">
+      <!-- TODO: show thumbnail instead of this generic file download icon? -->
+      <fa-icon :class="$style.icon" icon="file-download" size="6x" />
+      <div>{{ $t("download.download-file-fmt", [itemFileName]) }}</div>
+    </a>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue } from "vue-property-decorator";
+import Navigation from "@/services/navigation";
+
+@Component
+export default class LdDownload extends Vue {
+  @Prop({ required: true }) readonly item!: Gallery.Other;
+
+  get itemFileName(): string {
+    return Navigation.getFileName(this.item);
+  }
+
+  get itemDownloadUrl(): string {
+    return this.$galleryStore.resourceRoot + this.item.properties.resource;
+  }
+}
+</script>
+
+<style lang="scss" module>
+.content {
+  text-align: center;
+}
+
+.icon {
+  margin-bottom: 0.15em;
+}
+</style>
diff --git a/viewer/src/components/item_handlers/LdPdfViewer.vue b/viewer/src/components/item_handlers/LdPdfViewer.vue
new file mode 100644
index 0000000..6471aac
--- /dev/null
+++ b/viewer/src/components/item_handlers/LdPdfViewer.vue
@@ -0,0 +1,46 @@
+<!--
+-- ldgallery - A static generator which turns a collection of tagged
+--             pictures into a searchable web gallery.
+--
+-- Copyright (C) 2020  Pacien TRAN-GIRARD
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU Affero General Public License as
+-- published by the Free Software Foundation, either version 3 of the
+-- License, or (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU Affero General Public License for more details.
+--
+-- You should have received a copy of the GNU Affero General Public License
+-- along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<template>
+  <!-- intermediate container necessary to eliminate the double scrollbar -->
+  <div class="fill no-scroll">
+    <!-- prefer native browser PDF viewer if available -->
+    <object class="fill" :data="itemResourceUrl" type="application/pdf">
+      <!-- TODO: fallback to PDF.js (https://github.com/pacien/ldgallery/issues/212) -->
+      <ld-download :item="item" />
+    </object>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue } from "vue-property-decorator";
+
+@Component
+export default class LdPdfViewer extends Vue {
+  @Prop({ required: true }) readonly item!: Gallery.PDF;
+
+  get itemResourceUrl(): string {
+    return this.$galleryStore.resourceRoot + this.item.properties.resource;
+  }
+}
+</script>
+
+<style lang="scss" module>
+</style>
diff --git a/viewer/src/components/item_handlers/LdPicture.vue b/viewer/src/components/item_handlers/LdPicture.vue
new file mode 100644
index 0000000..3809e4d
--- /dev/null
+++ b/viewer/src/components/item_handlers/LdPicture.vue
@@ -0,0 +1,127 @@
+<!-- ldgallery - A static generator which turns a collection of tagged
+--             pictures into a searchable web gallery.
+--
+-- Copyright (C) 2019-2020  Guillaume FOUET
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU Affero General Public License as
+-- published by the Free Software Foundation, either version 3 of the
+-- License, or (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU Affero General Public License for more details.
+--
+-- You should have received a copy of the GNU Affero General Public License
+-- along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<template>
+  <!-- FIXME: v-dragscroll interferes with pinch-to-zoom -->
+  <div
+    ref="containerElement"
+    v-dragscroll
+    class="scrollbar ld-picture-container"
+    @click.capture="e => dragScrollClickFix.onClickCapture(e)"
+    @dblclick="$uiStore.toggleFullscreen()"
+    @dragstart.prevent
+    @dragscrollstart="dragScrollClickFix.onDragScrollStart()"
+    @dragscrollend="dragScrollClickFix.onDragScrollEnd()"
+  >
+    <v-lazy-image
+      ref="imageElement"
+      :src="pictureSrc(item.properties.resource)"
+      class="ld-picture-element"
+      :class="{'slow-loading': Boolean(slowLoadingStyle)}"
+      :style="slowLoadingStyle"
+      @load="clearSlowLoading"
+    />
+    <b-loading :active="loader" :is-full-page="false" class="ld-picture-loader" />
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Vue, Prop, Ref } from "vue-property-decorator";
+import LdZoom from "@/services/ldzoom";
+import DragScrollClickFix from "@/services/dragscrollclickfix";
+
+@Component
+export default class LdPicture extends Vue {
+  @Prop({ required: true }) readonly item!: Gallery.Picture;
+  @Ref() readonly containerElement!: HTMLDivElement;
+  @Ref() readonly imageElement!: Vue;
+
+  readonly SLOW_LOADING_TIMEOUT_MS: number = 1500;
+  readonly dragScrollClickFix = new DragScrollClickFix();
+
+  slowLoadingStyle: string | null = null;
+  loader: boolean = false;
+  timer: NodeJS.Timeout | null = null;
+
+  mounted() {
+    this.timer = setTimeout(this.generateSlowLoadingStyle, this.SLOW_LOADING_TIMEOUT_MS);
+    new LdZoom(
+      this.containerElement,
+      this.imageElement.$el as HTMLImageElement,
+      this.item.properties,
+      10,
+      1 / 5
+    ).install();
+  }
+
+  destroyed() {
+    this.clearSlowLoading();
+  }
+
+  clearSlowLoading() {
+    if (this.timer) clearTimeout(this.timer);
+    this.timer = null;
+    this.slowLoadingStyle = null;
+    this.loader = false;
+  }
+
+  pictureSrc(resource: string) {
+    return this.$galleryStore.resourceRoot + resource;
+  }
+
+  generateSlowLoadingStyle() {
+    this.clearSlowLoading();
+    this.loader = true;
+    if (this.item.thumbnail) {
+      const url = this.pictureSrc(this.item.thumbnail.resource);
+      this.slowLoadingStyle = `background-image: url('${url}');`;
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+@import "~@/assets/scss/theme.scss";
+
+.ld-picture-container {
+  height: 100%;
+}
+
+.ld-picture-element {
+  max-width: unset;
+  max-height: unset;
+  cursor: grab;
+}
+
+.slow-loading {
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: contain;
+  background-color: $content-bgcolor;
+  background-blend-mode: soft-light;
+  opacity: 1 !important;
+}
+
+.ld-picture-loader {
+  position: relative;
+  & .loading-background {
+    background: none !important;
+  }
+}
+</style>
diff --git a/viewer/src/components/item_handlers/LdPlainTextViewer.vue b/viewer/src/components/item_handlers/LdPlainTextViewer.vue
new file mode 100644
index 0000000..cd26d9d
--- /dev/null
+++ b/viewer/src/components/item_handlers/LdPlainTextViewer.vue
@@ -0,0 +1,55 @@
+<!--
+-- ldgallery - A static generator which turns a collection of tagged
+--             pictures into a searchable web gallery.
+--
+-- Copyright (C) 2020  Pacien TRAN-GIRARD
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU Affero General Public License as
+-- published by the Free Software Foundation, either version 3 of the
+-- License, or (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU Affero General Public License for more details.
+--
+-- You should have received a copy of the GNU Affero General Public License
+-- along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<template>
+  <!-- Outer div necessary for the resize handle to appear on Firefox. -->
+  <div :class="$style.content" class="fill">
+    <!-- Using an iframe here to let the browser deal with content encoding detection. -->
+    <iframe class="fill" :src="itemResourceUrl" />
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue } from "vue-property-decorator";
+
+@Component
+export default class LdPlainTextViewer extends Vue {
+  @Prop({ required: true }) readonly item!: Gallery.PlainText;
+
+  get itemResourceUrl(): string {
+    return this.$galleryStore.resourceRoot + this.item.properties.resource;
+  }
+}
+</script>
+
+<style lang="scss" module>
+.content {
+  margin: auto; // Old-school horizontal centering.
+
+  // Allow the user to adjust the width of the text view for easier column reading.
+  resize: horizontal;
+  max-width: 100%; // Forbid overflow when resizing.
+  overflow: hidden; // Necessary for the resize handle to be shown in Chromium.
+  padding: 0.5em; // Necessary for the resize handle to be selectable on qutebrowser.
+
+  // Re-normalise page colour.
+  background-color: white;
+}
+</style>
diff --git a/viewer/src/components/item_handlers/LdVideoViewer.vue b/viewer/src/components/item_handlers/LdVideoViewer.vue
new file mode 100644
index 0000000..67203a5
--- /dev/null
+++ b/viewer/src/components/item_handlers/LdVideoViewer.vue
@@ -0,0 +1,54 @@
+<!--
+-- ldgallery - A static generator which turns a collection of tagged
+--             pictures into a searchable web gallery.
+--
+-- Copyright (C) 2020  Pacien TRAN-GIRARD
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU Affero General Public License as
+-- published by the Free Software Foundation, either version 3 of the
+-- License, or (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU Affero General Public License for more details.
+--
+-- You should have received a copy of the GNU Affero General Public License
+-- along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<template>
+  <!-- intermediate container necessary to eliminate the scrollbar -->
+  <div class="fill no-scroll">
+    <video
+      class="fill"
+      :src="itemResourceUrl"
+      :poster="thumbnailResourceUrl"
+      preload="auto"
+      controls
+    >
+      <ld-download :item="item" />
+    </video>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue } from "vue-property-decorator";
+
+@Component
+export default class LdVideoViewer extends Vue {
+  @Prop({ required: true }) readonly item!: Gallery.Video;
+
+  get itemResourceUrl(): string {
+    return this.$galleryStore.resourceRoot + this.item.properties.resource;
+  }
+
+  get thumbnailResourceUrl(): string {
+    return this.item.thumbnail ? this.$galleryStore.resourceRoot + this.item.thumbnail.resource : "";
+  }
+}
+</script>
+
+<style lang="scss" module>
+</style>
diff --git a/viewer/src/views/GalleryDirectory.vue b/viewer/src/views/GalleryDirectory.vue
deleted file mode 100644
index bfe484e..0000000
--- a/viewer/src/views/GalleryDirectory.vue
+++ /dev/null
@@ -1,43 +0,0 @@
-<!-- ldgallery - A static generator which turns a collection of tagged
---             pictures into a searchable web gallery.
---
--- Copyright (C) 2019-2020  Guillaume FOUET
---
--- This program is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as
--- published by the Free Software Foundation, either version 3 of the
--- License, or (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
--->
-
-<template>
-  <ld-gallery :items="orderedItems" :noresult="$t('directory.no-results')" />
-</template>
-
-<script lang="ts">
-import { Component, Vue, Prop } from "vue-property-decorator";
-import Navigation from "@/services/navigation";
-
-@Component
-export default class GalleryDirectory extends Vue {
-  @Prop({ required: true }) readonly directory!: Gallery.Directory;
-
-  mounted() {
-    this.$uiStore.toggleFullscreen(false);
-  }
-
-  get orderedItems() {
-    return Navigation.directoriesFirst(this.directory.properties.items);
-  }
-}
-</script>
-
-<style lang="scss">
-</style>
diff --git a/viewer/src/views/GalleryNavigation.vue b/viewer/src/views/GalleryNavigation.vue
index b141d44..843550f 100644
--- a/viewer/src/views/GalleryNavigation.vue
+++ b/viewer/src/views/GalleryNavigation.vue
@@ -18,23 +18,10 @@
 -->
 
 <template>
-  <!-- TODO: eliminate intermediate div -->
   <div>
-    <ld-error v-if="checkType(null)" icon="folder-open" :message="$t('gallery.unknown-resource')" />
-    <gallery-search v-else-if="checkType(ItemType.DIRECTORY) && query.length > 0" :path="path" />
-    <gallery-directory
-      v-else-if="checkType(ItemType.DIRECTORY)"
-      :directory="$galleryStore.currentItem"
-    />
-    <ld-picture v-else-if="checkType(ItemType.PICTURE)" :picture="$galleryStore.currentItem" />
-    <ld-plain-text-viewer
-      v-else-if="checkType(ItemType.PLAINTEXT)"
-      :plain-text-item="$galleryStore.currentItem"
-    />
-    <ld-pdf-viewer v-else-if="checkType(ItemType.PDF)" :pdf-item="$galleryStore.currentItem" />
-    <ld-video-viewer v-else-if="checkType(ItemType.VIDEO)" :video-item="$galleryStore.currentItem" />
-    <ld-audio-viewer v-else-if="checkType(ItemType.AUDIO)" :audio-item="$galleryStore.currentItem" />
-    <ld-download v-else :item="$galleryStore.currentItem" />
+    <ld-error v-if="isError" icon="folder-open" :message="$t('gallery.unknown-resource')" />
+    <gallery-search v-else-if="isSearch" :path="path" />
+    <component :is="componentName" v-else :item="$galleryStore.currentItem" />
   </div>
 </template>
 
@@ -42,12 +29,10 @@
 import { Component, Vue, Prop, Watch } from "vue-property-decorator";
 import { ItemType } from "@/@types/ItemType";
 import Navigation from "@/services/navigation";
-import GalleryDirectory from "./GalleryDirectory.vue";
 import GallerySearch from "@/views/GallerySearch.vue";
 
 @Component({
   components: {
-    GalleryDirectory,
     GallerySearch,
   },
 })
@@ -55,13 +40,32 @@ export default class GalleryNavigation extends Vue {
   @Prop(String) readonly path!: string;
   @Prop(Array) readonly query!: string[];
 
-  // For the template
-  readonly ItemType = Object.freeze(ItemType);
+  readonly COMPONENT_BY_TYPE: Record<ItemType, string> = {
+    directory: "ld-directory",
+    picture: "ld-picture",
+    plaintext: "ld-plain-text-viewer",
+    pdf: "ld-pdf-viewer",
+    video: "ld-video-viewer",
+    audio: "ld-audio-viewer",
+    other: "ld-download",
+  };
 
   mounted() {
     this.pathChanged();
   }
 
+  get isError() {
+    return this.checkType(null);
+  }
+
+  get isSearch() {
+    return this.checkType(ItemType.DIRECTORY) && this.query.length > 0;
+  }
+
+  get componentName() {
+    return this.COMPONENT_BY_TYPE[this.$galleryStore.currentItem?.properties.type ?? ItemType.OTHER];
+  }
+
   @Watch("path")
   pathChanged() {
     this.$galleryStore.setCurrentPath(this.path);
-- 
cgit v1.2.3