Commit aec13c04 authored by 神楽坂玲奈's avatar 神楽坂玲奈

announcement scrolling fix

parent b967e654
...@@ -255,7 +255,7 @@ $(document).ready -> ...@@ -255,7 +255,7 @@ $(document).ready ->
if e.type == 'mouseenter' if e.type == 'mouseenter'
clearInterval announcement_scrolling if announcement_scrolling clearInterval announcement_scrolling if announcement_scrolling
else else
announcement_scrolling = setInterval(announcement_scroll, 5000) unless announcement_scrolling announcement_scrolling = setInterval(announcement_scroll, 5000) if !announcement_scrolling
announcement_scrolling = null announcement_scrolling = null
$.getJSON '/announcements.json', (data)-> $.getJSON '/announcements.json', (data)->
...@@ -265,7 +265,7 @@ $(document).ready -> ...@@ -265,7 +265,7 @@ $(document).ready ->
target: '_blank' target: '_blank'
text: announcement.title text: announcement.title
)).appendTo $('#announcements') )).appendTo $('#announcements')
announcement_scrolling = setInterval(announcement_scroll, 5000) if data.length announcement_scrolling = setInterval(announcement_scroll, 5000) if !announcement_scrolling and data.length
rooms = new Rooms(el: $('#rooms')) rooms = new Rooms(el: $('#rooms'))
servers = new Servers(el: $('#servers')) servers = new Servers(el: $('#servers'))
......
...@@ -379,7 +379,7 @@ ...@@ -379,7 +379,7 @@
text: announcement.title text: announcement.title
})).appendTo($('#announcements')); })).appendTo($('#announcements'));
} }
if (data.length) { if (!announcement_scrolling && data.length) {
return announcement_scrolling = setInterval(announcement_scroll, 5000); return announcement_scrolling = setInterval(announcement_scroll, 5000);
} }
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment