From 1076a7784027ed3af2e118bcf4366a81badb2d7c Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Thu, 30 Oct 2014 14:59:13 +0100 Subject: fix loading of more log entries --- settings/js/log.js | 62 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 30 deletions(-) (limited to 'settings/js/log.js') diff --git a/settings/js/log.js b/settings/js/log.js index 197fef907a0..46d1bfefd5f 100644 --- a/settings/js/log.js +++ b/settings/js/log.js @@ -5,75 +5,77 @@ * See the COPYING-README file. */ -OC.Log={ - reload:function(count){ - if(!count){ - count=OC.Log.loaded; +/* global formatDate */ + +OC.Log = { + reload: function (count) { + if (!count) { + count = OC.Log.loaded; } - OC.Log.loaded=0; + OC.Log.loaded = 0; $('#log tbody').empty(); OC.Log.getMore(count); }, - levels:['Debug','Info','Warning','Error','Fatal'], - loaded:3,//are initially loaded - getMore:function(count){ + levels: ['Debug', 'Info', 'Warning', 'Error', 'Fatal'], + loaded: 3,//are initially loaded + getMore: function (count) { count = count || 10; - $.get(OC.filePath('settings','ajax','getlog.php'),{offset:OC.Log.loaded,count:count},function(result){ - if(result.status === 'success'){ + $.get(OC.filePath('settings', 'ajax', 'getlog.php'), {offset: OC.Log.loaded, count: count}, function (result) { + if (result.status === 'success') { OC.Log.addEntries(result.data); - if(!result.remain){ + if (!result.remain) { $('#moreLog').hide(); } $('#lessLog').show(); } }); }, - showLess:function(count){ + showLess: function (count) { count = count || 10; //calculate remaining items - at least 3 - OC.Log.loaded = Math.max(3,OC.Log.loaded-count); + OC.Log.loaded = Math.max(3, OC.Log.loaded - count); $('#moreLog').show(); // remove all non-remaining items $('#log tr').slice(OC.Log.loaded).remove(); - if(OC.Log.loaded <= 3) { + if (OC.Log.loaded <= 3) { $('#lessLog').hide(); } }, - addEntries:function(entries){ - for(var i=0;i'); - var levelTd=$(''); + addEntries: function (entries) { + for (var i = 0; i < entries.length; i++) { + var entry = entries[i]; + var row = $(''); + var levelTd = $(''); levelTd.text(OC.Log.levels[entry.level]); row.append(levelTd); - var appTd=$(''); + var appTd = $(''); appTd.text(entry.app); row.append(appTd); - var messageTd=$(''); + var messageTd = $(''); messageTd.text(entry.message); row.append(messageTd); - var timeTd=$(''); + var timeTd = $(''); timeTd.addClass('date'); - if(isNaN(entry.time)){ + if (isNaN(entry.time)) { timeTd.text(entry.time); } else { - timeTd.text(formatDate(entry.time*1000)); + timeTd.text(formatDate(entry.time * 1000)); } row.append(timeTd); $('#log').append(row); } OC.Log.loaded += entries.length; } -} +}; -$(document).ready(function(){ - $('#moreLog').click(function(){ +$(document).ready(function () { + $('#moreLog').click(function () { OC.Log.getMore(); - }) - $('#lessLog').click(function(){ + }); + $('#lessLog').click(function () { OC.Log.showLess(); - }) + }); }); -- cgit v1.2.3