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

change request url format

This commit is contained in:
Josh 2017-06-14 13:09:31 -04:00
parent a2f2f7f44c
commit 8a613c8a00
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,7 +45,8 @@ updateMeetingText = function(meeting){
} }
initialPopulate = function(){ initialPopulate = function(){
$.get(window.location.origin + '/rooms/' + $('body').data('current-user') + '/request', function(data){ if (window.location.href.includes('preferences')) { return; }
$.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++){
name = meetings[i]['meetingName'] name = meetings[i]['meetingName']
@ -53,8 +54,8 @@ initialPopulate = function(){
moderators = parseInt(meetings[i]['moderatorCount']) moderators = parseInt(meetings[i]['moderatorCount'])
// Create meeting. // Create meeting.
MEETINGS[name] = {'name': name, MEETINGS[name] = {'name': name,
'participants': participants - moderators, 'participants': participants - moderators,
'moderators': moderators} 'moderators': moderators}
if(isPreviouslyJoined(name)){ if(isPreviouslyJoined(name)){
renderActiveMeeting(MEETINGS[name]) renderActiveMeeting(MEETINGS[name])
} }
@ -64,6 +65,9 @@ initialPopulate = function(){
updatePreviousMeetings(); updatePreviousMeetings();
$('.hidden-list').show(); $('.hidden-list').show();
$('.fa-spinner').hide(); $('.fa-spinner').hide();
}).error(function(){
console.log('Not on a page to load meetings.')
return true;
}); });
} }