Skip to content
Snippets Groups Projects
Commit 8cb9bc0f authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Nachricht eingefügt, wenn keine Ergebnisse gefunden wurden.

parent 753cc04d
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 205 additions and 23 deletions
public/build/js/findRoute-af66afdfbb.js → public/build/js/findRoute-2220bb5360.js
+ 28
− 2
View file @ 8cb9bc0f
......@@ -1662,7 +1662,10 @@ $(document).ready(function(){
}
 
$("#search input[name=q]").on("keydown", function(event) {
if (event.which == 13) $("#doSearch").click();
if (event.which == 13){
$("#search-addon input[name=q]").blur();
$("#doSearch").click();
}
});
 
......@@ -1756,6 +1759,12 @@ function executeSearch(){
 
var url = '/' + encodeURI(q) + '/' + encodeURI(extent[0]) + '/' + encodeURI(extent[1]) + '/' + encodeURI(extent[2]) + '/' + encodeURI(extent[3]);
// Before we go on -> let's remove the current results
searchResults = undefined;
clearPOIS();
$("#clear-search").remove();
var markers = [];
var xhr = $.getScript(url)
.fail(function(jqxhr, settings, exception) {
console.log(exception);
......@@ -1771,14 +1780,30 @@ function executeSearch(){
$("#search-addon #doSearch").removeClass("hidden");
$("#search-addon #clear-search").removeClass("hidden");
$("#search-addon input[name=q]").attr("readonly", false);
if(typeof searchResults === "undefined" || searchResults.length <= 0){
console.log("keine Ergebnisse");
makeError($("#search-addon input[name=q]"), "Keine Ergebnisse gefunden :(");
}
});
$("#cancel-search").click(function(){
xhr.abort();
});
});
}
 
