rainbownapkin/fore.st
1
0
Fork 0
Code Issues 13 Pull requests Projects Releases Packages Wiki Activity Actions

Add permission for #402; fix a strange jwplayer issue

Browse source
This commit is contained in:
calzoneman 2014-09-06 22:59:28 -05:00
parent 71114b0060
commit 2b60ab8e10
7 changed files with 116 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

8
www/js/player.js
View file

@ -703,8 +703,14 @@ var JWPlayer = function (data) {
file: self.videoURL,
width: VWIDTH,
height: VHEIGHT,
autostart: true
autostart: true,
type: data.contentType
});
jwplayer().onReady(function () {
resizeStuff();
});
jwplayer().onPlay(function() {
self.paused = false;
if(CLIENT.leader)

4
www/js/util.js
View file

@ -1766,6 +1766,7 @@ function genPermissionsEditor() {
makeOption("Vote", "pollvote", standard, CHANNEL.perms.pollvote+"");
makeOption("View hidden poll results", "viewhiddenpoll", standard, CHANNEL.perms.viewhiddenpoll+"");
makeOption("Voteskip", "voteskip", standard, CHANNEL.perms.voteskip+"");
makeOption("View voteskip results", "viewvoteskip", standard, CHANNEL.perms.viewvoteskip+"");
addDivider("Moderation");
makeOption("Assign/Remove leader", "leaderctl", modplus, CHANNEL.perms.leaderctl+"");
@ -2756,6 +2757,7 @@ function googlePlusSimulator2014(data) {
}
}
data.url = data.meta.gpdirect[q];
data.url = data.meta.gpdirect[q].url;
data.contentType = data.meta.gpdirect[q].contentType;
return data;
}