diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-18 12:20:09 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-18 12:20:09 +0200 |
| commit | eb29c577c2b2378c1983e55ddaf4955ad9ae7fe2 (patch) | |
| tree | 4a53459150c6485666e350982ef3ad61ab3936c8 /settings/js/log.js | |
| parent | 3e0e6e35f4fa638dd42bd5adc3b26e078bf3d081 (diff) | |
| parent | 57b8ff890c75169521041b4eb9cdf4582b68e551 (diff) | |
| download | nextcloud-server-eb29c577c2b2378c1983e55ddaf4955ad9ae7fe2.tar.gz nextcloud-server-eb29c577c2b2378c1983e55ddaf4955ad9ae7fe2.zip | |
Merge branch 'master' into movable_apps
Diffstat (limited to 'settings/js/log.js')
| -rw-r--r-- | settings/js/log.js | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/settings/js/log.js b/settings/js/log.js index ae83f0a6283..5dd9c94ae0c 100644 --- a/settings/js/log.js +++ b/settings/js/log.js @@ -5,15 +5,27 @@ */ OC.Log={ + reload:function(count){ + if(!count){ + count=OC.Log.loaded; + } + OC.Log.loaded=0; + $('#log tbody').empty(); + OC.Log.getMore(count); + }, levels:['Debug','Info','Warning','Error','Fatal'], - loaded:50,//are initially loaded - getMore:function(){ - $.get(OC.filePath('settings','ajax','getlog.php'),{offset:OC.Log.loaded},function(result){ + loaded:3,//are initially loaded + getMore:function(count){ + if(!count){ + count=10; + } + $.get(OC.filePath('settings','ajax','getlog.php'),{offset:OC.Log.loaded,count:count},function(result){ if(result.status=='success'){ OC.Log.addEntries(result.data); + $('html, body').animate({scrollTop: $(document).height()}, 800); } }); - OC.Log.loaded+=50; + OC.Log.loaded+=count; }, addEntries:function(entries){ for(var i=0;i<entries.length;i++){ |