diff --git a/web/app/assets/javascripts/networkTestHelper.js b/web/app/assets/javascripts/networkTestHelper.js index 098764b4e..b5f2e1855 100644 --- a/web/app/assets/javascripts/networkTestHelper.js +++ b/web/app/assets/javascripts/networkTestHelper.js @@ -328,8 +328,8 @@ } else if(isWireless == 1) { context.JK.Banner.showAlert({buttons: [ - {name: 'RUN NETWORK TEST ANYWAY', click: function() {startNetworkTest(false)}}, - {name: 'CANCEL', click: function() {}}], + {name: 'CANCEL', click: function() {}}, + {name: 'RUN NETWORK TEST ANYWAY', click: function() {startNetworkTest(false)}} ], html: "
It appears that your computer is connected to your network using WiFi.
" + "We strongly advise against running the JamKazam application on a WiFi connection. " + "We recommend using a wired Ethernet connection from your computer to your router. " + diff --git a/web/app/assets/javascripts/utils.js b/web/app/assets/javascripts/utils.js index 7bec7aefa..83922fee9 100644 --- a/web/app/assets/javascripts/utils.js +++ b/web/app/assets/javascripts/utils.js @@ -580,6 +580,10 @@ return $item; } + // returns: + // * Win32 + // * MacOSX + // * Unix context.JK.GetOSAsString = function() { if(!os) { os = context.jamClient.GetOSAsString(); diff --git a/web/app/assets/javascripts/wizard/gear/step_configure_tracks.js b/web/app/assets/javascripts/wizard/gear/step_configure_tracks.js index 495bf07e3..9f31c4a0e 100644 --- a/web/app/assets/javascripts/wizard/gear/step_configure_tracks.js +++ b/web/app/assets/javascripts/wizard/gear/step_configure_tracks.js @@ -15,6 +15,10 @@ var $step = null; var successfullyAssignedOnce = false; + function handleHelp() { + return "https://jamkazam.desk.com/customer/portal/articles/1599961-first-time-setup---step-3---configure-tracks"; + } + function handleNext() { var saved = configureTracksHelper.trySave(); @@ -42,6 +46,7 @@ configureTracksHelper.initialize($step); } + this.handleHelp = handleHelp; this.newSession = newSession; this.handleNext = handleNext; this.beforeShow = beforeShow; diff --git a/web/app/assets/javascripts/wizard/gear/step_configure_voice_chat.js b/web/app/assets/javascripts/wizard/gear/step_configure_voice_chat.js index 98e189dea..00d00e484 100644 --- a/web/app/assets/javascripts/wizard/gear/step_configure_voice_chat.js +++ b/web/app/assets/javascripts/wizard/gear/step_configure_voice_chat.js @@ -20,6 +20,10 @@ var voiceChatHelper = new context.JK.VoiceChatHelper(app); var firstTimeShown = false; + function handleHelp() { + return "https://jamkazam.desk.com/customer/portal/articles/1599963-first-time-setup---step-4---configure-voice-chat"; + } + function newSession() { firstTimeShown = true; } @@ -47,6 +51,7 @@ } + this.handleHelp = handleHelp; this.handleNext = handleNext; this.newSession = newSession; this.beforeShow = beforeShow; diff --git a/web/app/assets/javascripts/wizard/gear/step_direct_monitoring.js b/web/app/assets/javascripts/wizard/gear/step_direct_monitoring.js index aeb79bec3..f76e0abaf 100644 --- a/web/app/assets/javascripts/wizard/gear/step_direct_monitoring.js +++ b/web/app/assets/javascripts/wizard/gear/step_direct_monitoring.js @@ -49,6 +49,10 @@ } } + function handleHelp() { + return "https://jamkazam.desk.com/customer/portal/articles/1599967-first-time-setup---step-5---turn-off-direct-monitoring"; + } + function handleNext() { } @@ -87,6 +91,7 @@ $directMonitoringBtn.on('click', togglePlay); } + this.handleHelp = handleHelp; this.handleNext = handleNext; this.newSession = newSession; this.beforeShow = beforeShow; diff --git a/web/app/assets/javascripts/wizard/gear/step_network_test.js b/web/app/assets/javascripts/wizard/gear/step_network_test.js index 4b8df386e..edf113b15 100644 --- a/web/app/assets/javascripts/wizard/gear/step_network_test.js +++ b/web/app/assets/javascripts/wizard/gear/step_network_test.js @@ -39,6 +39,10 @@ dialog.setBackState(!networkTest.isScoring()); } + function handleHelp() { + return "https://jamkazam.desk.com/customer/portal/articles/1599969-first-time-setup---step-6---test-your-network"; + } + function newSession() { networkTest.reset(); updateButtons(); @@ -62,6 +66,7 @@ .on(networkTest.NETWORK_TEST_START, networkTestStart) } + this.handleHelp = handleHelp; this.newSession = newSession; this.beforeHide = beforeHide; this.beforeShow = beforeShow; diff --git a/web/app/assets/javascripts/wizard/gear/step_select_gear.js b/web/app/assets/javascripts/wizard/gear/step_select_gear.js index d0c5b10a2..3f18d0054 100644 --- a/web/app/assets/javascripts/wizard/gear/step_select_gear.js +++ b/web/app/assets/javascripts/wizard/gear/step_select_gear.js @@ -795,6 +795,15 @@ initializeNextButtonState(); } + function handleHelp() { + if(operatingSystem == "Win32") { + return "https://jamkazam.desk.com/customer/portal/articles/1599818-first-time-setup---step-2---select-and-test-audio-gear---windows-"; + } + else { + return "https://jamkazam.desk.com/customer/portal/articles/1599845-first-time-setup---step-2---select-and-test-audio-gear---mac"; + } + } + function handleNext() { if(!savedProfile) { @@ -919,6 +928,7 @@ this.getLastAudioTestFailAnalytics = getLastAudioTestFailAnalytics; this.handleNext = handleNext; this.newSession = newSession; + this.handleHelp = handleHelp; this.beforeShow = beforeShow; this.beforeHide = beforeHide; this.beforeWizardShow = beforeWizardShow; diff --git a/web/app/assets/javascripts/wizard/gear/step_understand_gear.js b/web/app/assets/javascripts/wizard/gear/step_understand_gear.js index 648b741dd..605089717 100644 --- a/web/app/assets/javascripts/wizard/gear/step_understand_gear.js +++ b/web/app/assets/javascripts/wizard/gear/step_understand_gear.js @@ -8,6 +8,10 @@ var $step = null; var operatingSystem; + function handleHelp() { + return "https://jamkazam.desk.com/customer/portal/articles/1599817-first-time-setup---step-1"; + } + function beforeShow() { var $watchVideo = $step.find('.watch-video'); var videoUrl = 'https://www.youtube.com/watch?v=NiELWY769Tw'; @@ -23,6 +27,7 @@ operatingSystem = context.JK.GetOSAsString(); } + this.handleHelp = handleHelp; this.beforeShow = beforeShow; this.initialize = initialize; diff --git a/web/app/assets/javascripts/wizard/wizard.js b/web/app/assets/javascripts/wizard/wizard.js index 3d8bf4307..e3a6eaed3 100644 --- a/web/app/assets/javascripts/wizard/wizard.js +++ b/web/app/assets/javascripts/wizard/wizard.js @@ -76,6 +76,20 @@ return false; } + function help() { + if ($(this).is('.disabled')) return false; + + var stepInfo = STEPS[step]; + if(stepInfo.handleHelp) { + var result = stepInfo.handleHelp.call(stepInfo); + if(!result) {return false;} + + context.JK.popExternalLink(result); + } + + return false; + } + function moveToStep() { var $nextWizardStep = $wizardSteps.filter($('[layout-wizard-step=' + step + ']')); @@ -119,6 +133,7 @@ $btnCancel.hide(); } + $btnHelp.on('click', help); $btnNext.on('click', next); $btnBack.on('click', back); $btnClose.on('click', function() {$self.triggerHandler('wizard_close'); return false;});