From 6e1e801ea056a3e82a29305f2537ceae1ecd9d8c Mon Sep 17 00:00:00 2001
From: Imesh Chandrasiri <dimal.chandrasiri@gmail.com>
Date: Sat, 14 Jan 2017 23:50:34 +0530
Subject: [PATCH] Fix for multiple popup issue

---
 .../app/units/cdmf.unit.lib.qrcode/qrcode.hbs |  7 -----
 .../cdmf.unit.ui.modal/public/js/modal.js     | 26 +++++++++++++------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.lib.qrcode/qrcode.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.lib.qrcode/qrcode.hbs
index d63ee909652..07ee1b4801a 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.lib.qrcode/qrcode.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.lib.qrcode/qrcode.hbs
@@ -67,11 +67,4 @@
             });
         }
     </script>
-    <script type="text/javascript">
-        function toggleEnrollment(){
-            $(".modal-content").html($("#qr-code-modal").html());
-            generateQRCode(".modal-content .qr-code");
-            showQRCodePopup();
-        }
-    </script>
 {{/zone}}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.modal/public/js/modal.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.modal/public/js/modal.js
index 0e97b964b73..29c29bf7a86 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.modal/public/js/modal.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.modal/public/js/modal.js
@@ -20,15 +20,15 @@
 var modalDialog = (function () {
     var publicMethoads = {};
     publicMethoads.header = function (headerText) {
-        $("#modal-title-text").html(headerText);
+        $("#basic-modal-view #modal-title-text").html(headerText);
 
     };
     publicMethoads.content = function (contentText) {
-        $("#modal-content-text").html(contentText);
+        $("#basic-modal-view #modal-content-text").html(contentText);
 
     };
     publicMethoads.footer = function (footerContent) {
-        $("#modal-footer-content").html(footerContent);
+        $("#basic-modal-view #modal-footer-content").html(footerContent);
 
     };
     publicMethoads.footerButtons = function (buttonList) {
@@ -37,7 +37,7 @@ var modalDialog = (function () {
             footerContent = footerContent + '<div class="buttons"><a href="#" id="' + btn.id +
                 '" class="btn-operations">' + btn.text + '</a></div>';
         }
-        $("#modal-footer-content").html(footerContent);
+        $("#basic-modal-view #modal-footer-content").html(footerContent);
     };
     publicMethoads.show = function () {
 
@@ -62,11 +62,21 @@ var modalDialog = (function () {
     publicMethoads.hide = function () {
         $("#basic-modal-view").addClass('hidden');
         $("#basic-modal-view").modal('hide');
-        $("#modal-title-text").html("");
-        $("#modal-content-text").html("");
-        $("#modal-footer-content").html("");
-        $('body').removeClass('modal-open').css('padding-right', '0px');
         $('.modal-backdrop').remove();
     };
+
+    $("#basic-modal-view").on('hidden.bs.modal', function () {
+        $('#basic-modal-view .modal-dialog').html('<div class="modal-content"><div class="modal-header">' +
+            '<h3 class="pull-left modal-title"><span class="fw-stack error-msg-icon hidden">' +
+            '<i class="fw fw-circle-outline fw-stack-2x"></i><i class="fw fw-error fw-stack-1x"></i></span>' +
+            '<span class="fw-stack warning-msg-icon hidden"><i class="fw fw-circle-outline fw-stack-2x"></i>' +
+            '<i class="fw fw-warning fw-stack-1x"></i></span><span id="modal-title-text"></span></h3>' +
+            '<button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i>' +
+            '</button></div><div class="modal-body add-margin-top-2x add-margin-bottom-2x">' +
+            '<div id="modal-content-text"></div></div>' +
+            '<div class="modal-footer" id="modal-footer-content"></div></div>');
+        $('body').removeClass('modal-open').css('padding-right', '0px');
+    });
+
     return publicMethoads;
 }(modalDialog));
\ No newline at end of file