diff options
| author | Mario Vavti <mario@mariovavti.com> | 2019-01-02 23:07:37 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2019-01-02 23:07:37 +0100 |
| commit | da2688403ee40d5dc840e98e465cf8d7eb82681d (patch) | |
| tree | 3f28ae3cdf00ad07653d6ead1ed425406a2aebb7 | |
| parent | a19563e1396cb882063db3ce3f355b2db48175e9 (diff) | |
| parent | f660530ef5cce1fab2e7c16daad2239524cb5aac (diff) | |
| download | volse-hubzilla-da2688403ee40d5dc840e98e465cf8d7eb82681d.tar.gz volse-hubzilla-da2688403ee40d5dc840e98e465cf8d7eb82681d.tar.bz2 volse-hubzilla-da2688403ee40d5dc840e98e465cf8d7eb82681d.zip | |
Merge remote-tracking branch 'mike/master' into dev
| -rw-r--r-- | include/zid.php | 6 | ||||
| -rw-r--r-- | view/js/main.js | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/zid.php b/include/zid.php index fe06948ba..a37ebe1f6 100644 --- a/include/zid.php +++ b/include/zid.php @@ -70,9 +70,9 @@ function zid($s, $address = '') { $zurl .= '#' . $fragment; $arr = [ - 'url' => $s, - 'zid' => urlencode($myaddr), - 'result' => $zurl + 'url' => $s, + 'zid' => urlencode($myaddr), + 'result' => $zurl ]; /** * @hooks zid diff --git a/view/js/main.js b/view/js/main.js index a69bcfa64..0169ee54c 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -888,7 +888,7 @@ function liveUpdate(notify_id) { 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) { clearTimeout(livetime); } |