From daecbd8a2defaf278e8324a298ebe570d99c5f29 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Sun, 2 Nov 2014 13:15:30 -0600 Subject: [PATCH] * VRFS-2440 - open FTUE immediately after dialog --- .../javascripts/accounts_audio_profile.js | 3 +-- .../dialog/gettingStartedDialog.js | 23 ++++++++++++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/web/app/assets/javascripts/accounts_audio_profile.js b/web/app/assets/javascripts/accounts_audio_profile.js index 1ac004c20..1e646a4cf 100644 --- a/web/app/assets/javascripts/accounts_audio_profile.js +++ b/web/app/assets/javascripts/accounts_audio_profile.js @@ -219,8 +219,7 @@ }; app.cancelFtue = function() { showingGearWizard = false; populateAccountAudio() }; showingGearWizard = true; - app.layout.startNewFtue(); - + app.layout.startNewFtue() } function reloadAudio() { diff --git a/web/app/assets/javascripts/dialog/gettingStartedDialog.js b/web/app/assets/javascripts/dialog/gettingStartedDialog.js index ff93b8fc7..6fc114f74 100644 --- a/web/app/assets/javascripts/dialog/gettingStartedDialog.js +++ b/web/app/assets/javascripts/dialog/gettingStartedDialog.js @@ -10,13 +10,34 @@ var $dontShowAgain = null; var $setupGearBtn = null; + function handleStartAudioQualification() { + + app.afterFtue = function() { + app.layout.showDialog('join-test-session'); + }; + app.cancelFtue = function() { }; + app.layout.startNewFtue() + } function registerEvents() { $setupGearBtn.click(function() { if (gon.isNativeClient) { + app.layout.closeDialog('getting-started'); - window.location = '/client#/account/audio' + + // if no profiles, show FTUE in-line, if any, redirect to audio profile line + var profiles = context.jamClient.FTUEGetAllAudioConfigurations(); + + if(profiles && profile.length > 0) { + window.location = '/client#/account/audio' + } + else + { + handleStartAudioQualification(); + } + + } else { context.JK.guardAgainstBrowser(app, {d1: 'gear'});