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 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions

This commit is contained in:
Brian Smith 2014-05-27 21:31:42 -04:00
parent 6dc8192516 93ddd02bd1
commit 860704f874
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
web/app/assets/javascripts/web/scheduled_session.js
View File

@ -46,15 +46,14 @@
function registerScheduledSessionComment() {
console.log("registering session comment on web layout");
// context.JK.JamServer.registerMessageCallback(context.JK.MessageType.SCHEDULED_SESSION_COMMENT, function(header, payload) {
// logger.debug("Handling SCHEDULED_SESSION_COMMENT msg " + JSON.stringify(payload));
// app.notify({
// "title": "Session Comment",
// "text": payload.msg,
// "icon_url": context.JK.resolveAvatarUrl(payload.photo_url)
// });
// });
context.JK.JamServer.registerMessageCallback(context.JK.MessageType.SCHEDULED_SESSION_COMMENT, function(header, payload) {
logger.debug("Handling SCHEDULED_SESSION_COMMENT msg " + JSON.stringify(payload));
app.notify({
"title": "Session Comment",
"text": payload.msg,
"icon_url": context.JK.resolveAvatarUrl(payload.photo_url)
});
});
}
function initComments(musicSessionId) {

12
web/app/views/music_sessions/session_info.html.haml
View File

@ -130,9 +130,11 @@
- content_for :after_black_bar do
%br/
= render :partial => "shared/comments", :locals => {:comments => @music_session.session_info_comments, :id => "txtSessionInfoComment", :info_page => true}
:javascript
$(function () {
var ss = new window.JK.ShowSessionInfo(JK.app);
ss.initialize("#{@music_session.id}");
})
- content_for :extra_js do
:javascript
$(function () {
var ss = new window.JK.ShowSessionInfo(JK.app);
ss.initialize("#{@music_session.id}");
})