diff --git a/src/components/DictionaryView.vue b/src/components/DictionaryView.vue index d90b3172179ef088947620d29398b09392e9b739..0975980eb7a57aad2fbd7021f94689da417ca7c1 100644 --- a/src/components/DictionaryView.vue +++ b/src/components/DictionaryView.vue @@ -11,10 +11,10 @@ <p v-if="inflection_suggestions && inflection_suggestions.length"><v-icon left color="primary">info</v-icon><em>{{$route.query.q}}</em> er en bøyd form av <span v-for="(item,index) in inflection_suggestions" :key="index"><router-link :to="generate_path(item[0])" @click.native="suggestion_link(item[0])">{{item[0]}}</router-link>{{index == inflection_suggestions.length-1? '.' : ', '}}</span> </p> - <p v-if="lang=='bm,nn' && similar[0] && (similar[0][1] == 2)"><v-icon left color="primary">info</v-icon>Lignende treff i Nynorskordboka: + <p v-if="lang=='bm,nn' && similar && similar.length > 0 && (search_results.nn && search_results.nn.length == 0)"><v-icon left color="primary">info</v-icon>Legg til lignende treff fra Nynorskordboka: <span v-for="(item,index) in similar" :key="index"><router-link :to="generate_path($route.query.q+'|'+item[0])" @click.native="suggestion_link($route.query.q+'|'+item[0])">{{item[0]}}</router-link>{{index == similar.length-1? '.' : ', '}}</span> </p> - <p v-if="lang=='bm,nn' && similar[0] && (similar[0][1] == 1)"><v-icon left color="primary">info</v-icon>Lignende treff i Bokmålsordboka: + <p v-if="lang=='bm,nn' && similar && similar.length > 0 && (search_results.bm && search_results.bm.length == 0)"><v-icon left color="primary">info</v-icon>Legg til lignende treff fra Bokmålsordboka: <span v-for="(item,index) in similar" :key="index"><router-link :to="generate_path($route.query.q+'|'+item[0])" @click.native="suggestion_link($route.query.q+'|'+item[0])">{{item[0]}}</router-link>{{index == similar.length-1? '.' : ', '}}</span> </p> </div> @@ -207,9 +207,13 @@ function navigate_to_query(self, word) { let bm_length = response.data.articles.bm ? response.data.articles.bm.length : 0 let nn_length = response.data.articles.nn ? response.data.articles.nn.length : 0 - - if (bm_length== 0 || nn_length == 0 && bm_length != nn_length) { - self.similar = (self.event && query.similar) || [] + + if (self.lang == 'bm,nn' && (bm_length == 0 || nn_length == 0)) { + let missing_lang = bm_length == 0? 1 : 2 + let similar = (self.event && query.similar) || [] + self.similar = similar.filter((item, index) => { + return item[1] == missing_lang || item[1] == 3 + }) } else { self.similar = [] @@ -217,9 +221,7 @@ function navigate_to_query(self, word) { if (bm_length + nn_length == 0) { - - // - + self.similar = (self.event && query.similar) || [] self.waiting_for_articles = false self.no_results = true self.replace_history() // fixes routing bug when going back from suggested search