From: Adam Dullage <redacted>
Date: Mon, 26 Sep 2022 19:43:16 +0000 (+0100)
Subject: Allow CTRL-Click on more links
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=5cc1254b1f7b2f0fcf4874b7d1bc90e30503931d;p=flatnotes.git

Allow CTRL-Click on more links
---

diff --git a/flatnotes/src/components/App.js b/flatnotes/src/components/App.js
index a3f3d17..0553ed9 100644
--- a/flatnotes/src/components/App.js
+++ b/flatnotes/src/components/App.js
@@ -105,18 +105,6 @@ export default {
       this.navigate(constants.basePaths.login);
     },
 
-    newNote: function() {
-      this.navigate(constants.basePaths.new);
-    },
-
-    az: function() {
-      let params = new URLSearchParams();
-      params.set(constants.params.searchTerm, "*");
-      params.set(constants.params.sortBy, constants.searchSortOptions.title);
-      params.set(constants.params.showHighlights, false);
-      this.navigate(`${constants.basePaths.search}?${params.toString()}`);
-    },
-
     noteDeletedToast: function() {
       this.$bvToast.toast("Note deleted ✓", {
         variant: "success",
diff --git a/flatnotes/src/components/App.vue b/flatnotes/src/components/App.vue
index d6dec1d..25654a0 100644
--- a/flatnotes/src/components/App.vue
+++ b/flatnotes/src/components/App.vue
@@ -12,9 +12,6 @@
       v-if="currentView != views.login"
       class="w-100 mb-5"
       :show-logo="currentView != views.home"
-      @navigate-home="navigate(constants.basePaths.home)"
-      @new-note="newNote()"
-      @a-z="az()"
       @logout="logout()"
       @search="openSearch()"
     ></NavBar>
diff --git a/flatnotes/src/components/NavBar.vue b/flatnotes/src/components/NavBar.vue
index 4092d8f..1d3186f 100644
--- a/flatnotes/src/components/NavBar.vue
+++ b/flatnotes/src/components/NavBar.vue
@@ -1,19 +1,26 @@
 <template>
   <div class="d-flex justify-content-between align-items-center">
     <!-- Logo -->
-    <Logo
-      class="cursor-pointer"
-      :class="{ invisible: !showLogo }"
-      @click.native="$emit('navigate-home')"
-      responsive
-    ></Logo>
+    <a
+      :href="constants.basePaths.home"
+      @click.prevent="navigate(constants.basePaths.home, $event)"
+    >
+      <Logo
+        :class="{ invisible: !showLogo }"
+        responsive
+      ></Logo>
+    </a>
 
     <!-- Buttons -->
-    <div>
+    <div class="d-flex">
       <!-- New Note -->
-      <button type="button" class="bttn" @click="$emit('new-note')">
+      <a
+        :href="constants.basePaths.new"
+        class="bttn"
+        @click.prevent="navigate(constants.basePaths.new, $event)"
+      >
         <b-icon icon="plus-circle"></b-icon> New
-      </button>
+      </a>
 
       <!-- Log Out -->
       <button type="button" class="bttn" @click="$emit('logout')">
@@ -21,7 +28,9 @@
       </button>
 
       <!-- A-Z -->
-      <button type="button" class="bttn" @click="$emit('a-z')">A-Z</button>
+      <a :href="azHref" class="bttn" @click.prevent="navigate(azHref, $event)"
+        >A-Z</a
+      >
 
       <!-- Search -->
       <button
@@ -43,13 +52,12 @@
 .invisible {
   visibility: hidden;
 }
-
-.cursor-pointer {
-  cursor: pointer;
-}
 </style>
 
 <script>
+import * as constants from "../constants";
+
+import EventBus from "../eventBus";
 import Logo from "./Logo";
 
 export default {
@@ -63,5 +71,25 @@ export default {
       default: true,
     },
   },
+
+  computed: {
+    azHref: function () {
+      let params = new URLSearchParams();
+      params.set(constants.params.searchTerm, "*");
+      params.set(constants.params.sortBy, constants.searchSortOptions.title);
+      params.set(constants.params.showHighlights, false);
+      return `${constants.basePaths.search}?${params.toString()}`;
+    },
+  },
+
+  methods: {
+    navigate: function (href, event) {
+      EventBus.$emit("navigate", href, event);
+    },
+  },
+
+  created: function () {
+    this.constants = constants;
+  },
 };
 </script>
diff --git a/flatnotes/src/components/SearchResults.vue b/flatnotes/src/components/SearchResults.vue
index 49fc104..2af9feb 100644
--- a/flatnotes/src/components/SearchResults.vue
+++ b/flatnotes/src/components/SearchResults.vue
@@ -54,7 +54,7 @@
           class="bttn result"
           :class="{ 'mb-3': searchResultsIncludeHighlights && showHighlights }"
         >
-          <a :href="result.href" @click.prevent="openNote(result.href)">
+          <a :href="result.href" @click.prevent="openNote(result.href, $event)">
             <div class="d-flex justify-content-between">
               <p
                 class="result-title"
@@ -308,8 +308,8 @@ export default {
       return notesGroupedArray;
     },
 
-    openNote: function (href) {
-      EventBus.$emit("navigate", href);
+    openNote: function (href, event) {
+      EventBus.$emit("navigate", href, event);
     },
 
     sortOptionToString: function (sortOption) {
diff --git a/flatnotes/src/global.scss b/flatnotes/src/global.scss
index c61d84a..17f4fbf 100644
--- a/flatnotes/src/global.scss
+++ b/flatnotes/src/global.scss
@@ -45,4 +45,5 @@ a {
 .bttn:hover {
   background-color: $button-background;
   cursor: pointer;
+  color: inherit;
 }