twisterarmy/twister-html
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-html.git synced 2025-01-14 17:07:53 +00:00
Code Issues Projects Releases Wiki Activity

fix of refreshTwistdayReminder() to remove peer from listUpcoming when adding to listCurrent occurs

Browse Source
This commit is contained in:
Simon Grim 2015-05-14 11:34:09 +05:00
parent 0a51e2f0da
commit 371fa926c9
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/interface_home.js
View File

@ -231,8 +231,8 @@ function refreshTwistdayReminder() {
list.append(item); list.append(item);
} }
} }
function removeLuckyFromList(list, post) { function removeLuckyFromList(list, lucky) {
list.find('[data-screen-name='+post.userpost.n+']').closest('li').remove(); list.find('[data-screen-name='+lucky+']').closest('li').remove();
} }
var showUpcomingTimer = ($.Options.getTwistdayReminderShowUpcomingOpt() === 'enable') ? $.Options.getTwistdayReminderShowUpcomingTimerOpt() *3600 : 0; var showUpcomingTimer = ($.Options.getTwistdayReminderShowUpcomingOpt() === 'enable') ? $.Options.getTwistdayReminderShowUpcomingTimerOpt() *3600 : 0;
@ -255,6 +255,7 @@ function refreshTwistdayReminder() {
d.setUTCSeconds(posts[i].userpost.time); d.setUTCSeconds(posts[i].userpost.time);
if (d.getUTCMonth() === todayMonth && d.getUTCDate() === todayDate) { if (d.getUTCMonth() === todayMonth && d.getUTCDate() === todayDate) {
addLuckyToList(listCurrent, posts[i]); addLuckyToList(listCurrent, posts[i]);
removeLuckyFromList(listUpcoming, posts[i].userpost.n);
} else if (showUpcomingTimer > 0) { } else if (showUpcomingTimer > 0) {
thatSec = Date.UTC(todayYear,d.getUTCMonth(),d.getUTCDate(),d.getUTCHours(),d.getUTCMinutes(),d.getUTCSeconds()) /1000; thatSec = Date.UTC(todayYear,d.getUTCMonth(),d.getUTCDate(),d.getUTCHours(),d.getUTCMinutes(),d.getUTCSeconds()) /1000;
if (thatSec > todaySec && thatSec -todaySec <= showUpcomingTimer) { if (thatSec > todaySec && thatSec -todaySec <= showUpcomingTimer) {
@ -262,12 +263,12 @@ function refreshTwistdayReminder() {
d.setUTCSeconds(thatSec); d.setUTCSeconds(thatSec);
addLuckyToList(listUpcoming, posts[i], d.getTime() /1000); addLuckyToList(listUpcoming, posts[i], d.getTime() /1000);
} else { } else {
removeLuckyFromList(listCurrent, posts[i]); removeLuckyFromList(listCurrent, posts[i].userpost.n);
removeLuckyFromList(listUpcoming, posts[i]); removeLuckyFromList(listUpcoming, posts[i].userpost.n);
} }
} else { } else {
removeLuckyFromList(listCurrent, posts[i]); removeLuckyFromList(listCurrent, posts[i].userpost.n);
removeLuckyFromList(listUpcoming, posts[i]); removeLuckyFromList(listUpcoming, posts[i].userpost.n);
} }
} }
} }