From fd0ed54b16d25ccee6aee86a9b8cf3ccad5baf77 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 18 Dec 2013 00:14:29 +0000 Subject: [PATCH] Add a close icon to the feature warning panel Fixes #660 --- app/assets/javascripts/index/browse.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/index/browse.js b/app/assets/javascripts/index/browse.js index 47d8418b1..5db23a975 100644 --- a/app/assets/javascripts/index/browse.js +++ b/app/assets/javascripts/index/browse.js @@ -47,14 +47,17 @@ function initializeBrowse(map) { } } - function displayFeatureWarning(count, limit, callback) { + function displayFeatureWarning(count, limit, add, cancel) { $('#browse_status').html( $("

") .text(I18n.t("browse.start_rjs.feature_warning", { num_features: count, max_features: limit })) + .prepend( + $("") + .click(cancel)) .append( $("") .val(I18n.t('browse.start_rjs.load_data')) - .click(callback))); + .click(add))); } var dataLoader; @@ -91,16 +94,20 @@ function initializeBrowse(map) { function addFeatures() { $('#browse_status').empty(); dataLayer.addData(features); + browseBounds = bounds; + } + + function cancelAddFeatures() { + $('#browse_status').empty(); } if (features.length < maxFeatures) { addFeatures(); } else { - displayFeatureWarning(features.length, maxFeatures, addFeatures); + displayFeatureWarning(features.length, maxFeatures, addFeatures, cancelAddFeatures); } dataLoader = null; - browseBounds = bounds; } }); } -- 2.43.2