function makeError(element, message){
$(element).css("border", "3px solid red");
$(element).tooltip({
placement: 'auto',
title: message
}).tooltip('show');
setTimeout(function(){
$(element).css("border", "");
$(element).tooltip('destroy');
}, 5000);
}
function updateUrl(){
 
if(typeof map.getView().getZoom() === "undefined"){
......@@ -1906,6 +1931,7 @@ function getNearest(lon, lat) {
}
 
function deinitResults() {
searchResults = undefined;
toggleResults("in");
$("#results").html("");
$("#result-toggler").addClass("hidden");
......
public/build/js/findRoute.js.map
+ 1
− 1
View file @ 8cb9bc0f
This diff is collapsed.
public/build/js/mapSearch-45bfc7f759.js → public/build/js/mapSearch-f78e56a76d.js
+ 28
− 2
View file @ 8cb9bc0f
......@@ -1644,7 +1644,10 @@ $(document).ready(function(){
}
 
$("#search input[name=q]").on("keydown", function(event) {
if (event.which == 13) $("#doSearch").click();
if (event.which == 13){
$("#search-addon input[name=q]").blur();
$("#doSearch").click();
}
});
 
......@@ -1738,6 +1741,12 @@ function executeSearch(){
 
var url = '/' + encodeURI(q) + '/' + encodeURI(extent[0]) + '/' + encodeURI(extent[1]) + '/' + encodeURI(extent[2]) + '/' + encodeURI(extent[3]);
// Before we go on -> let's remove the current results
searchResults = undefined;
clearPOIS();
$("#clear-search").remove();
var markers = [];
var xhr = $.getScript(url)
.fail(function(jqxhr, settings, exception) {
console.log(exception);
......@@ -1753,14 +1762,30 @@ function executeSearch(){
$("#search-addon #doSearch").removeClass("hidden");
$("#search-addon #clear-search").removeClass("hidden");
$("#search-addon input[name=q]").attr("readonly", false);
if(typeof searchResults === "undefined" || searchResults.length <= 0){
console.log("keine Ergebnisse");
makeError($("#search-addon input[name=q]"), "Keine Ergebnisse gefunden :(");
}
});
$("#cancel-search").click(function(){
xhr.abort();
});
});
}
 
function makeError(element, message){
$(element).css("border", "3px solid red");
$(element).tooltip({
placement: 'auto',
title: message
}).tooltip('show');
setTimeout(function(){
$(element).css("border", "");
$(element).tooltip('destroy');
}, 5000);
}
function updateUrl(){
 
if(typeof map.getView().getZoom() === "undefined"){
......@@ -1888,6 +1913,7 @@ function getNearest(lon, lat) {
}
 
function deinitResults() {
searchResults = undefined;
toggleResults("in");
$("#results").html("");
$("#result-toggler").addClass("hidden");
......
public/build/js/mapSearch.js.map
+ 1
− 1
View file @ 8cb9bc0f
This diff is collapsed.
public/build/js/routing-78f664e73c.js → public/build/js/routing-23961e2a8a.js
+ 28
− 2
View file @ 8cb9bc0f
......@@ -1644,7 +1644,10 @@ $(document).ready(function(){
}
 
$("#search input[name=q]").on("keydown", function(event) {
if (event.which == 13) $("#doSearch").click();
if (event.which == 13){
$("#search-addon input[name=q]").blur();
$("#doSearch").click();
}
});
 
......@@ -1738,6 +1741,12 @@ function executeSearch(){
 
var url = '/' + encodeURI(q) + '/' + encodeURI(extent[0]) + '/' + encodeURI(extent[1]) + '/' + encodeURI(extent[2]) + '/' + encodeURI(extent[3]);
// Before we go on -> let's remove the current results
searchResults = undefined;
clearPOIS();
$("#clear-search").remove();
var markers = [];
var xhr = $.getScript(url)
.fail(function(jqxhr, settings, exception) {
console.log(exception);
......@@ -1753,14 +1762,30 @@ function executeSearch(){
$("#search-addon #doSearch").removeClass("hidden");
$("#search-addon #clear-search").removeClass("hidden");
$("#search-addon input[name=q]").attr("readonly", false);
if(typeof searchResults === "undefined" || searchResults.length <= 0){
console.log("keine Ergebnisse");
makeError($("#search-addon input[name=q]"), "Keine Ergebnisse gefunden :(");
}
});
$("#cancel-search").click(function(){
xhr.abort();
});
});
}
 
function makeError(element, message){
$(element).css("border", "3px solid red");
$(element).tooltip({
placement: 'auto',
title: message
}).tooltip('show');
setTimeout(function(){
$(element).css("border", "");
$(element).tooltip('destroy');
}, 5000);
}
function updateUrl(){
 
if(typeof map.getView().getZoom() === "undefined"){
......@@ -1888,6 +1913,7 @@ function getNearest(lon, lat) {
}
 
function deinitResults() {
searchResults = undefined;
toggleResults("in");
$("#results").html("");
$("#result-toggler").addClass("hidden");
......
public/build/js/routing.js.map
+ 1
− 1
View file @ 8cb9bc0f
This diff is collapsed.
public/build/rev-manifest.json
+ 3
− 3
View file @ 8cb9bc0f
......@@ -3,8 +3,8 @@
"css/mapSearch.css": "css/mapSearch-683446cb27.css",
"css/routing.css": "css/routing-1cc8841d77.css",
"css/staticPages.css": "css/staticPages-ab3db4d195.css",
"js/findRoute.js": "js/findRoute-af66afdfbb.js",
"js/findRoute.js": "js/findRoute-2220bb5360.js",
"js/iframeSearch.js": "js/iframeSearch-b031528ebf.js",
"js/mapSearch.js": "js/mapSearch-45bfc7f759.js",
"js/routing.js": "js/routing-78f664e73c.js"
"js/mapSearch.js": "js/mapSearch-f78e56a76d.js",
"js/routing.js": "js/routing-23961e2a8a.js"
}
\ No newline at end of file
public/js/findRoute.js
+ 28
− 2
View file @ 8cb9bc0f
......@@ -1662,7 +1662,10 @@ $(document).ready(function(){
}
 
$("#search input[name=q]").on("keydown", function(event) {
if (event.which == 13) $("#doSearch").click();
if (event.which == 13){
$("#search-addon input[name=q]").blur();
$("#doSearch").click();
}
});
 
......@@ -1756,6 +1759,12 @@ function executeSearch(){
 
var url = '/' + encodeURI(q) + '/' + encodeURI(extent[0]) + '/' + encodeURI(extent[1]) + '/' + encodeURI(extent[2]) + '/' + encodeURI(extent[3]);
// Before we go on -> let's remove the current results
searchResults = undefined;
clearPOIS();
$("#clear-search").remove();
var markers = [];
var xhr = $.getScript(url)
.fail(function(jqxhr, settings, exception) {
console.log(exception);
......@@ -1771,14 +1780,30 @@ function executeSearch(){
$("#search-addon #doSearch").removeClass("hidden");
$("#search-addon #clear-search").removeClass("hidden");
$("#search-addon input[name=q]").attr("readonly", false);
if(typeof searchResults === "undefined" || searchResults.length <= 0){
console.log("keine Ergebnisse");
makeError($("#search-addon input[name=q]"), "Keine Ergebnisse gefunden :(");
}
});
$("#cancel-search").click(function(){
xhr.abort();
});
});
}
 
function makeError(element, message){
$(element).css("border", "3px solid red");
$(element).tooltip({
placement: 'auto',
title: message
}).tooltip('show');
setTimeout(function(){
$(element).css("border", "");
$(element).tooltip('destroy');
}, 5000);
}
function updateUrl(){
 
if(typeof map.getView().getZoom() === "undefined"){
......@@ -1906,6 +1931,7 @@ function getNearest(lon, lat) {
}
 
function deinitResults() {
searchResults = undefined;
toggleResults("in");
$("#results").html("");
$("#result-toggler").addClass("hidden");
......
public/js/findRoute.js.map
+ 1
− 1
View file @ 8cb9bc0f
This diff is collapsed.
public/js/mapSearch.js
+ 28
− 2
View file @ 8cb9bc0f
......@@ -1644,7 +1644,10 @@ $(document).ready(function(){
}
 
$("#search input[name=q]").on("keydown", function(event) {
if (event.which == 13) $("#doSearch").click();
if (event.which == 13){
$("#search-addon input[name=q]").blur();
$("#doSearch").click();
}
});
 
......@@ -1738,6 +1741,12 @@ function executeSearch(){
 
var url = '/' + encodeURI(q) + '/' + encodeURI(extent[0]) + '/' + encodeURI(extent[1]) + '/' + encodeURI(extent[2]) + '/' + encodeURI(extent[3]);
// Before we go on -> let's remove the current results
searchResults = undefined;
clearPOIS();
$("#clear-search").remove();
var markers = [];
var xhr = $.getScript(url)
.fail(function(jqxhr, settings, exception) {
console.log(exception);
......@@ -1753,14 +1762,30 @@ function executeSearch(){
$("#search-addon #doSearch").removeClass("hidden");
$("#search-addon #clear-search").removeClass("hidden");
$("#search-addon input[name=q]").attr("readonly", false);
if(typeof searchResults === "undefined" || searchResults.length <= 0){
console.log("keine Ergebnisse");
makeError($("#search-addon input[name=q]"), "Keine Ergebnisse gefunden :(");
}
});
$("#cancel-search").click(function(){
xhr.abort();
});
});
}
 
function makeError(element, message){
$(element).css("border", "3px solid red");
$(element).tooltip({
placement: 'auto',
title: message
}).tooltip('show');
setTimeout(function(){
$(element).css("border", "");
$(element).tooltip('destroy');
}, 5000);
}
function updateUrl(){
 
if(typeof map.getView().getZoom() === "undefined"){
......@@ -1888,6 +1913,7 @@ function getNearest(lon, lat) {
}
 
function deinitResults() {
searchResults = undefined;
toggleResults("in");
$("#results").html("");
$("#result-toggler").addClass("hidden");
......
public/js/mapSearch.js.map
+ 1
− 1
View file @ 8cb9bc0f
This diff is collapsed.
public/js/routing.js
+ 28
− 2
View file @ 8cb9bc0f
......@@ -1644,7 +1644,10 @@ $(document).ready(function(){
}
 
$("#search input[name=q]").on("keydown", function(event) {
if (event.which == 13) $("#doSearch").click();
if (event.which == 13){
$("#search-addon input[name=q]").blur();
$("#doSearch").click();
}
});
 
......@@ -1738,6 +1741,12 @@ function executeSearch(){
 
var url = '/' + encodeURI(q) + '/' + encodeURI(extent[0]) + '/' + encodeURI(extent[1]) + '/' + encodeURI(extent[2]) + '/' + encodeURI(extent[3]);
// Before we go on -> let's remove the current results
searchResults = undefined;
clearPOIS();
$("#clear-search").remove();
var markers = [];
var xhr = $.getScript(url)
.fail(function(jqxhr, settings, exception) {
console.log(exception);
......@@ -1753,14 +1762,30 @@ function executeSearch(){
$("#search-addon #doSearch").removeClass("hidden");
$("#search-addon #clear-search").removeClass("hidden");
$("#search-addon input[name=q]").attr("readonly", false);
if(typeof searchResults === "undefined" || searchResults.length <= 0){
console.log("keine Ergebnisse");
makeError($("#search-addon input[name=q]"), "Keine Ergebnisse gefunden :(");
}
});
$("#cancel-search").click(function(){
xhr.abort();
});
});
}
 
function makeError(element, message){
$(element).css("border", "3px solid red");
$(element).tooltip({
placement: 'auto',
title: message
}).tooltip('show');
setTimeout(function(){
$(element).css("border", "");
$(element).tooltip('destroy');
}, 5000);
}
function updateUrl(){
 
if(typeof map.getView().getZoom() === "undefined"){
......@@ -1888,6 +1913,7 @@ function getNearest(lon, lat) {
}
 
function deinitResults() {
searchResults = undefined;
toggleResults("in");
$("#results").html("");
$("#result-toggler").addClass("hidden");
......
public/js/routing.js.map
+ 1
− 1
View file @ 8cb9bc0f
This diff is collapsed.
resources/assets/js/mapSearch.js
+ 28
− 2
View file @ 8cb9bc0f
......@@ -35,7 +35,10 @@ $(document).ready(function(){
}
$("#search input[name=q]").on("keydown", function(event) {
if (event.which == 13) $("#doSearch").click();
if (event.which == 13){
$("#search-addon input[name=q]").blur();
$("#doSearch").click();
}
});
......@@ -129,6 +132,12 @@ function executeSearch(){
var url = '/' + encodeURI(q) + '/' + encodeURI(extent[0]) + '/' + encodeURI(extent[1]) + '/' + encodeURI(extent[2]) + '/' + encodeURI(extent[3]);
// Before we go on -> let's remove the current results
searchResults = undefined;
clearPOIS();
$("#clear-search").remove();
var markers = [];
var xhr = $.getScript(url)
.fail(function(jqxhr, settings, exception) {
console.log(exception);
......@@ -144,14 +153,30 @@ function executeSearch(){
$("#search-addon #doSearch").removeClass("hidden");
$("#search-addon #clear-search").removeClass("hidden");
$("#search-addon input[name=q]").attr("readonly", false);
if(typeof searchResults === "undefined" || searchResults.length <= 0){
console.log("keine Ergebnisse");
makeError($("#search-addon input[name=q]"), "Keine Ergebnisse gefunden :(");
}
});
$("#cancel-search").click(function(){
xhr.abort();
});
});
}
function makeError(element, message){
$(element).css("border", "3px solid red");
$(element).tooltip({
placement: 'auto',
title: message
}).tooltip('show');
setTimeout(function(){
$(element).css("border", "");
$(element).tooltip('destroy');
}, 5000);
}
function updateUrl(){
if(typeof map.getView().getZoom() === "undefined"){
......@@ -279,6 +304,7 @@ function getNearest(lon, lat) {
}
function deinitResults() {
searchResults = undefined;
toggleResults("in");
$("#results").html("");
$("#result-toggler").addClass("hidden");
......
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