aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2019-01-02 12:49:04 -0800
committerzotlabs <mike@macgirvin.com>2019-01-02 12:49:04 -0800
commitf660530ef5cce1fab2e7c16daad2239524cb5aac (patch)
tree3e0409df79f9a138a9517be8b0dd9e7851fadf44
parent389b4beba47823ebc0549ee8d7c0549c27b73b7a (diff)
downloadvolse-hubzilla-f660530ef5cce1fab2e7c16daad2239524cb5aac.tar.gz
volse-hubzilla-f660530ef5cce1fab2e7c16daad2239524cb5aac.tar.bz2
volse-hubzilla-f660530ef5cce1fab2e7c16daad2239524cb5aac.zip
allow notification updates when composing comments. This was disabled when it was possible to have liveUpdate run automatically while composing comments, but it seems that live update is no longer possible (however the setting still remains - this should probably be removed).
-rw-r--r--include/zid.php6
-rw-r--r--view/js/main.js2
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);
}