friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #9444 from annando/update 

Only auto update when there is content
This commit is contained in:
Hypolite Petovan 2020-10-23 16:39:04 -04:00 committed by GitHub
parent 430a81c17f 9870c8584f
commit e076998ffe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/conversation.php
View File

@ -697,6 +697,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
'$live_update' => $live_update_div,
'$remove' => DI::l10n()->t('remove'),
'$mode' => $mode,
'$update' => $update,
'$user' => $a->user,
'$threads' => $threads,
'$dropping' => ($page_dropping ? DI::l10n()->t('Delete Selected Items') : False),

4
view/js/main.js
View File

@ -620,6 +620,10 @@ function liveUpdate(src) {
in_progress = false;
update_item = 0;
if ($('.wall-item-body', data).length == 0) {
return;
}
$('.wall-item-body', data).imagesLoaded(function() {
updateConvItems(data);

5
view/templates/conversation.tpl
View File

@ -1,6 +1,4 @@
{{$live_update nofilter}}
{{foreach $threads as $thread}}
<div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper">
{{foreach $thread.items as $item}}
@ -18,7 +16,7 @@
{{/foreach}}
</div>
{{/foreach}}
{{if !$update}}
<div id="conversation-end"></div>
{{if $dropping}}
@ -28,3 +26,4 @@
</div>
<div id="item-delete-selected-end"></div>
{{/if}}
{{/if}}

5
view/templates/threaded_conversation.tpl
View File

@ -1,10 +1,8 @@
{{$live_update nofilter}}
{{foreach $threads as $thread}}
{{include file="{{$thread.template}}" item=$thread}}
{{/foreach}}
{{if !$update}}
<div id="conversation-end"></div>
{{if $dropping}}
@ -15,3 +13,4 @@
<img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
<div id="item-delete-selected-end"></div>
{{/if}}
{{/if}}

7
view/theme/frio/templates/threaded_conversation.tpl
View File

@ -1,8 +1,6 @@
<script type="text/javascript" src="view/theme/frio/frameworks/jquery-color/jquery.color.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
{{if !$update}}<script type="text/javascript" src="view/theme/frio/frameworks/jquery-color/jquery.color.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>{{/if}}
{{if $mode == display}}<script type="text/javascript" src="view/theme/frio/js/mod_display.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>{{/if}}
{{$live_update nofilter}}
{{foreach $threads as $thread}}
<hr class="sr-only" />
<div id="tread-wrapper-{{$thread.uriid}}" class="tread-wrapper {{if $thread.threaded}}threaded{{/if}} {{$thread.toplevel}} {{$thread.network}} {{if $thread.thread_level==1}}panel-default panel{{/if}} {{if $thread.thread_level!=1}}comment-wrapper{{/if}}" style="{{if $item.thread_level>2}}margin-left: -15px; margin-right:-16px; margin-bottom:-16px;{{/if}}"><!-- panel -->
@ -15,7 +13,7 @@
</div><!--./tread-wrapper-->
{{/foreach}}
{{if !$update}}
<div id="conversation-end"></div>
{{if $dropping}}
@ -24,3 +22,4 @@
</button>
<img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
{{/if}}
{{/if}}

5
view/theme/quattro/templates/conversation.tpl
View File

@ -1,5 +1,4 @@
{{$live_update nofilter}}
{{foreach $threads as $thread}}
<div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper">
{{foreach $thread.items as $item}}
@ -23,7 +22,7 @@
{{/foreach}}
</div>
{{/foreach}}
{{if !$update}}
<div id="conversation-end"></div>
{{if $dropping}}
@ -46,4 +45,4 @@
$('#item-'+id).animate(colWhite, 1000).animate(colShiny).animate(colWhite, 2000);
</script>
{{/if}}
{{/if}}

5
view/theme/quattro/templates/threaded_conversation.tpl
View File

@ -1,5 +1,4 @@
{{$live_update nofilter}}
{{foreach $threads as $thread}}
<div id="tread-wrapper-{{$thread.uriid}}" class="tread-wrapper {{if $thread.threaded}}threaded{{/if}} {{$thread.toplevel}} {{if $thread.toplevel}} h-entry {{else}} u-comment h-cite {{/if}} {{$thread.network}}">
@ -13,7 +12,7 @@
</div>
{{/foreach}}
{{if !$update}}
<div id="conversation-end"></div>
{{if $dropping}}
@ -37,4 +36,4 @@
$('#item-'+id).animate(colWhite, 1000).animate(colShiny).animate(colWhite, 2000);
</script>
{{/if}}
{{/if}}

5
view/theme/vier/templates/threaded_conversation.tpl
View File

@ -1,5 +1,4 @@
{{$live_update nofilter}}
{{foreach $threads as $thread}}
<hr class="sr-only" />
<div id="tread-wrapper-{{$thread.uriid}}" class="tread-wrapper {{if $thread.threaded}}threaded{{/if}} {{$thread.toplevel}} {{if $thread.toplevel}}h-entry{{/if}} {{$thread.network}}">
@ -13,7 +12,7 @@
</div>
{{/foreach}}
{{if !$update}}
<div id="conversation-end"></div>
{{if $dropping}}
@ -37,4 +36,4 @@
$('#item-'+id).animate(colWhite, 1000).animate(colShiny).animate(colWhite, 2000);
</script>
{{/if}}
{{/if}}