Skip to content
Snippets Groups Projects
Commit df74c0e4 authored by Morris Jobke's avatar Morris Jobke
Browse files

apply code review hints

parent 7c8a0a48
Branches
No related tags found
No related merge requests found
......@@ -17,30 +17,27 @@ OC.Log={
levels:['Debug','Info','Warning','Error','Fatal'],
loaded:3,//are initially loaded
getMore:function(count){
if(!count){
count=10;
}
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);
if(!result.remain){
$('#moreLog').css('display', 'none');
$('#moreLog').hide();
}
$('#lessLog').css('display', '');
$('#lessLog').show();
}
});
},
showLess:function(count){
count = count || 10;
$('#moreLog').css('display', '');
while(OC.Log.loaded > 3 && count){
$('#log tr').last().remove();
OC.Log.loaded -= 1;
count--;
}
//calculate remaining items - at least 3
OC.Log.loaded = Math.max(3,OC.Log.loaded-count);
$('#moreLog').hide();
// remove all non-remaining items
$('#log tr').slice(OC.Log.loaded).remove();
if(OC.Log.loaded <= 3)
$('#lessLog').css('display', 'none');
$('#lessLog').hide();
},
addEntries:function(entries){
for(var i=0;i<entries.length;i++){
......@@ -68,6 +65,7 @@ OC.Log={
}
$(document).ready(function(){
$('#lessLog').hide(); // initially hide the less button
$('#moreLog').click(function(){
OC.Log.getMore();
})
......
......@@ -201,7 +201,7 @@ if (!$_['internetconnectionworking']) {
<?php endif;
endfor;?>
</select>
<table id='log'>
<table id="log">
<?php foreach ($_['entries'] as $entry): ?>
<tr>
<td>
......@@ -220,8 +220,8 @@ endfor;?>
<?php endforeach;?>
</table>
<?php if ($_['entriesremain']): ?>
<input id='moreLog' type='button' value='<?php p($l->t('More'));?>...'>
<input id='lessLog' type='button' style='display:none' value='<?php p($l->t('Less'));?>...'>
<input id="moreLog" type="button" value="<?php p($l->t('More'));?>...">
<input id="lessLog" type="button" value="<?php p($l->t('Less'));?>...">
<?php endif; ?>
</fieldset>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment