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

URI encode meeting name and only show invite/join when a name is entered

This commit is contained in:
Zachary Chai 2017-01-26 09:34:05 -05:00
parent e3e154b99c
commit 540ab7d369
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,7 +140,12 @@
$(".page-wrapper.meetings").data('id', newId); $(".page-wrapper.meetings").data('id', newId);
$('.meeting-url').val(Meeting.getInstance().getURL()); $('.meeting-url').val(Meeting.getInstance().getURL());
$('.join-meeting-title').html(I18n.join_title.replace(/%{id}/, newId)); $('.join-meeting-title').html(I18n.join_title.replace(/%{id}/, newId));
}) if (newId === '') {
$('.invite-join-wrapper').addClass('hidden');
} else {
$('.invite-join-wrapper').removeClass('hidden');
}
});
// enable tooltips // enable tooltips
var options = { var options = {

2
app/assets/javascripts/meeting.coffee
View File

@ -36,7 +36,7 @@ class @Meeting
_meetingInstance = null _meetingInstance = null
@buildMeetingURL: (id, type) -> @buildMeetingURL: (id, type) ->
return @buildFullDomainURL() + '/' + type + '/' + id return @buildFullDomainURL() + '/' + type + '/' + encodeURIComponent(id)
@buildFullDomainURL: -> @buildFullDomainURL: ->
url = location.protocol + '//' + location.hostname url = location.protocol + '//' + location.hostname

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

@ -36,7 +36,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</div> </div>
</div> </div>
<div class="row invite-join-wrapper"> <div class="row invite-join-wrapper hidden">
<div class="col-xs-6"> <div class="col-xs-6">
<div class="title-wrapper text-center"> <div class="title-wrapper text-center">
<div class="title-invite"> <div class="title-invite">