From 24d3c1bd8a8274db977a47826e02839cdb236849 Mon Sep 17 00:00:00 2001
From: "Emanuel F. Oliveira" <emfolg@gmail.com>
Date: Thu, 10 Nov 2016 11:59:27 -0200
Subject: [PATCH] LT-295 HUD menu should be closed whenever a case is closed.

---
 .../toolbarSection/toolbarSection.js           |  4 ++--
 .../measurementTableHUD.html                   |  2 +-
 .../measurementTableHUD/measurementTableHUD.js | 18 +++++++++++++++++-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/LesionTracker/client/components/toolbarSection/toolbarSection.js b/LesionTracker/client/components/toolbarSection/toolbarSection.js
index 7f04e9acc..5b4d1bc77 100644
--- a/LesionTracker/client/components/toolbarSection/toolbarSection.js
+++ b/LesionTracker/client/components/toolbarSection/toolbarSection.js
@@ -144,7 +144,7 @@ Template.toolbarSection.helpers({
 });
 
 Template.toolbarSection.events({
-    'click #toggleHUD'() {
+    'click #toggleHUD'(event) {
         const $this = $(event.currentTarget).find('#toggleHUD');
 
         // Stop here if the tool is disabled
@@ -155,7 +155,7 @@ Template.toolbarSection.events({
         const state = Session.get('measurementTableHudOpen');
         Session.set('measurementTableHudOpen', !state);
     },
-    'click #toggleTrial'() {
+    'click #toggleTrial'(event) {
         const $this = $(event.currentTarget).find('#toggleHUD');
 
         // Stop here if the tool is disabled
diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTableHUD/measurementTableHUD.html b/Packages/ohif-measurements/client/components/measurementTable/measurementTableHUD/measurementTableHUD.html
index 51b74cea5..045a3ca8c 100644
--- a/Packages/ohif-measurements/client/components/measurementTable/measurementTableHUD/measurementTableHUD.html
+++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTableHUD/measurementTableHUD.html
@@ -1,5 +1,5 @@
 <template name="measurementTableHUD">
-    <div id="measurementTableHUD" class="dialog-animated {{hudHidden}}">
+    <div id="measurementTableHUD" class="{{hudHidden}}">
         <div class="header">
             <span>Measurements</span>
             <svg class="buttonClose">
diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTableHUD/measurementTableHUD.js b/Packages/ohif-measurements/client/components/measurementTable/measurementTableHUD/measurementTableHUD.js
index c3b3420b2..13658508a 100644
--- a/Packages/ohif-measurements/client/components/measurementTable/measurementTableHUD/measurementTableHUD.js
+++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTableHUD/measurementTableHUD.js
@@ -1,11 +1,19 @@
 Template.measurementTableHUD.onCreated(() => {
     const instance = Template.instance();
 
+    instance.isRemoved = true;
     if (instance.data.timepointApi) {
         instance.data.timepoints = new ReactiveVar(instance.data.timepointApi.currentAndPrior());    
     }
 });
 
+Template.measurementTableHUD.onDestroyed(() => {
+    const instance = Template.instance();
+
+    instance.isRemoved = true;
+    Session.set('measurementTableHudOpen', false);
+});
+
 Template.measurementTableHUD.onRendered(() => {
     const instance = Template.instance();
     instance.$('#measurementTableHUD').resizable().draggable();
@@ -19,7 +27,15 @@ Template.measurementTableHUD.events({
 
 Template.measurementTableHUD.helpers({
     hudHidden() {
-        return Session.get('measurementTableHudOpen') ? 'dialog-open' : 'dialog-closed';
+        let instance = Template.instance(),
+            isOpen = Session.get('measurementTableHudOpen');
+
+        if (isOpen) {
+            instance.isRemoved = false;
+            return 'dialog-animated dialog-open';
+        }
+
+        return instance.isRemoved !== true ? 'dialog-animated dialog-closed' : 'hidden';
     },
     toolbarButtons() {
         let buttonData = [];