Commit f73c3b19 authored by Aria Givi's avatar Aria Givi
Browse files

Fixed: Mergefehler in js-file

parent fda55a2c
...@@ -380,7 +380,7 @@ function getFocusInUrl () { ...@@ -380,7 +380,7 @@ function getFocusInUrl () {
function toggleOptionsDialog() { function toggleOptionsDialog() {
var btnMode = $('.toggleOptBtn').attr('data-mode'); var btnMode = $('.toggleOptBtn').attr('data-mode');
if (btnMode == "open") { if (btnMode == 'open') {
$('.toggleOptBtn').attr('data-mode', 'close'); $('.toggleOptBtn').attr('data-mode', 'close');
$('.toggleOptBtn').html('<i class="fa fa-chevron-up" aria-hidden="true"></i>'); $('.toggleOptBtn').html('<i class="fa fa-chevron-up" aria-hidden="true"></i>');
} else { } else {
...@@ -389,6 +389,7 @@ function toggleOptionsDialog() { ...@@ -389,6 +389,7 @@ function toggleOptionsDialog() {
} }
} }
function checkboxCheckListener (event) { function checkboxCheckListener (event) {
toggleDeleteButton(); toggleDeleteButton();
var elem = event.target; var elem = event.target;
......
...@@ -24,7 +24,7 @@ function setSearchbarActionListeners () { ...@@ -24,7 +24,7 @@ function setSearchbarActionListeners () {
$('#editFocusBtn').click(editCurrentFocus); $('#editFocusBtn').click(editCurrentFocus);
$('.save-focus-btn').click(saveFocus); $('.save-focus-btn').click(saveFocus);
$('.delete-focus-btn').click(deleteFocus); $('.delete-focus-btn').click(deleteFocus);
$('.search-focus-selector').click(showOptionsDialog); $('.search-focus-selector').click(toggleOptionsDialog);
$('#focus-select').change(focusChanged); $('#focus-select').change(focusChanged);
// Save Focus on clicking enter while in the focus name input // Save Focus on clicking enter while in the focus name input
$('#focus-name').keyup(function (event) { $('#focus-name').keyup(function (event) {
...@@ -378,10 +378,18 @@ function getFocusInUrl () { ...@@ -378,10 +378,18 @@ function getFocusInUrl () {
} }
} }
function showOptionsDialog() { function toggleOptionsDialog() {
$('.search-focus-selector:after').css('content', '"\f077"'); 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) { function checkboxCheckListener (event) {
toggleDeleteButton(); toggleDeleteButton();
var elem = event.target; var elem = event.target;
......
...@@ -9,6 +9,12 @@ ...@@ -9,6 +9,12 @@
border-radius: 5px 0px 0px 5px; border-radius: 5px 0px 0px 5px;
display: flex; display: flex;
align-items: center; align-items: center;
&>button {
border: none;
margin: 5px;
}
select { select {
width: 100%; width: 100%;
color: #777; color: #777;
...@@ -97,12 +103,6 @@ ...@@ -97,12 +103,6 @@
} }
} }
.toggleOptBtn {
border: none;
background-color: white;
}
.search-focus-selector { .search-focus-selector {
background-color: white; background-color: white;
position: relative; position: relative;
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<form id="searchForm" method={{ $request }} action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/meta/meta.ger3 ") }}" accept-charset="UTF-8"> <form id="searchForm" method={{ $request }} action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/meta/meta.ger3 ") }}" accept-charset="UTF-8">
<div class="searchbar {{$class or ''}}"> <div class="searchbar {{$class or ''}}">
<div class="search-focus-selector"> <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> <i class="fa fa-chevron-down"></i>
</button> </button>
<div class="search-option-frame" style="display:none;"> <div class="search-option-frame" style="display:none;">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment