Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
open-source
MetaGer
Commits
f73c3b19
Commit
f73c3b19
authored
Nov 27, 2017
by
Aria Givi
Browse files
Fixed: Mergefehler in js-file
parent
fda55a2c
Changes
4
Hide whitespace changes
Inline
Side-by-side
public/js/searchbar.js
View file @
f73c3b19
...
...
@@ -380,7 +380,7 @@ function getFocusInUrl () {
function
toggleOptionsDialog
()
{
var
btnMode
=
$
(
'
.toggleOptBtn
'
).
attr
(
'
data-mode
'
);
if
(
btnMode
==
"
open
"
)
{
if
(
btnMode
==
'
open
'
)
{
$
(
'
.toggleOptBtn
'
).
attr
(
'
data-mode
'
,
'
close
'
);
$
(
'
.toggleOptBtn
'
).
html
(
'
<i class="fa fa-chevron-up" aria-hidden="true"></i>
'
);
}
else
{
...
...
@@ -389,6 +389,7 @@ function toggleOptionsDialog() {
}
}
function
checkboxCheckListener
(
event
)
{
toggleDeleteButton
();
var
elem
=
event
.
target
;
...
...
resources/assets/js/searchbar.js
View file @
f73c3b19
...
...
@@ -24,7 +24,7 @@ function setSearchbarActionListeners () {
$
(
'
#editFocusBtn
'
).
click
(
editCurrentFocus
);
$
(
'
.save-focus-btn
'
).
click
(
saveFocus
);
$
(
'
.delete-focus-btn
'
).
click
(
deleteFocus
);
$
(
'
.search-focus-selector
'
).
click
(
show
OptionsDialog
);
$
(
'
.search-focus-selector
'
).
click
(
toggle
OptionsDialog
);
$
(
'
#focus-select
'
).
change
(
focusChanged
);
// Save Focus on clicking enter while in the focus name input
$
(
'
#focus-name
'
).
keyup
(
function
(
event
)
{
...
...
@@ -378,10 +378,18 @@ function getFocusInUrl () {
}
}
function
showOptionsDialog
()
{
$
(
'
.search-focus-selector:after
'
).
css
(
'
content
'
,
'
"
\
f077"
'
);
function
toggleOptionsDialog
()
{
var
btnMode
=
$
(
'
.toggleOptBtn
'
).
attr
(
'
data-mode
'
);
if
(
btnMode
==
'
open
'
)
{
$
(
'
.toggleOptBtn
'
).
attr
(
'
data-mode
'
,
'
close
'
);
$
(
'
.toggleOptBtn
'
).
html
(
'
<i class="fa fa-chevron-up" aria-hidden="true"></i>
'
);
}
else
{
$
(
'
.toggleOptBtn
'
).
attr
(
'
data-mode
'
,
'
open
'
);
$
(
'
.toggleOptBtn
'
).
html
(
'
<i class="fa fa-chevron-down" aria-hidden="true"></i>
'
);
}
}
function
checkboxCheckListener
(
event
)
{
toggleDeleteButton
();
var
elem
=
event
.
target
;
...
...
resources/assets/less/metager/searchbar.less
View file @
f73c3b19
...
...
@@ -9,6 +9,12 @@
border-radius: 5px 0px 0px 5px;
display: flex;
align-items: center;
&>button {
border: none;
margin: 5px;
}
select {
width: 100%;
color: #777;
...
...
@@ -97,12 +103,6 @@
}
}
.toggleOptBtn {
border: none;
background-color: white;
}
.search-focus-selector {
background-color: white;
position: relative;
...
...
resources/views/parts/searchbar.blade.php
View file @
f73c3b19
...
...
@@ -4,7 +4,7 @@
<
form
id
=
"searchForm"
method
=
{{
$request
}}
action
=
"{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "
/
meta
/
meta
.
ger3
") }}"
accept
-
charset
=
"UTF-8"
>
<
div
class
=
"searchbar {{$class or ''}}"
>
<
div
class
=
"search-focus-selector"
>
<
button
type
=
"button"
data
-
mode
=
"open"
>
<
button
type
=
"button"
class
=
"toggleOptBtn"
data
-
mode
=
"open"
>
<
i
class
=
"fa fa-chevron-down"
></
i
>
</
button
>
<
div
class
=
"search-option-frame"
style
=
"display:none;"
>
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment