Add options to hide excerpt go-shiori#166

g7ndi · Sep 24, 2019 · a82b882 · a82b882
1 parent c77b17c
commit a82b882
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 17 deletions.
diff --git a/internal/view/index.html b/internal/view/index.html
@@ -113,6 +113,7 @@
                         showId = (typeof opts.showId === "boolean") ? opts.showId : false,
                         listMode = (typeof opts.listMode === "boolean") ? opts.listMode : false,
                         hideThumbnail = (typeof opts.hideThumbnail === "boolean") ? opts.hideThumbnail : false,
+                        hideExcerpt = (typeof opts.hideExcerpt === "boolean") ? opts.hideExcerpt : false,
                         nightMode = (typeof opts.nightMode === "boolean") ? opts.nightMode : false,
                         keepMetadata = (typeof opts.keepMetadata === "boolean") ? opts.keepMetadata : false,
                         useArchive = (typeof opts.useArchive === "boolean") ? opts.useArchive : false,
@@ -122,6 +123,7 @@
                         showId: showId,
                         listMode: listMode,
                         hideThumbnail: hideThumbnail,
+                        hideExcerpt: hideExcerpt,
                         nightMode: nightMode,
                         keepMetadata: keepMetadata,
                         useArchive: useArchive,

diff --git a/internal/view/js/component/bookmark.js b/internal/view/js/component/bookmark.js
@@ -5,13 +5,13 @@ var template = `
         @click="selectBookmark">
     </a>
     <a class="bookmark-link" :href="mainURL" target="_blank" rel="noopener">
-        <span class="thumbnail" v-if="imageURL && !hideThumbnail" :style="thumbnailStyleURL"></span>
+        <span class="thumbnail" v-if="thumbnailVisible" :style="thumbnailStyleURL"></span>
         <p class="title">{{title}}
             <i v-if="hasContent" class="fas fa-file-alt"></i>
             <i v-if="hasArchive" class="fas fa-archive"></i>
             <i v-if="public" class="fas fa-eye"></i>
         </p>
-        <p class="excerpt" v-if="(!imageURL || hideThumbnail) && excerpt">{{excerpt}}</p>
+        <p class="excerpt" v-if="excerptVisible">{{excerpt}}</p>
         <p class="id" v-show="showId">{{id}}</p>
     </a>
     <div class="bookmark-tags" v-if="tags.length > 0">
@@ -52,6 +52,7 @@ export default {
         editMode: Boolean,
         listMode: Boolean,
         hideThumbnail: Boolean,
+        hideExcerpt: Boolean,
         selected: Boolean,
         menuVisible: Boolean,
         tags: {
@@ -71,6 +72,15 @@ export default {
             var url = new URL(this.url);
             return url.hostname.replace(/^www\./, "");
         },
+        thumbnailVisible() {
+            return this.imageURL !== "" &&
+                !this.hideThumbnail;
+        },
+        excerptVisible() {
+            return this.excerpt !== "" &&
+                !this.thumbnailVisible &&
+                !this.hideExcerpt;
+        },
         thumbnailStyleURL() {
             return {
                 backgroundImage: `url("${this.imageURL}")`

diff --git a/internal/view/js/page/base.js b/internal/view/js/page/base.js
@@ -18,6 +18,7 @@ export default {
                     listMode: false,
                     nightMode: false,
                     hideThumbnail: false,
+                    hideExcerpt: false,
 
                     keepMetadata: false,
                     useArchive: false,

diff --git a/internal/view/js/page/home.js b/internal/view/js/page/home.js
@@ -54,6 +54,7 @@ var template = `
             :showId="appOptions.showId"
             :listMode="appOptions.listMode"
             :hideThumbnail="appOptions.hideThumbnail"
+            :hideExcerpt="appOptions.hideExcerpt"
             :selected="isSelected(book.id)"
             :menuVisible="activeAccount.owner"
             @select="toggleSelection"

diff --git a/internal/view/js/page/setting.js b/internal/view/js/page/setting.js
@@ -16,6 +16,10 @@ var template = `
                 <input type="checkbox" v-model="appOptions.hideThumbnail" @change="saveSetting">
                 Hide thumbnail image
             </label>
+            <label>
+                <input type="checkbox" v-model="appOptions.hideExcerpt" @change="saveSetting">
+                Hide bookmark's excerpt
+            </label>
             <label>
                 <input type="checkbox" v-model="appOptions.nightMode" @change="saveSetting">
                 Use dark theme
@@ -83,6 +87,7 @@ export default {
                 showId: this.appOptions.showId,
                 listMode: this.appOptions.listMode,
                 hideThumbnail: this.appOptions.hideThumbnail,
+                hideExcerpt: this.appOptions.hideExcerpt,
                 nightMode: this.appOptions.nightMode,
                 keepMetadata: this.appOptions.keepMetadata,
                 useArchive: this.appOptions.useArchive,