Merge pull request #522 from DimalChandrasiri/release-3.0.x

Fix for multiple popup issue

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/public/js/download.js

@@ -67,6 +67,6 @@ function attachEvents() {
     function toggleEnrollment(){
         $(modalPopupContent).html($("#qr-code-modal").html());
         generateQRCode(modalPopupContent + " .qr-code");
-        showPopup();
+        modalDialog.show();
     }
 }

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs

@@ -282,16 +282,5 @@
 
 {{#zone "bottomJs"}}
     {{js "/js/download.js"}}
-    <script type="text/javascript">
-        $(".download-link").click(function () {
-            toggleEnrollment();
-        });
-
-        function toggleEnrollment() {
-            $(".modalpopup-content").html($("#qr-code-modal").html());
-            generateQRCode(".modalpopup-content .qr-code");
-            showPopup();
-        }
-    </script>
     {{js "/js/jquery.validate.js"}}
 {{/zone}}

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/js/type-view.js

@@ -73,10 +73,9 @@ function generateQRCode(qrCodeClass) {
 }
 
 function toggleEnrollment() {
-    console.log("something happenedfd!");
     $(".modal-content").html($("#qr-code-modal").html());
     generateQRCode(".modal-content .qr-code");
-    showPopup();
+    modalDialog.show();
 }
 
 var updateNotificationCountOnSuccess = function (data, textStatus, jqXHR) {
@@ -345,10 +344,6 @@ $.fn.collapse_nav_sub = function () {
     }
 };
 
-$(".download-link").click(function(){
-    toggleEnrollment();
-});
-
 $(document).ready(function () {
     $.sidebar_toggle();
     if (typeof $.fn.collapse == 'function') {

components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/public/js/type-view.js

@@ -75,7 +75,7 @@ function generateQRCode(qrCodeClass) {
 function toggleEnrollment() {
     $(".modal-content").html($("#qr-code-modal").html());
     generateQRCode(".modal-content .qr-code");
-    showPopup();
+    modalDialog.show();
 }
 
 var updateNotificationCountOnSuccess = function (data, textStatus, jqXHR) {