From 76a4a13c41aabaecc06c2b62d62bac720f36baee Mon Sep 17 00:00:00 2001 From: Seth Call Date: Wed, 6 May 2015 22:44:16 -0500 Subject: [PATCH] * fixed the message that occurs when gear goes in/out of USB during FTUE --- .../assets/javascripts/accounts_audio_profile.js | 2 +- .../javascripts/jam_track_screen.js.coffee | 3 +++ web/app/views/clients/_help.html.slim | 16 ++++++++-------- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/web/app/assets/javascripts/accounts_audio_profile.js b/web/app/assets/javascripts/accounts_audio_profile.js index 915383acc..a84c521bb 100644 --- a/web/app/assets/javascripts/accounts_audio_profile.js +++ b/web/app/assets/javascripts/accounts_audio_profile.js @@ -165,7 +165,7 @@ if(!gearUtils.canBeConfigured(audioProfileId)) { - context.JK.Banner.showAlert("The System Default (Playback Only) profile can not currently be configured."); + context.JK.Banner.showAlert("The System Default (Playback Only) profile can not be configured."); return; } diff --git a/web/app/assets/javascripts/jam_track_screen.js.coffee b/web/app/assets/javascripts/jam_track_screen.js.coffee index c80970df6..bef29e944 100644 --- a/web/app/assets/javascripts/jam_track_screen.js.coffee +++ b/web/app/assets/javascripts/jam_track_screen.js.coffee @@ -29,6 +29,9 @@ context.JK.JamTrackScreen=class JamTrackScreen @app.user().done((user) => @user = user this.refresh() + ).fail((arg) => + @logger.error("app.user.done failed: " + JSON.stringify(arg)) + throw 'fail should not occur if user is available' ) else this.refresh() diff --git a/web/app/views/clients/_help.html.slim b/web/app/views/clients/_help.html.slim index f0eeaca3e..c7fe1b5a0 100644 --- a/web/app/views/clients/_help.html.slim +++ b/web/app/views/clients/_help.html.slim @@ -157,24 +157,24 @@ script type="text/template" id="template-help-musician-score-self" script type="text/template" id="template-help-gear-wizard-inputs-changed" .help-inputs-changed | {% if(data.missingInputDevice) { %} - p - | {{ data.missingInputDevice }} is no longer connected or malfunctioning. + p + | {{ data.missingInputDevice }} is no longer connected or malfunctioning. | {% } %} | {% if(data.newInputDevice) { %} - p - | {{ data.newInputDevice }} is now available. + p + | {{ data.newInputDevice }} is now available. | {% } %} script type="text/template" id="template-help-gear-wizard-outputs-changed" .help-outputs-changed | {% if(data.missingOutputDevice) { %} - p - | {{ data.missingOutputDevice }} is no longer connected or malfunctioning. + p + | {{ data.missingOutputDevice }} is no longer connected or malfunctioning. | {% } %} | {% if(data.newOutputDevice) { %} - p - | {{ data.newOutputDevice }} is now available. + p + | {{ data.newOutputDevice }} is now available. | {% } %}