specter/CyTube
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch '3.0' of github.com:calzoneman/sync into 3.0

Browse source
This commit is contained in:
calzoneman 2014-02-28 16:21:08 -06:00
parent 086c2ab501 c93bc97a94
commit b96b488c22
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/channel.js
View file

@ -3312,7 +3312,8 @@ Channel.prototype.sendAll = function (msg, data) {
* Loads a special set of permissions for unregistered channels * Loads a special set of permissions for unregistered channels
*/ */
Channel.prototype.setUnregisteredPermissions = function () { Channel.prototype.setUnregisteredPermissions = function () {
this.permissions = { var perms = {
seeplaylist: -1,
playlistadd: -1, // Add video to the playlist playlistadd: -1, // Add video to the playlist
playlistnext: 0, playlistnext: 0,
playlistmove: 0, // Move a video on the playlist playlistmove: 0, // Move a video on the playlist
@ -3341,7 +3342,13 @@ Channel.prototype.setUnregisteredPermissions = function () {
drink: 0, // Use the /d command drink: 0, // Use the /d command
chat: 0 // Send chat messages chat: 0 // Send chat messages
}; };
for (var key in perms) {
this.permissions[key] = perms[key];
}
this.sendAll("setPermissions", this.permissions); this.sendAll("setPermissions", this.permissions);
this.setLock(false);
} }
module.exports = Channel; module.exports = Channel;

4
www/js/util.js
View file

@ -1502,11 +1502,13 @@ function chatOnly() {
.appendTo($("#chatheader")) .appendTo($("#chatheader"))
.click(showUserOptions); .click(showUserOptions);
$("<span/>").addClass("label label-default pull-right pointer") $("<span/>").addClass("label label-default pull-right pointer")
.attr("id", "showchansettings")
.text("Channel Settings") .text("Channel Settings")
.appendTo($("#chatheader")) .appendTo($("#chatheader"))
.click(function () { .click(function () {
$("#channeloptions").modal(); $("#channeloptions").modal();
}); });
setVisible("#showchansettings", CLIENT.rank >= 2);
$("body").addClass("chatOnly"); $("body").addClass("chatOnly");
resizeStuff(); resizeStuff();
} }
@ -1778,7 +1780,7 @@ function queueMessage(data, type) {
title = "Warning"; title = "Warning";
} }
var alerts = $(".qfalert.qf-" + type); var alerts = $(".qfalert.qf-" + type + " .alert");
for (var i = 0; i < alerts.length; i++) { for (var i = 0; i < alerts.length; i++) {
var al = $(alerts[i]); var al = $(alerts[i]);
var cl = al.clone(); var cl = al.clone();