From be2afb52c1fdeaa6063bc86b64d1901a06aa0d88 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 16 Nov 2020 15:19:28 +0800
Subject: [PATCH] MDL-67513 core: Only move modal to body if currently attached

A previous change as part of this commitset was intended to move the
modal to the document.body, but where the modal had been destroyed it
was instead added back to the body.
---
 lib/amd/build/modal.min.js              | Bin 9692 -> 9741 bytes
 lib/amd/build/modal.min.js.map          | Bin 48164 -> 48392 bytes
 lib/amd/build/modal_backdrop.min.js     | Bin 1321 -> 1371 bytes
 lib/amd/build/modal_backdrop.min.js.map | Bin 6849 -> 7079 bytes
 lib/amd/src/modal.js                    |   6 ++++--
 lib/amd/src/modal_backdrop.js           |   6 ++++--
 6 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/amd/build/modal.min.js b/lib/amd/build/modal.min.js
index 5aef006412e39bbfd506d6ea281a2db6f7153ac5..91677e841b5bc4dc1888c43001297ce190459b7e 100644
GIT binary patch
delta 68
zcmccP-RrZVT-Go%O(RhwB|o_|H#M(BFDXBzQd2K2GcQG>BqOs}FFmy+C_leMLsL^P
XCp9m<Btx@$a=ENJW9{bovbG!mZ`2rR

delta 20
ccmeD6x#PW|Tz2vbS@p?}q(nDAk=5h?0AL9SO#lD@

diff --git a/lib/amd/build/modal.min.js.map b/lib/amd/build/modal.min.js.map
index 11c184f4a30a94ddaf9b6026f1c8638b26df9dd1..e330a08ed15be7dea90e64e72eda60d4e06aa6e0 100644
GIT binary patch
delta 267
zcmZ4TgQ?>e(*_+&RvmXoN6*PRmRi<+I-ZV>Sx!36j*i7nI^K?s-o?&3{*I15I<Ah6
zB~Bo+*tx(-$Jf!(&>5sE+XYBETRP{tOxCmX-~_TgfC8>AldCM<tSy~NK}K0Pl{lHZ
z0Zq1a0vZb918o5DGQk#AfJkj8kiHCOka4BXj(L*<4J0-TTW#fIEZBU~!!eRyAu~-O
zvqT}YSfRKiGbd-VLbSY&0uTU&HB>ZG@{>z*Q}asnlJZk3HTBXm^HMZQGBS(x(o;)<
p^7BhHG$-q=lASEMNNe)q6|$4_XR=P7KZ|v8&SH_x`HQwn0ssU7Q;+}v

delta 127
zcmeD9#kAxH(*_;O$%d9%llNIFu(&$9I!=CW>1J)}RO+PT>}cXt;$-fo<LPMXR1D!~
zIe~eZAf96dh%|HZ0FstYE<m!-*)eZ&pn=5Z2CJ=nj5(XlJRKvM^<wfSKU!oq`D3*3
S<O#D`CkHGM*&Muht0VwK`YNFS

diff --git a/lib/amd/build/modal_backdrop.min.js b/lib/amd/build/modal_backdrop.min.js
index ec09403c485af4115be1b9b92540b8738291e6cc..1778e05571092f831fd58116b0321d36b832451c 100644
GIT binary patch
delta 65
zcmZ3<b(?F$Bo@QWG>t@!l>Fq<+|;}hy`=n<N=?1A%)Athl8nq^z4X+Qp#1z24NXnG
VoYcJZk_^r2$&*+#Chue^000ja7nA@1

delta 15
Xcmcc3wUTSYB$mmCSu`fUVaW#oG&u%S

diff --git a/lib/amd/build/modal_backdrop.min.js.map b/lib/amd/build/modal_backdrop.min.js.map
index 27718d9fd6dadd0b6d1250d41a3f462dcc2d2c73..df2f5596c297ec72b74e2d67bc0d54396a45a2bf 100644
GIT binary patch
delta 324
zcmX?Ty4-xj97f)>%)AsO9i^Pqy!4Wc%`+Jnv9ap7J34w!w&u{ZPSx>rbj)(nadvbp
zcGB^7bo9=1((!k6^wDv3bS!ZKk;TsWPCCAhj)u-4RoN~;(%I5E%XzXbhcAz_7m%Cd
z1QM*AJds0^v3T-o4p|FhCy=>5APu1=VBKLrqntf}0&XC+o{k_B{msD^J30bIoWp=b
z#U{=|f%^Qsl6-}dj8uiB{FF+Cy!@0@h0HXC%o2snVuj+8%$yvB#FCQ4<c!o51*k$7
ze_y?rJOwBKD%McZNXbtw%}vcK(F2*HsRs%LjgpMaV!ia#lA!$j5)DmFJxG{nDpVsh
TD=18!C}}X+f?sj+b;(x%h|*y8

delta 121
zcmZ2(e$aHo9LCLS80WK14&cz7e49g!E5pe}$Jw#e$uVHE0-G3P{$zDdS>7rq9ZyF`
zAE1O|sKMkwPANfSClJTc5lA|R0f~~$HJpV4Qb~!)*$Vl2CHV>^8L0|M`6-nOdHE@+
UdNFyE)1=HM{}2_MyjSWK0L#lJSpWb4

diff --git a/lib/amd/src/modal.js b/lib/amd/src/modal.js
index 3ca46d8a270..118d67902e1 100644
--- a/lib/amd/src/modal.js
+++ b/lib/amd/src/modal.js
@@ -735,8 +735,10 @@ define([
                 this.getRoot().removeClass('show').addClass('hide');
             }
 
-            // Ensure the modal is moved onto the body node.
-            $(document.body).append(this.getRoot());
+            // Ensure the modal is moved onto the body node if it is still attached to the DOM.
+            if ($(document.body).find(this.getRoot()).length) {
+                $(document.body).append(this.getRoot());
+            }
 
             this.root.trigger(ModalEvents.hidden, this);
         }.bind(this));
diff --git a/lib/amd/src/modal_backdrop.js b/lib/amd/src/modal_backdrop.js
index 9cc7448c3d2..1cbc1fd3960 100644
--- a/lib/amd/src/modal_backdrop.js
+++ b/lib/amd/src/modal_backdrop.js
@@ -142,8 +142,10 @@ define(['jquery', 'core/templates', 'core/notification', 'core/fullscreen'],
             this.getRoot().removeClass('show').addClass('hide');
         }
 
-        // Ensure the modal is moved back onto the body node.
-        $(document.body).append(this.getRoot());
+        // Ensure the modal is moved onto the body node if it is still attached to the DOM.
+        if ($(document.body).find(this.getRoot()).length) {
+            $(document.body).append(this.getRoot());
+        }
     };
 
     /**
-- 
2.17.1