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

Merge pull request #10 from jfederico/master 

Fixed issue with new meeting url not updated in copiable text
This commit is contained in:
Jesus Federico 2016-10-18 16:36:10 -04:00 committed by GitHub
parent d9f1af8889 4ac239c65d
commit caf6d0bcae
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,8 +23,8 @@
type : 'GET', type : 'GET',
success : function(data) { success : function(data) {
$('#meeting_url').html(data.response.meeting_url); $('#meeting_url').html(data.response.meeting_url);
$('#text_meeting_url a').href(data.response.meeting_url); $('#text_meeting_url').attr("href", data.response.meeting_url);
$('#text_meeting_url span').html(data.response.meeting_url); $('#text_meeting_url').text(data.response.meeting_url);
}, },
error : function(xhr, status, error) { error : function(xhr, status, error) {
}, },

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

@ -36,7 +36,7 @@
<figure class=highlight><pre><figcaption class="text" data-lang="text"> <figure class=highlight><pre><figcaption class="text" data-lang="text">
<p>Hi Everyone</p> <p>Hi Everyone</p>
<p>The meeting will be at this URL</p> <p>The meeting will be at this URL</p>
<p><a id="text_meeting_url" href="<%= @meeting_url %>"><span id="text_meeting_url"><%= @meeting_url %></a></p> <p><a id="text_meeting_url" href="<%= @meeting_url %>"><%= @meeting_url %></p>
<p>Please join!</p> <p>Please join!</p>
</figcaption></pre></figure> </figcaption></pre></figure>