fixed popup examples

Author: Stephen Hodgson

Assets/HoloToolkit-Tests/Input/AnimationControllers/popup_test_ac.controller

@@ -104,6 +104,27 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
+--- !u!1101 &1101597836146319098
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 0}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 1
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0.5
+  m_HasExitTime: 1
+  m_HasFixedDuration: 0
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &1102000010492253350
 AnimatorState:
   serializedVersion: 5
@@ -185,7 +206,8 @@ AnimatorState:
   m_Name: Dehydrate Idle
   m_Speed: 1
   m_CycleOffset: 0
-  m_Transitions: []
+  m_Transitions:
+  - {fileID: 1101597836146319098}
   m_StateMachineBehaviours:
   - {fileID: 114000011696158288}
   m_Position: {x: 50, y: 50, z: 0}
@@ -227,6 +249,6 @@ AnimatorStateMachine:
   m_StateMachineBehaviours: []
   m_AnyStatePosition: {x: 0, y: 0, z: 0}
   m_EntryPosition: {x: 0, y: 120, z: 0}
-  m_ExitPosition: {x: 240, y: 0, z: 0}
+  m_ExitPosition: {x: 264, y: 144, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
   m_DefaultState: {fileID: 1102000011298420914}

Assets/HoloToolkit-Tests/Input/Scripts/PopupMenu.cs

@@ -15,24 +15,27 @@ public class PopupMenu : MonoBehaviour, IInputClickHandler
         private Animator rootAnimator = null;
 
         [SerializeField]
-        private bool isModal = false;
+        private bool isModal;
 
         [SerializeField]
-        private bool closeOnNonTargetedTap = false;
+        private bool closeOnNonTargetedTap;
 
-        private Action activatedCallback;   // called when 'place' is selected
-        private Action cancelledCallback;   // called when 'back' or 'hide' is selected
-        private Action deactivatedCallback;   // called when the user clicks outside of the menu
+        /// <summary>
+        /// alled when 'place' is selected
+        /// </summary>
+        private Action activatedCallback;
 
-        public PopupState CurrentPopupState = PopupState.Closed;
+        /// <summary>
+        /// Called when 'back' or 'hide' is selected
+        /// </summary>
+        private Action cancelledCallback;
 
-        public GameObject RootObject
-        {
-            get
-            {
-                return this.gameObject;
-            }
-        }
+        /// <summary>
+        /// Called when the user clicks outside of the menu
+        /// </summary>
+        private Action deactivatedCallback;
+
+        public PopupState CurrentPopupState = PopupState.Closed;
 
         public enum PopupState { Open, Closed }
 
@@ -77,9 +80,9 @@ public void Show(Action _activatedCallback = null, Action _cancelledCallback = n
             }
 
             // the visual was activated via an interaction outside of the menu, let anyone who cares know
-            if (this.activatedCallback != null)
+            if (activatedCallback != null)
             {
-                this.activatedCallback();
+                activatedCallback();
             }
         }
 
@@ -88,16 +91,6 @@ public void Show(Action _activatedCallback = null, Action _cancelledCallback = n
         /// </summary>
         public void Dismiss()
         {
-            // Deactivates the game object
-            if (rootAnimator.isInitialized)
-            {
-                rootAnimator.SetTrigger("Dehydrate");
-            }
-            else
-            {
-                gameObject.SetActive(false);
-            }
-
             if (deactivatedCallback != null)
             {
                 deactivatedCallback();
@@ -123,6 +116,16 @@ public void Dismiss()
             {
                 cancelButton.Selected = false;
             }
+
+            // Deactivates the game object
+            if (rootAnimator.isInitialized)
+            {
+                rootAnimator.SetTrigger("Dehydrate");
+            }
+            else
+            {
+                gameObject.SetActive(false);
+            }
         }
 
         private void OnCancelPressed(TestButton source)