Skip to content

Commit

Permalink
Merge pull request #587 from AndyTaylorTweet/master
Browse files Browse the repository at this point in the history
Re-enable auto scrolling of update log view...
  • Loading branch information
glynhudson authored Oct 27, 2016
2 parents 9c4d0c0 + f4accc8 commit e409000
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions Modules/admin/admin_main_view.php
Original file line number Diff line number Diff line change
Expand Up @@ -390,9 +390,8 @@ function getUpdateLog() {
$.ajax({ url: path+"admin/emonpi/getupdatelog", async: true, dataType: "text", success: function(result)
{
$("#update-log").html(result);
$("#update-log-bound").scrollTop = $("#update-log-bound").scrollHeight;
if (result.indexOf("emonPi update done")!=-1) {
clearInterval(refresher_update);
if(result.indexOf("emonPi update done") > -1) {} else {
$('#update-log-bound').animate({scrollTop: $('#update-log-bound').prop("scrollHeight")}, 1000);
}
}
});
Expand Down

0 comments on commit e409000

Please sign in to comment.