harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'mike/master' into dev

Browse Source
This commit is contained in:
Mario Vavti 2019-01-02 23:07:37 +01:00
commit da2688403e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/zid.php
View File

@ -70,9 +70,9 @@ function zid($s, $address = '') {
$zurl .= '#' . $fragment; $zurl .= '#' . $fragment;
$arr = [ $arr = [
'url' => $s, 'url' => $s,
'zid' => urlencode($myaddr), 'zid' => urlencode($myaddr),
'result' => $zurl 'result' => $zurl
]; ];
/** /**
* @hooks zid * @hooks zid

2
view/js/main.js
View File

@ -888,7 +888,7 @@ function liveUpdate(notify_id) {
if((src === null) || (stopped) || (! profile_uid)) { $('.like-rotator').hide(); return; } if((src === null) || (stopped) || (! profile_uid)) { $('.like-rotator').hide(); return; }
if(($('.comment-edit-text.expanded').length) || (in_progress) || (mediaPlaying)) { if(in_progress || mediaPlaying) {
if(livetime) { if(livetime) {
clearTimeout(livetime); clearTimeout(livetime);
} }