A few minor changes

- Fix paginator always showing 5 buttons even if there are less pages
- Clear AFK timer when clicking voteskip
- Change the modestbranding youtube param because people wanted the like/dislike buttons
This commit is contained in:
calzoneman 2013-08-08 18:25:56 -04:00
parent 9256928d82
commit 07a3e3cc21
4 changed files with 4 additions and 6 deletions

View File

@ -1516,9 +1516,8 @@ Channel.prototype.tryVoteskip = function(user) {
return; return;
} }
// Voteskip = auto-unafk // Voteskip = auto-unafk
if(user.meta.afk) {
user.setAFK(false); user.setAFK(false);
} user.autoAFK();
if(!this.voteskip) { if(!this.voteskip) {
this.voteskip = new Poll("voteskip", "voteskip", ["yes"]); this.voteskip = new Poll("voteskip", "voteskip", ["yes"]);
} }

View File

@ -48,7 +48,7 @@
.appendTo(sep); .appendTo(sep);
} }
} }
for(var i = s; i < s + this.opts.maxPages; i++) { for(var i = s; i < s + this.opts.maxPages && i < s + pages; i++) {
(function (i) { (function (i) {
var li = $("<li/>").appendTo(ul); var li = $("<li/>").appendTo(ul);
if(i == p) if(i == p)

View File

@ -37,7 +37,6 @@ var YouTubePlayer = function (data) {
autoplay: 1, // Autoplay video autoplay: 1, // Autoplay video
controls: 1, // Show controls controls: 1, // Show controls
iv_load_policy: 3, // No annotations iv_load_policy: 3, // No annotations
modestbranding: 1, // No logo
rel: 0, // No related videos rel: 0, // No related videos
wmode: wmode wmode: wmode
}, },

View File

@ -1499,12 +1499,12 @@ function genPermissionsEditor() {
makeOption("Jump to video", "playlistjump", standard, CHANNEL.perms.playlistjump+""); makeOption("Jump to video", "playlistjump", standard, CHANNEL.perms.playlistjump+"");
makeOption("Queue playlist", "playlistaddlist", standard, CHANNEL.perms.playlistaddlist+""); makeOption("Queue playlist", "playlistaddlist", standard, CHANNEL.perms.playlistaddlist+"");
makeOption("Queue livestream", "playlistaddlive", standard, CHANNEL.perms.playlistaddlive+""); makeOption("Queue livestream", "playlistaddlive", standard, CHANNEL.perms.playlistaddlive+"");
makeOption("Embed custom media", "playlistaddcustom", standard, CHANNEL.perms.playlistaddcustom + "");
makeOption("Exceed maximum media length", "exceedmaxlength", standard, CHANNEL.perms.exceedmaxlength+""); makeOption("Exceed maximum media length", "exceedmaxlength", standard, CHANNEL.perms.exceedmaxlength+"");
makeOption("Add nontemporary media", "addnontemp", standard, CHANNEL.perms.addnontemp+""); makeOption("Add nontemporary media", "addnontemp", standard, CHANNEL.perms.addnontemp+"");
makeOption("Temp/untemp playlist item", "settemp", standard, CHANNEL.perms.settemp+""); makeOption("Temp/untemp playlist item", "settemp", standard, CHANNEL.perms.settemp+"");
makeOption("Shuffle playlist", "playlistshuffle", standard, CHANNEL.perms.playlistshuffle+""); makeOption("Shuffle playlist", "playlistshuffle", standard, CHANNEL.perms.playlistshuffle+"");
makeOption("Clear playlist", "playlistclear", standard, CHANNEL.perms.playlistclear+""); makeOption("Clear playlist", "playlistclear", standard, CHANNEL.perms.playlistclear+"");
makeOption("Embed custom media", "playlistaddcustom", standard, CHANNEL.perms.playlistaddcustom + "");
addDivider("Polls"); addDivider("Polls");
makeOption("Open/Close poll", "pollctl", modleader, CHANNEL.perms.pollctl+""); makeOption("Open/Close poll", "pollctl", modleader, CHANNEL.perms.pollctl+"");