removed iscroll

This commit is contained in:
Kasper Rynning-Tønnesen
2015-05-22 15:44:39 +02:00
parent 3a6ceac058
commit b0822e0ffa
2 changed files with 19 additions and 9 deletions

View File

@@ -337,7 +337,7 @@ ul #chat-log{
padding-right: 3%;
}
#playlist{
padding:0px 15px;
/*padding:0px 15px;*/
}
#player{
@@ -709,10 +709,20 @@ ul #chat-log{
.title-container li {
width: 71%;
}
#wrapper {
height: 100%;
width: 113%;
overflow: auto;
padding-right: 7vh;
opacity: 1;
}
#playlist{
padding:0px 15px;
overflow: hidden;
/*padding:0px 15px;*/
height: 90%;
height: calc(100% - 64px);
overflow: hidden;
padding:0px 0px 0px 0px;
}
}

View File

@@ -87,12 +87,12 @@ function populate_list(msg, conf_only)
if(scroller === false)
{
myScroll = new IScroll('#playlist', {
/*myScroll = new IScroll('#playlist', {
mouseWheel: true,
scrollY: true,
});
scroller = true;
myScroll.maxScrollY = myScroll.maxScrollY - 5;
myScroll.maxScrollY = myScroll.maxScrollY - 5;*/
}else
{
refresh_scroll();
@@ -104,8 +104,8 @@ function populate_list(msg, conf_only)
//document.getElementById("player").style.display="none";
//ytplayer.pauseVideo();
}else{
myScroll.refresh();
myScroll.maxScrollY = myScroll.maxScrollY - 5;
//myScroll.refresh();
//myScroll.maxScrollY = myScroll.maxScrollY - 5;
}
$("#settings").css("visibility", "visible");
@@ -152,11 +152,11 @@ function importOldList(chan){
function refresh_scroll()
{
if(myScroll !== undefined)
/*if(myScroll !== undefined)
{
myScroll.refresh();
myScroll.maxScrollY = myScroll.maxScrollY - 5;
}
}*/
}
function show(){