diff options
| author | Mario Vavti <mario@mariovavti.com> | 2019-01-03 14:05:08 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2019-01-03 14:05:08 +0100 |
| commit | d9f21db6236e69d550de443bff6c5b588a52c139 (patch) | |
| tree | c8f8080af03795420e3ccbf2905bb330a0945b8b /view | |
| parent | da2688403ee40d5dc840e98e465cf8d7eb82681d (diff) | |
| parent | 8ac541e634838eb83e918f9c04cc0993602c473e (diff) | |
| download | volse-hubzilla-d9f21db6236e69d550de443bff6c5b588a52c139.tar.gz volse-hubzilla-d9f21db6236e69d550de443bff6c5b588a52c139.tar.bz2 volse-hubzilla-d9f21db6236e69d550de443bff6c5b588a52c139.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/main.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/view/js/main.js b/view/js/main.js index 0169ee54c..dcd04f053 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -888,7 +888,12 @@ function liveUpdate(notify_id) { if((src === null) || (stopped) || (! profile_uid)) { $('.like-rotator').hide(); return; } - if(in_progress || mediaPlaying) { + // if auto updates are enabled and a comment box is open, + // prevent live updates until the comment is submitted + + var lockUpdates = (($('.comment-edit-text.expanded').length && (! bParam_static)) ? true : false); + + if(lockUpdates || in_progress || mediaPlaying) { if(livetime) { clearTimeout(livetime); } |