Merge pull request #25 from Jiiks/beta

Beta
This commit is contained in:
Jiiks 2015-10-31 23:50:41 +02:00
commit 83394eb2c8
2 changed files with 22 additions and 6 deletions

View File

@ -143,6 +143,7 @@ Core.prototype.initObserver = function() {
if(mutation.target.getAttribute('class') != null) { if(mutation.target.getAttribute('class') != null) {
if(mutation.target.getAttribute('class').indexOf("titlebar") != -1) { if(mutation.target.getAttribute('class').indexOf("titlebar") != -1) {
quickEmoteMenu.obsCallback(); quickEmoteMenu.obsCallback();
voiceMode.obsCallback();
} }
} }
emoteModule.obsCallback(mutation); emoteModule.obsCallback(mutation);
@ -183,6 +184,7 @@ EmoteModule.prototype.init = function() {};
EmoteModule.prototype.obsCallback = function(mutation) { EmoteModule.prototype.obsCallback = function(mutation) {
var self = this; var self = this;
for(var i = 0 ; i < mutation.addedNodes.length ; ++i) { for(var i = 0 ; i < mutation.addedNodes.length ; ++i) {
var next = mutation.addedNodes.item(i); var next = mutation.addedNodes.item(i);
if(next) { if(next) {
@ -206,6 +208,7 @@ EmoteModule.prototype.getNodes = function(node) {
nodes.push(next); nodes.push(next);
} }
return nodes; return nodes;
}; };
@ -454,7 +457,6 @@ PublicServers.prototype.show = function() {
//Workaround for joining a server //Workaround for joining a server
PublicServers.prototype.joinServer = function(code) { PublicServers.prototype.joinServer = function(code) {
console.log("Code: " + code);
$(".guilds-add").click(); $(".guilds-add").click();
$(".action.join .btn").click(); $(".action.join .btn").click();
$(".create-guild-container input").val(code); $(".create-guild-container input").val(code);
@ -715,20 +717,34 @@ function VoiceMode() {
} }
VoiceMode.prototype.obsCallback = function() {
console.log("voiceMode obs");
var self = this;
if(settingsCookie["bda-gs-4"]) {
self.disable();
setTimeout(function() {
self.enable();
}, 300);
}
}
VoiceMode.prototype.enable = function() { VoiceMode.prototype.enable = function() {
$(".scroller.guild-channels ul").first().css("display", "none"); $(".scroller.guild-channels ul").first().css("display", "none");
$(".scroller.guild-channels header").first().css("display", "none"); $(".scroller.guild-channels header").first().css("display", "none");
$(".flex-vertical.flex-spacer").first().css("overflow", "hidden"); // $(".flex-vertical.flex-spacer").first().css("overflow", "hidden");
$(".app.flex-vertical").first().css("overflow", "hidden");
$(".chat.flex-vertical.flex-spacer").first().css("visibility", "hidden").css("min-width", "0px"); $(".chat.flex-vertical.flex-spacer").first().css("visibility", "hidden").css("min-width", "0px");
$(".flex-vertical.channels-wrap").first().css("width", "100%"); $(".flex-vertical.channels-wrap").first().css("flex-grow", "100000");
$(".guild-header .btn.btn-hamburger").first().css("visibility", "hidden"); $(".guild-header .btn.btn-hamburger").first().css("visibility", "hidden");
}; };
VoiceMode.prototype.disable = function() { VoiceMode.prototype.disable = function() {
$(".scroller.guild-channels ul").first().css("display", ""); $(".scroller.guild-channels ul").first().css("display", "");
$(".scroller.guild-channels header").first().css("display", ""); $(".scroller.guild-channels header").first().css("display", "");
$(".flex-vertical.flex-spacer").first().css("overflow", ""); //$(".flex-vertical.flex-spacer").first().css("overflow", "");
$(".app.flex-vertical").first().css("overflow", "");
$(".chat.flex-vertical.flex-spacer").first().css("visibility", "").css("min-width", ""); $(".chat.flex-vertical.flex-spacer").first().css("visibility", "").css("min-width", "");
$(".flex-vertical.channels-wrap").first().css("width", ""); $(".flex-vertical.channels-wrap").first().css("flex-grow", "");
$(".guild-header .btn.btn-hamburger").first().css("visibility", ""); $(".guild-header .btn.btn-hamburger").first().css("visibility", "");
}; };

2
js/main.min.js vendored

File diff suppressed because one or more lines are too long