moon
/
sync
mirror of https://github.com/calzoneman/sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #470 from Xaekai/3.0 

Fix annoyance: Clicking Remove video scrolls to top
This commit is contained in:
Calvin Montgomery 2015-05-07 17:07:18 -05:00
parent 7902f1c3c6 2dd1db166a
commit e51793d60c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/channel.jade
View File

@ -20,7 +20,7 @@ html(lang="en")
b.caret b.caret
ul.dropdown-menu ul.dropdown-menu
li: a(href="#" onclick="javascript:chatOnly()") Chat Only li: a(href="#" onclick="javascript:chatOnly()") Chat Only
li: a(href="#" onclick="javascript:removeVideo()") Remove Video li: a(href="#" onclick="javascript:removeVideo(event)") Remove Video
mixin navloginlogout(cname) mixin navloginlogout(cname)
section#mainpage section#mainpage
.container .container

3
www/js/util.js
View File

@ -1730,7 +1730,7 @@ function handleVideoResize() {
$(window).resize(handleWindowResize); $(window).resize(handleWindowResize);
handleWindowResize(); handleWindowResize();
function removeVideo() { function removeVideo(event) {
try { try {
PLAYER.setVolume(0); PLAYER.setVolume(0);
if (PLAYER.type === "rv") { if (PLAYER.type === "rv") {
@ -1741,6 +1741,7 @@ function removeVideo() {
$("#videowrap").remove(); $("#videowrap").remove();
$("#chatwrap").removeClass("col-lg-5 col-md-5").addClass("col-md-12"); $("#chatwrap").removeClass("col-lg-5 col-md-5").addClass("col-md-12");
if (event) event.preventDefault();
} }
/* channel administration stuff */ /* channel administration stuff */