From 6cda3a79ea2e764341ecca5d798f7ee307bd2168 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20Volds=C3=A6ter?= <ole.voldsater@uib.no>
Date: Mon, 23 Mar 2020 10:38:07 +0100
Subject: [PATCH] viser norsk ordbok

---
 src/App.vue                      | 3 +++
 src/components/Preview.vue       | 8 +++++++-
 src/components/SearchResults.vue | 8 ++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index 39725444..4d39a168 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -14,6 +14,9 @@
       <label for="radio_nob">Bokmål</label>
       <input type="radio" id="radio_nno" value="nno" v-model="lang">
       <label for="radio_nno">Nynorsk</label>
+      |||
+      <input type="radio" id="radio_norsk" value="norsk_ordbok" v-model="lang">
+      <label for="radio_norsk">Norsk Ordbok</label>
     </header>
     <img id="spinner" :class="waiting ? 'show' : 'hide'" src="./assets/spinner.gif" alt="Venter på innhold" />
     <SearchResults :hits="search_results" :lang="lang" @search-hit-click="search_hit_click" />
diff --git a/src/components/Preview.vue b/src/components/Preview.vue
index b77dbdca..d33c97d8 100644
--- a/src/components/Preview.vue
+++ b/src/components/Preview.vue
@@ -13,6 +13,12 @@ import entities from '../utils/entities.js'
 import languages from '../utils/languages.js'
 import helpers from '../utils/helpers.js'
 
+let labels = {
+  'nob': 'Bokmål',
+  'nno': 'Nynorsk',
+  'norsk_ordbok': 'Norsk Ordbok'
+}
+
 export default {
   name: 'Preview',
   props: {
@@ -20,7 +26,7 @@ export default {
   },
   computed: {
     previewHeader: function(){
-      return this.searchHit.text && this.searchHit.text + " (" + (this.searchHit._index == "nob" ? "bokmål" : "nynorsk") + ")" ||
+      return this.searchHit.text && this.searchHit.text + " (" + labels[this.searchHit._index] + ")" ||
             (this.searchHit._source && this.searchHit._source.lemmas.map(l => `<span class="homograph">${l.hgno ?  String.fromCharCode(0x215f + l.hgno) + ' ' : ''}</span>${l.lemma}`) || []).join(',') ||
             "Alle søkeresultater..."
     },
diff --git a/src/components/SearchResults.vue b/src/components/SearchResults.vue
index 4bc99337..38c8868c 100644
--- a/src/components/SearchResults.vue
+++ b/src/components/SearchResults.vue
@@ -12,6 +12,11 @@
         <Preview v-for="(result, index) in results_nno" :key="index" :searchHit="result" @click.native="article_link_click(result)">
         </Preview>
       </ul>
+      <ul class="hits" v-if="results_norsk.length">
+        <li><h4>Norsk Ordbok</h4></li>
+        <Preview v-for="(result, index) in results_norsk" :key="index" :searchHit="result" @click.native="article_link_click(result)">
+        </Preview>
+      </ul>
     </div>
   </section>
 </template>
@@ -32,6 +37,9 @@ export default {
     },
     results_nno: function(){
       return this.hits.filter(hit => hit._index == 'nno')
+    },
+    results_norsk: function(){
+      return this.hits.filter(hit => hit._index == 'norsk_ordbok')
     }
   },
   methods: {
-- 
GitLab