Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
beta.ordbok.uib.no
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Margunn.Rauset
beta.ordbok.uib.no
Commits
b642da07
Commit
b642da07
authored
3 years ago
by
Henrik Askjer
Browse files
Options
Downloads
Patches
Plain Diff
Sak 416
parent
2d87c7c1
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/components/Autocomplete.vue
+1
-1
1 addition, 1 deletion
src/components/Autocomplete.vue
src/components/DictionaryView.vue
+9
-10
9 additions, 10 deletions
src/components/DictionaryView.vue
with
10 additions
and
11 deletions
src/components/Autocomplete.vue
+
1
−
1
View file @
b642da07
...
@@ -103,7 +103,7 @@
...
@@ -103,7 +103,7 @@
let
match
=
item
[
0
]
let
match
=
item
[
0
]
let
hit
=
{
q
:
q
,
match
:
match
,
label
:
match
,
time
:
time
}
let
hit
=
{
q
:
q
,
match
:
match
,
label
:
match
,
time
:
time
}
hit
.
article_promise
=
self
.
api
.
get
(
'
articles?
'
,
{
params
:
{
lord
:
match
,
dict
:
self
.
$parent
.
lang
}}
)
hit
.
article_promise
=
self
.
api
.
get
(
'
articles?
'
,
{
params
:
{
lord
:
match
}}
)
hit
.
lang
=
item
[
1
]
hit
.
lang
=
item
[
1
]
hits
.
push
(
hit
)
hits
.
push
(
hit
)
...
...
This diff is collapsed.
Click to expand it.
src/components/DictionaryView.vue
+
9
−
10
View file @
b642da07
...
@@ -219,10 +219,13 @@ export default {
...
@@ -219,10 +219,13 @@ export default {
this
.
$router
.
push
(
source
)
this
.
$router
.
push
(
source
)
let
unwrapped
=
[]
let
unwrapped
=
[]
for
(
const
d
in
event
.
article_ids
)
{
for
(
const
d
in
event
.
article_ids
)
{
event
.
article_ids
[
d
].
forEach
(
i
=>
unwrapped
.
push
({
if
(
d
==
this
.
lang
||
this
.
lang
==
"
bob,nob
"
)
{
dictionary
:
d
,
event
.
article_ids
[
d
].
forEach
(
i
=>
unwrapped
.
push
({
id
:
i
dictionary
:
d
,
}))
id
:
i
}))
}
}
}
let
self
=
this
let
self
=
this
...
@@ -265,9 +268,6 @@ export default {
...
@@ -265,9 +268,6 @@ export default {
error
:
self
.
error
error
:
self
.
error
},
''
)
},
''
)
})
})
}
else
{
}
else
{
this
.
waiting_for_articles
=
true
this
.
waiting_for_articles
=
true
this
.
article
=
null
this
.
article
=
null
...
@@ -282,11 +282,10 @@ export default {
...
@@ -282,11 +282,10 @@ export default {
}
}
},
},
update_lang_form
:
function
(
event
)
{
update_lang_form
:
function
(
event
)
{
if
(
this
.
event
)
{
this
.
lang
=
event
if
(
this
.
event
&&
!
this
.
article
)
{
this
.
event
.
articles
=
null
this
.
event
.
articles
=
null
this
.
select_result
(
this
.
event
)
this
.
select_result
(
this
.
event
)
}
else
{
navigate_to_search
(
this
,
this
.
$router
.
history
.
current
.
params
.
word
||
this
.
$router
.
history
.
current
.
params
.
query
)
}
}
},
},
article_link_click
:
function
(
item
)
{
article_link_click
:
function
(
item
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment