Merge pull request #851 from dod-ccpo/modal-freezing

Fix modal freezing fix

templates/components/delete_confirmation.html

@@ -1,13 +1,13 @@
 {% macro DeleteConfirmation(modal_id, delete_text, delete_action, form) %}
-  <delete-confirmation inline-template>
+  <delete-confirmation inline-template name="{{ modal_id }}" key="{{ modal_id }}">
     <div>
       <div class="usa-input">
-        <label for="deleted-text">
+        <label for="{{ modal_id }}-deleted-text">
           <span class="usa-input__help">
             {{ "common.delete_confirm" | translate }}
           </span>
         </label>
-        <input id="deleted-text" v-model="deleteText">
+        <input id="{{ modal_id }}-deleted-text" v-model="deleteText">
       </div>
       <div class="action-group">
         <form method="POST" action="{{ delete_action }}">

templates/components/modal.html

@@ -6,16 +6,16 @@
       <div class='modal__container'>
         <div class='modal__dialog' role='dialog' aria-modal='true'>
           <div class='modal__body'>
-              {{ caller() }}
+            {{ caller() }}
 
-              {% if dismissable %}
-                <button type='button' class='icon-link modal__dismiss' v-on:click='closeModal("{{name}}")'>
-                  {{ Icon('x') }}
-                  <span>
-                    {{ "common.close" | translate }}
-                  </span>
-                </button>
-              {% endif %}
+            {% if dismissable %}
+              <button type='button' class='icon-link modal__dismiss' v-on:click='closeModal("{{name}}")'>
+                {{ Icon('x') }}
+                <span>
+                  {{ "common.close" | translate }}
+                </span>
+              </button>
+            {% endif %}
           </div>
         </div>
       </div>