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 list-bug

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2015-07-08 19:05:24 +02:00
parent a1c0350756
commit cf32cf6898
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.htaccess
View File

@@ -19,4 +19,4 @@ RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule /(.*)$ /$1 [L] RewriteRule /(.*)$ /$1 [L]
Options -Indexes Options -Indexes

2
server/gulpfile.js
View File

@@ -7,7 +7,7 @@ gulp.task('js', function () {
gulp.src(['../static/js/*.js', '!../static/js/nochan*', '!../static/js/remotecontroller.js']) gulp.src(['../static/js/*.js', '!../static/js/nochan*', '!../static/js/remotecontroller.js'])
.pipe(uglify({ .pipe(uglify({
mangle: true, mangle: true,
compress: true, compress: true,
enclose: true enclose: true
})) }))
.pipe(concat('main.min.js')) .pipe(concat('main.min.js'))

4
static/dist/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

15
static/js/list.js
View File

@@ -25,14 +25,17 @@ var List = {
reverse: true reverse: true
}, 'added')); }, 'added'));
List.insertAtIndex(List.getIndexOfSong(msg[1].id), msg[1], true); var index = List.getIndexOfSong(msg[1].id);
var test = $("#wrapper").children()[List.getIndexOfSong(msg[1].id)];
List.insertAtIndex(index, msg[1], true);
var test = $("#wrapper").children()[index];
setTimeout(function(){ setTimeout(function(){
$(test).css("height", 66); $(test).css("height", 66);
},5); },5);
}else if(msg[0] == "deleted") }else if(msg[0] == "deleted")
{ {
List.getIndexOfSong(msg[1])[0]
var to_delete = $("#wrapper").children()[List.getIndexOfSong(msg[1])]; var to_delete = $("#wrapper").children()[List.getIndexOfSong(msg[1])];
to_delete.style.height = 0; to_delete.style.height = 0;
setTimeout(function() setTimeout(function()
@@ -53,7 +56,6 @@ var List = {
reverse: true reverse: true
}, 'added')); }, 'added'));
$("#"+msg[1]).remove(); $("#"+msg[1]).remove();
console.log(msg[1]);
List.insertAtIndex(List.getIndexOfSong(msg[1]), song_voted_on, false); List.insertAtIndex(List.getIndexOfSong(msg[1]), song_voted_on, false);
//List.populate_list(full_playlist, false); //List.populate_list(full_playlist, false);
@@ -181,11 +183,9 @@ var List = {
insertAtIndex: function(i, song_info, transition) { insertAtIndex: function(i, song_info, transition) {
if(i === 0) { if(i === 0) {
$("#wrapper").prepend(List.generateSong(song_info, transition)); $("#wrapper").prepend(List.generateSong(song_info, transition));
return; return;
} }
$("#wrapper > div:nth-child(" + (i) + ")").after(List.generateSong(song_info, transition)); $("#wrapper > div:nth-child(" + (i) + ")").after(List.generateSong(song_info, transition));
}, },
generateSong: function(song_info, transition) generateSong: function(song_info, transition)
@@ -211,7 +211,8 @@ var List = {
$(".lazy").lazyload({ $(".lazy").lazyload({
container: $("#wrapper") container: $("#wrapper")
}).removeClass("lazy"); }).removeClass("lazy");
*/ */
return song.html(); return song.html();
}, },