From aff6df70287023a4e30a59d5090c8f80ed8a478c Mon Sep 17 00:00:00 2001 From: Seth Call Date: Wed, 23 Oct 2013 14:59:18 +0000 Subject: [PATCH] * VRFS-797; don't allow the add track handler to be registered > 1 times --- web/app/assets/javascripts/layout.js | 8 +++++++- web/app/assets/javascripts/session.js | 4 +++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/web/app/assets/javascripts/layout.js b/web/app/assets/javascripts/layout.js index 8bf5fa184..512fe2484 100644 --- a/web/app/assets/javascripts/layout.js +++ b/web/app/assets/javascripts/layout.js @@ -409,6 +409,7 @@ } function closeDialog(dialog) { + console.log("closing dialog: " + dialog); var $dialog = $('[layout-id="' + dialog + '"]'); dialogEvent(dialog, 'beforeHide'); var $overlay = $('.dialog-overlay'); @@ -472,6 +473,7 @@ * also moves the .dialog-overlay such that it hides/obscures all dialogs except the highest one */ function stackDialogs($dialog, $overlay) { + console.log("pushing dialog: " + $dialog.attr('layout-id')) openDialogs.push($dialog); var zIndex = 1000; for(var i in openDialogs) { @@ -484,7 +486,11 @@ function unstackDialogs($overlay) { if(openDialogs.length > 0) { - openDialogs.pop(); + var removed = openDialogs.pop(); + console.log("removed dialog : " + removed.attr('layout-id')); + } + else { + console.log("no dialog removed because nothing was on the stack"); } var zIndex = 1000 + openDialogs.length; diff --git a/web/app/assets/javascripts/session.js b/web/app/assets/javascripts/session.js index da9128261..31767142e 100644 --- a/web/app/assets/javascripts/session.js +++ b/web/app/assets/javascripts/session.js @@ -440,7 +440,9 @@ addNewGearDialog = new context.JK.AddNewGearDialog(app, ftueCallback); // # NO LONGER HIDING ADD TRACK even when there are 2 tracks (VRFS-537) - $('#div-add-track').click(function() { + + $('#div-add-track').off('click'); + $('#div-add-track').on('click', function() { if (myTracks.length === 2) { $('#btn-error-ok').click(function() { app.layout.closeDialog('error-dialog');