seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

This commit is contained in:
Seth Call 2013-10-03 12:58:49 +00:00
parent ff602e4294 6192a1f20c
commit af94c3ad21
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
web/app/assets/javascripts/findSession.js
View File

@ -175,12 +175,15 @@
function containsInvitation(session) {
var i, invitation = null;
// user has invitations for this session
for (i=0; i < session.invitations.length; i++) {
invitation = session.invitations[i];
// session contains an invitation for this user
if (invitation.receiver_id == context.JK.currentUserId) {
return true;
if (invitations in session) {
// user has invitations for this session
for (i=0; i < session.invitations.length; i++) {
invitation = session.invitations[i];
// session contains an invitation for this user
if (invitation.receiver_id == context.JK.currentUserId) {
return true;
}
}
}
@ -190,11 +193,13 @@
function containsFriend(session) {
var i, participant = null;
for (i=0; i < session.participants.length; i++) {
participant = session.participants[i];
// this session participant is a friend
if (participant !== null && participant !== undefined && participant.user.is_friend) {
return true;
if (participants in session) {
for (i=0; i < session.participants.length; i++) {
participant = session.participants[i];
// this session participant is a friend
if (participant !== null && participant !== undefined && participant.user.is_friend) {
return true;
}
}
}
return false;

5
web/app/assets/javascripts/sidebar.js
View File

@ -538,11 +538,14 @@
}).error(app.ajaxError);
var participantHtml = "You have been invited to join a session with: <br/><br/>";
participantHtml += "<table><tbody>";
$.each(participants, function(index, val) {
participantHtml += "<img class='avatar_large' src='" + val.photo_url + "' />&nbsp;" + val.name + "<br/>";
participantHtml += "<tr><td><img class='avatar-small' src='" + val.photo_url + "' /></td><td>" + val.name + "</td></tr>";
});
participantHtml += "</tbody></table>";
// display notification
app.notify({
"title": "Session Invitation",

4
web/app/assets/stylesheets/client/sidebar.css.scss
View File

@ -98,7 +98,7 @@
ms-filter: "alpha(opacity=50)";
}
li .avatar-small {
.avatar-small {
float:left;
padding:1px;
width:36px;
@ -110,7 +110,7 @@
border-radius:18px;
}
li .avatar-small img {
.avatar-small img {
width: 36px;
height: 36px;
-webkit-border-radius:18px;