diff --git a/web/app/assets/javascripts/addNewGear.js b/web/app/assets/javascripts/addNewGear.js index 4d7ba9907..e835ef4b9 100644 --- a/web/app/assets/javascripts/addNewGear.js +++ b/web/app/assets/javascripts/addNewGear.js @@ -3,18 +3,17 @@ "use strict"; context.JK = context.JK || {}; - context.JK.AddNewGearDialog = function(app, ftueCallback) { + context.JK.AddNewGearDialog = function(app) { var logger = context.JK.logger; function events() { $('#btn-leave-session-test').click(function() { - ftueCallback(); - // TODO: THIS IS A HACK - THIS DIALOG IS LAYERED - // ON TOP OF OTHER DIALOGS. ANY OTHER DIALOGS THAT - // USE THIS NEED TO BE ADDED TO THE FOLLOWING LIST. - // NEED TO FIGURE OUT A CLEANER WAY TO HANDLE THIS. app.layout.closeDialog('configure-audio'); + + context.location = "/client#/home"; + + app.layout.startNewFtue(); }); $('#btn-cancel-new-audio').click(function() { diff --git a/web/app/assets/javascripts/session.js b/web/app/assets/javascripts/session.js index 98a0f9440..315084f39 100644 --- a/web/app/assets/javascripts/session.js +++ b/web/app/assets/javascripts/session.js @@ -840,12 +840,7 @@ }); configureTrackDialog = new context.JK.ConfigureTrackDialog(app, myTracks, sessionId, sessionModel); - addNewGearDialog = new context.JK.AddNewGearDialog(app, ftueCallback); - } - - function ftueCallback() { - context.location = "/client#/home"; - app.layout.showDialog('ftue'); + addNewGearDialog = new context.JK.AddNewGearDialog(app); } function connectTrackToMixer(trackSelector, clientId, mixerId, gainPercent) { diff --git a/websocket-gateway/spec/jam_websockets/router_spec.rb b/websocket-gateway/spec/jam_websockets/router_spec.rb index 9fc55706a..0a41177f5 100644 --- a/websocket-gateway/spec/jam_websockets/router_spec.rb +++ b/websocket-gateway/spec/jam_websockets/router_spec.rb @@ -144,7 +144,7 @@ describe Router do describe "login" do it "should not allow login of bogus user", :mq => true do - pending "broken currenly" + pending "broken currently due to some" #em do TestClient = Class.new do