mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-22 16:36:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

[/admin/plugins] remove progress history

Browse source
This commit is contained in:
Marcel Klehr 2013-01-24 23:00:56 +01:00
parent 23dd4c73e2
commit 3e793b8a63
3 changed files with 2 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/static/js/admin/plugins.js
View file

@ -68,10 +68,6 @@ $(document).ready(function () {
}
search();
});
$('#progress .showhistory').unbind('click').click(function() {
$("#progress .history").toggle()
});
}
updateHandlers();
@ -79,25 +75,22 @@ $(document).ready(function () {
socket.on('progress', function (data) {
if (data.progress > 0 && $('#progress').data('progress') > data.progress) return;
$("#progress .history").hide();
$("#progress").show();
$('#progress').data('progress', data.progress);
var message = "Unknown status";
if (data.message) {
message = "<span class='status'>" + data.message.toString() + "</span>";
message = data.message.toString();
}
if (data.error) {
data.progress = 1;
}
$("#progress .message").html(message);
$("#progress .history").append("<div>" + message + "</div>");
if (data.progress >= 1) {
$("#progress").hide();
$("#progress .history").html('');
if (data.error) {
alert('An error occurred: '+data.error+' -- the server log might know more...');