lino.jorzick
/
greenlight
forked from External/greenlight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

increase buffer time & fix share load icon

This commit is contained in:
Josh 2017-06-15 09:43:34 -04:00
parent 4539219182
commit 9a74de431a
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/active_meetings.js
View File

@ -18,7 +18,7 @@
// the landing page using custom Actioncable events. // the landing page using custom Actioncable events.
MEETINGS = {} MEETINGS = {}
LOADING_DELAY = 1250 // milliseconds. LOADING_DELAY = 3000 // milliseconds.
updatePreviousMeetings = function(){ updatePreviousMeetings = function(){
$("ul.previously-joined li").each(function(idx, li) { $("ul.previously-joined li").each(function(idx, li) {
@ -46,7 +46,8 @@ updateMeetingText = function(meeting){
initialPopulate = function(){ initialPopulate = function(){
// Only populate on room resources. // Only populate on room resources.
if (!window.location.href.includes('rooms')) { return; } chopped = window.location.href.split('/')
if (!window.location.href.includes('rooms') || chopped[chopped.length - 2] == $('body').data('current-user')) { return; }
$.get((window.location.href + '/request').replace('#', ''), function(data){ $.get((window.location.href + '/request').replace('#', ''), function(data){
meetings = data['meetings'] meetings = data['meetings']
for(var i = 0; i < meetings.length; i++){ for(var i = 0; i < meetings.length; i++){
@ -65,7 +66,7 @@ initialPopulate = function(){
// Remove from previous meetings if they are active. // Remove from previous meetings if they are active.
updatePreviousMeetings(); updatePreviousMeetings();
$('.hidden-list').show(); $('.hidden-list').show();
$('.fa-spinner').hide(); $('.active-spinner').hide();
}).error(function(){ }).error(function(){
console.log('Not on a page to load meetings.') console.log('Not on a page to load meetings.')
return true; return true;

2
app/views/landing/_previously_joined.html.erb
View File

@ -24,7 +24,7 @@
</div> </div>
<div class = 'col-xs-2'> <div class = 'col-xs-2'>
<br><br> <br><br>
<i class="fa fa-spinner fa-spin fa-3x" aria-hidden="true"></i> <i class="active-spinner fa fa-spinner fa-spin fa-3x" aria-hidden="true"></i>
</div> </div>
<div class = 'col-xs-3'> <div class = 'col-xs-3'>
<div class="list-group text-center hidden-list" hidden> <div class="list-group text-center hidden-list" hidden>