From 8c5203f7e1c3a12113c6f2c6d45ae7e1dd780e75 Mon Sep 17 00:00:00 2001
From: redmatrix <redmatrix@redmatrix.me>
Date: Mon, 23 Nov 2015 17:47:18 -0800
Subject: issue #185 - prevent liveUpdate from updating while the built-in
 html5 media player is "active". This will not have any affect on flash or
 other media players, and could potentially get confused if you have more than
 one media player actively playing at any given time.

---
 view/js/main.js | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/js/main.js b/view/js/main.js
index 8bd4357cc..ca7d50b90 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -247,6 +247,7 @@ var pageHasMoreContent = true;
 var updateCountsOnly = false;
 var divmore_height = 400;
 var last_filestorage_id = null;
+var mediaPlaying = false;
 
 $(function() {
 	$.ajaxSetup({cache: false});
@@ -359,7 +360,7 @@ function NavUpdate() {
 	if(liking)
 		$('.like-rotator').spin(false);
 
-	if(! stopped) {
+	if((! stopped) && (! mediaPlaying)) {
 		var pingCmd = 'ping' + ((localUser != 0) ? '?f=&uid=' + localUser : '');
 
 		$.get(pingCmd,function(data) {
@@ -595,6 +596,24 @@ function updateConvItems(mode,data) {
 		$('body').css('cursor', 'auto');
 	}
 
+	$('video').off('playing');
+	$('video').off('pause');
+	$('audio').off('playing');
+	$('audio').off('pause');
+
+	$('video').on('playing', function() {
+		mediaPlaying = true;
+	});
+	$('video').on('pause', function() {
+		mediaPlaying = false;
+	});
+	$('audio').on('playing', function() {
+		mediaPlaying = true;
+	});
+	$('audio').on('pause', function() {
+		mediaPlaying = false;
+	});
+
 	/* autocomplete @nicknames */
 	$(".comment-edit-form  textarea").editor_autocomplete(baseurl+"/acl?f=&n=1");
 
-- 
cgit v1.2.3