summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorEvgeny Zinoviev <me@ch1p.io>2021-01-04 00:29:54 +0300
committerEvgeny Zinoviev <me@ch1p.io>2021-01-04 00:29:54 +0300
commitf01e27a00b9931b28ff8184751dedbe64db79ea2 (patch)
tree22f030c2787e0435e6d5e2a7b3924145e368baee /app
parentdcc35069100f32f71d9c0dd8e280cea496333ead (diff)
update
Diffstat (limited to 'app')
-rw-r--r--app/static/app.js2
-rw-r--r--app/static/autocomplete.js16
-rw-r--r--app/static/style.css17
-rw-r--r--app/templates/base.html2
4 files changed, 5 insertions, 32 deletions
diff --git a/app/static/app.js b/app/static/app.js
index bc4b89e..faff329 100644
--- a/app/static/app.js
+++ b/app/static/app.js
@@ -141,7 +141,7 @@ class Maps {
let html = `<b>${pharmacyName}</b><br>`;
html += `${pharmacyAddress}<br>`;
html += `тел: ${pharmacyPhone}<br><br>`;
- html += lines.join('\n');
+ html += lines.join('<br>');
mark.properties.set('balloonContent', html);
});
this.map.geoObjects.add(mark);
diff --git a/app/static/autocomplete.js b/app/static/autocomplete.js
index 87b42a5..c336123 100644
--- a/app/static/autocomplete.js
+++ b/app/static/autocomplete.js
@@ -25,10 +25,8 @@ class Autocomplete {
field.addEventListener('click', (e) => {
if (this.createItems() === 0) {
- // prevent show empty
e.stopPropagation();
this.dropdown.hide();
- // field.dropdown('hide');
}
});
@@ -51,13 +49,10 @@ class Autocomplete {
}
renderIfNeeded() {
- if (this.createItems() > 0) {
+ if (this.createItems() > 0)
this.dropdown.show();
- // field.dropdown('show');
- } else {
- // sets up positioning
+ else
this.field.click();
- }
}
createItem(lookup, item) {
@@ -69,9 +64,8 @@ class Autocomplete {
label = item.label.substring(0, idx)
+ `<span class="${className}">${item.label.substring(idx, idx + lookup.length)}</span>`
+ item.label.substring(idx + lookup.length, item.label.length);
- } else {
+ } else
label = item.label;
- }
return ce(`<button type="button" class="dropdown-item" data-value="${item.value}">${label}</button>`);
}
@@ -79,7 +73,6 @@ class Autocomplete {
const lookup = this.field.value;
if (lookup.length < this.options.treshold) {
this.dropdown.hide();
- // field.dropdown('hide');
return 0;
}
@@ -101,12 +94,11 @@ class Autocomplete {
item.addEventListener('click', (e) => {
let dataValue = e.target.getAttribute('data-value');
this.field.value = e.target.innerText;
- if (this.options.onSelectItem) {
+ if (this.options.onSelectItem)
this.options.onSelectItem({
value: e.target.value,
label: e.target.innerText,
});
- }
this.dropdown.hide();
})
});
diff --git a/app/static/style.css b/app/static/style.css
index 303ffdc..e69de29 100644
--- a/app/static/style.css
+++ b/app/static/style.css
@@ -1,17 +0,0 @@
-/*.acme-container {*/
-/* margin-top: 1.5rem;*/
-/*}*/
-
-#test {
- position: absolute;
- color: #fff;
- background-color: red;
- opacity: 0.25;
- top: 0;
- right: 0;
- padding: 5px 8px;
- cursor: pointer;
-}
-#test:hover {
- opacity: 1;
-} \ No newline at end of file
diff --git a/app/templates/base.html b/app/templates/base.html
index aeb42c6..8bc8cc7 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -5,7 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-giJF6kkoqNQ00vy+HMDP7azOuL0xtbfIcaT9wjKHr8RbDVddVHyTfAAsrekwKmP1" crossorigin="anonymous">
- <link rel="stylesheet" href="{{ url_for('static', filename='style.css') }}">
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta1/dist/js/bootstrap.bundle.min.js" integrity="sha384-ygbV9kiqUc6oa4msXn9868pTtWMgiQaeYH7/t7LECLbyPA2x65Kgf80OJFdroafW" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/3.0.4/socket.io.js" integrity="sha512-aMGMvNYu8Ue4G+fHa359jcPb1u+ytAF+P2SCb+PxrjCdO3n3ZTxJ30zuH39rimUggmTwmh2u7wvQsDTHESnmfQ==" crossorigin="anonymous"></script>
@@ -34,6 +33,5 @@
</div>
</div>
</div>
- <div id="test">test</div>
</body>
</html> \ No newline at end of file