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

Merge branch 'master' of github.com:zoff-music/zoff

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-09-23 19:57:42 +02:00
parent 5593c5272a 9e6d8be32e
commit 1d061e213f
2 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/public/assets/js/channel.js
View File

@@ -337,7 +337,7 @@ var Channel = {
if(!client) {
Helper.addClass("footer", "padding-bottom-novideo");
document.getElementById("embed-area").value = embed_code(embed_autoplay, embed_width, embed_height, color);
document.getElementById("embed-area").value = embed_code(embed_autoplay, embed_width, embed_height, color, embed_videoonly, embed_localmode);
}
if(!/chrom(e|ium)/.test(navigator.userAgent.toLowerCase()) && !Helper.mobilecheck() && !client){

25
server/public/assets/js/functions.js
View File

@@ -765,10 +765,10 @@ function disable_debug(){
} catch(e){}
}
function embed_code(autoplay, width, height, color, embed_code, embed_local){
function embed_code(autoplay, width, height, color, embed_videoonly, embed_localmode){
var autoplay_add = "";
if(autoplay == "&autoplay") autoplay_add = 'allow="autoplay"';
return '<iframe src="https://zoff.me/_embed#' + chan.toLowerCase() + '&' + color + autoplay + embed_videoonly + embed_local + '" width="' + width + 'px" height="' + height + 'px" ' + autoplay_add + '></iframe>';
return '<iframe src="https://zoff.me/_embed#' + chan.toLowerCase() + '&' + color + autoplay + embed_videoonly + embed_localmode + '" width="' + width + 'px" height="' + height + 'px" ' + autoplay_add + '></iframe>';
}
function change_offline(enabled, already_offline){
@@ -1232,26 +1232,7 @@ function emit() {
}
function before_toast(){
/*if($('.toast').length > 0) {
var toastElement = $('.toast').first()[0];
var toastInstance = toastElement.M_Toast;
toastInstance.remove();
}*/
/*var toasts = document.querySelector(".toast");
//for(var i = 0; i < toasts.length; i++) {
// var instance = M.Toast.getInstance(toasts[i]);
if(toasts == null) return;
var instance = M.Toast.getInstance(toasts);
try {
console.log(instance);
if(instance.timeRemaining > 0) {
instance.dismiss();
}
} catch(e) {
}
//}*/
M.Toast.dismissAll();
//Materialize.Toast.removeAll();
M.Toast.dismissAll();
}
function scrollChat() {