From f3dec07a47e627dd5b7ae917d1505667efbeafaf Mon Sep 17 00:00:00 2001 From: thusithakalugamage Date: Tue, 11 Oct 2016 18:36:09 +0530 Subject: [PATCH 1/2] [EMM-1618] - related improvements on remaining occurences --- .../app/pages/mdm.page.policies/public/js/policy-list.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.policies/public/js/policy-list.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.policies/public/js/policy-list.js index 29671d333..1338ace7e 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.policies/public/js/policy-list.js +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.policies/public/js/policy-list.js @@ -91,9 +91,10 @@ function showPopup() { * hide popup function. */ function hidePopup() { - $(modalPopupContent).html(''); + $(modalPopupContent).html(""); + $(modalPopupContent).removeClass("operation-data"); $(modalPopup).modal('hide'); - $('body').removeClass('modal-open').css('padding-right', '0px'); + $('body').removeClass('modal-open').css('padding-right','0px'); $('.modal-backdrop').remove(); } From 70728a3e1771d809fb5cec102821fcbc4423f139 Mon Sep 17 00:00:00 2001 From: thusithakalugamage Date: Thu, 13 Oct 2016 18:52:42 +0530 Subject: [PATCH 2/2] Fixing device detail view pannel height defect --- .../app/units/mdm.unit.device.view/public/js/device-detail.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/js/device-detail.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/js/device-detail.js index c22633373..ddc267e1c 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/js/device-detail.js +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/js/device-detail.js @@ -70,7 +70,7 @@ var InitiateViewOption = null; if(arrowPosition >= parentHeight){ parentHeight = arrowPosition + 50; - $(arrow).siblings(".panel.active").height(parentHeight); + $(arrow).siblings(".panel.active").css("min-height",parentHeight); }else{ $(arrow).parent().removeAttr("style"); }