diff --git a/src/components/DictionaryView.vue b/src/components/DictionaryView.vue index 755d94bd867c2fbcde62522bc155381592883e66..0aef469db0239f4f49a9020a6c375db7a56d4a33 100644 --- a/src/components/DictionaryView.vue +++ b/src/components/DictionaryView.vue @@ -7,8 +7,16 @@ </div> <div id="above_results" v-if="$route.name"> - <div id="suggestions" v-if="!article && !no_results && inflection_suggestions && inflection_suggestions.length"><v-icon left color="primary">info</v-icon><em>{{$route.query.q}}</em> er en bøyd form av + <div id="suggestions" v-if="!article && !no_results"> + <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: + <span v-for="(item,index) in similar" :key="index"><router-link :to="generate_path(item[0])" @click.native="suggestion_link(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: + <span v-for="(item,index) in similar" :key="index"><router-link :to="generate_path(item[0])" @click.native="suggestion_link(item[0])">{{item[0]}}</router-link>{{index == similar.length-1? '.' : ', '}}</span> + </p> </div> <div class="return_to_results" v-if="article"> @@ -197,13 +205,21 @@ function navigate_to_query(self, word) { self.article_info = response.data self.search_results = {} - let total = response.data.articles.bm ? response.data.articles.bm.length : 0 - total += response.data.articles.nn ? response.data.articles.nn.length : 0 + 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) || [] + } + else { + self.similar = [] + } + - if (total == 0) { + 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