cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Loading indicator for notes

Browse source
This commit is contained in:
Aaron Lidman 2013-11-12 11:20:23 -08:00
parent 7a435df917
commit 4bfbdcc2f1
2 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/index/browse.js
View file

@ -135,7 +135,9 @@ function initializeBrowse(map) {
} }
function setStatus(status) { function setStatus(status) {
$('#browse_status').append($('<p></p>').text(status)); if($('#browse_status').is(':empty')) {
$('#browse_status').append($('<p></p>').text(status));
}
} }
function clearStatus() { function clearStatus() {

13
app/assets/javascripts/index/note.js.erb
View file

@ -68,13 +68,26 @@ OSM.Note = function(map) {
}; };
page.load = function() { page.load = function() {
var loadTimer = setTimeout(setLoading, 250);
$('#sidebar_content').load(window.location.pathname + "?xhr=1", function(a, b, xhr) { $('#sidebar_content').load(window.location.pathname + "?xhr=1", function(a, b, xhr) {
if (xhr.getResponseHeader('X-Page-Title')) { if (xhr.getResponseHeader('X-Page-Title')) {
document.title = xhr.getResponseHeader('X-Page-Title'); document.title = xhr.getResponseHeader('X-Page-Title');
} }
bind(); bind();
clearTimeout(loadTimer);
clearLoading();
}); });
}; };
function setLoading() {
if($('#browse_status').is(':empty')) {
$('#browse_status').append($('<p></p>').text(I18n.t('browse.start_rjs.loading')));
}
}
function clearLoading() {
$('#browse_status').empty();
}
return page; return page;
}; };