Skip to content

Commit

Permalink
Add a close icon to the feature warning panel
Browse files Browse the repository at this point in the history
Fixes #660
  • Loading branch information
tomhughes committed Dec 18, 2013
1 parent 14cb332 commit fd0ed54
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions app/assets/javascripts/index/browse.js
Expand Up @@ -47,14 +47,17 @@ function initializeBrowse(map) {
}
}

function displayFeatureWarning(count, limit, callback) {
function displayFeatureWarning(count, limit, add, cancel) {
$('#browse_status').html(
$("<p class='warning'></p>")
.text(I18n.t("browse.start_rjs.feature_warning", { num_features: count, max_features: limit }))
.prepend(
$("<span class='icon close'></span>")
.click(cancel))
.append(
$("<input type='submit'>")
.val(I18n.t('browse.start_rjs.load_data'))
.click(callback)));
.click(add)));
}

var dataLoader;
Expand Down Expand Up @@ -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;
}
});
}
Expand Down

0 comments on commit fd0ed54

Please sign in to comment.