diff options
| author | mrjive <mrjive@mrjive.it> | 2015-12-04 10:32:14 +0100 |
|---|---|---|
| committer | mrjive <mrjive@mrjive.it> | 2015-12-04 10:32:14 +0100 |
| commit | 051346325609f5f2e78ef0deaf182c65d7823bbc (patch) | |
| tree | f3660377b3daf6599623d2e4fb95b4d33c30d8cc /view/js/main.js | |
| parent | 53a796afcc0cff6f9e3f51457df4506a43db1945 (diff) | |
| parent | 8a9d743f6f518d3af35014130dcef8f148148113 (diff) | |
| download | volse-hubzilla-051346325609f5f2e78ef0deaf182c65d7823bbc.tar.gz volse-hubzilla-051346325609f5f2e78ef0deaf182c65d7823bbc.tar.bz2 volse-hubzilla-051346325609f5f2e78ef0deaf182c65d7823bbc.zip | |
Merge pull request #9 from redmatrix/master
updating from original codebase
Diffstat (limited to 'view/js/main.js')
| -rw-r--r-- | view/js/main.js | 21 |
1 files changed, 20 insertions, 1 deletions
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"); |