KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue with toasts comming in the background

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2017-05-05 15:58:04 +02:00
parent 7714729093
commit aa1ca995f0
6 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/public/assets/js/admin.js
View File

@@ -119,7 +119,7 @@ var Admin = {
});
}
$("#password").val("");
$("#password").attr("placeholder", "Change channel password");
$("#password").attr("placeholder", "Change admin password");
$(".user-password-li").removeClass("hide");
if($(".password_protected").prop("checked")) {
$(".change_user_pass").removeClass("hide");
@@ -235,7 +235,7 @@ var Admin = {
$('ul.playlist-tabs').tabs('select_tab', $(".playlist-tabs-loggedIn li a.active").attr("href").substring(1));
}
$("#admin-lock").removeClass("clickable");
$("#password").attr("placeholder", "Enter channel password");
$("#password").attr("placeholder", "Enter admin password");
//$("#top-button").removeClass("top-button-with-tabs");
},
@@ -274,7 +274,7 @@ var Admin = {
$(".playlist-tabs-loggedIn").removeClass("hide");
$(".playlist-tabs").addClass("hide");
}
$("#password").attr("placeholder", "Create channel password");
$("#password").attr("placeholder", "Create admin password");
} else {
if($(".password_protected").prop("checked")) {
$(".change_user_pass").removeClass("hide");

4
server/public/assets/js/listeners.js
View File

@@ -172,7 +172,7 @@ function init(){
$('ul.playlist-tabs-loggedIn').tabs();
$('ul.chatTabs').tabs();
$("#settings").sideNav({
menuWidth: 300, // Default is 240
menuWidth: 310, // Default is 240
edge: side, // Choose the horizontal origin
closeOnClick: false // Closes side-nav on <a> clicks, useful for Angular/Meteor
});
@@ -1137,7 +1137,7 @@ $(document).off("keyup", "keyup.autocomplete", function(e){
$(document).off("keydown", "keydown.autocomplete", function(e){
if(e.keyCode == 13){
e.preventDefault();
}
});*/