diff --git a/web/app/assets/javascripts/banner.js b/web/app/assets/javascripts/banner.js index b2e8a89a8..863e5dd98 100644 --- a/web/app/assets/javascripts/banner.js +++ b/web/app/assets/javascripts/banner.js @@ -57,6 +57,8 @@ } } + logger.debug("opening banner:" + options.title); + var $h1 = $banner.find('h1'); $h1.html(options.title); diff --git a/web/app/assets/javascripts/shutdownDialog.js b/web/app/assets/javascripts/shutdownDialog.js index 94aea13f4..60c837861 100644 --- a/web/app/assets/javascripts/shutdownDialog.js +++ b/web/app/assets/javascripts/shutdownDialog.js @@ -12,17 +12,21 @@ { title: "Close JamKazam Application", buttons: [ {name: 'Completely Shut Down the App', click: function() {context.jamClient.ShutdownApplication()}}, - {name: 'Let App Run in Background', click: function() {context.jamClient.ShutdownApplication()}} + {name: 'Let App Run in Background', click: function() { + context.jamClient.RegisterQuitCallback("window.JK.ShutdownDialogCallback"); + context.JK.Banner.hide(); + } + } ], html: $('#template-shutdown-prompt').html()}); } function initialize() { - //context.jamClient.RegisterQuitCallback("window.JK.ShutdownDialogCallback"); + context.jamClient.RegisterQuitCallback("window.JK.ShutdownDialogCallback"); } function quitCallback(options) { - logger.debug("oh hai"); + logger.debug("shutdown event"); show(); } diff --git a/web/app/views/api_music_sessions/show_history.rabl b/web/app/views/api_music_sessions/show_history.rabl index 92a1a3a93..664fd4bc0 100644 --- a/web/app/views/api_music_sessions/show_history.rabl +++ b/web/app/views/api_music_sessions/show_history.rabl @@ -35,8 +35,8 @@ else current_user.has_rsvp(history) end - node :scheduled_start do |start| - start.scheduled_start.strftime("%a %e %B %Y %H:%M:%S") if start.scheduled_start + node :scheduled_start do |history| + history.scheduled_start.utc.strftime("%a %e %B %Y %H:%M:%S") if history.scheduled_start end child(:creator => :creator) {