community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix UI loading issue on Safari 11.0.3 (#1212)

Browse Source 
* Fix UI loading issue on Safari 11.0.3

Fix the issue of operation logs and location doesn't display on device detail page on safari browser 11.0.3

Fixes wso2/product-iots#1752

* Add comments describing code lines
This commit is contained in:
Madhawa Perera 2018-03-09 17:43:33 +05:30 committed by GitHub
parent 873bff0042
commit 3fa513cabd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs
View File

@ -736,6 +736,7 @@
var geoLocationLink = $(".initGeoLocationLink"); var geoLocationLink = $(".initGeoLocationLink");
if (geoLocationLink) { if (geoLocationLink) {
geoLocationLink.on('click', function () { geoLocationLink.on('click', function () {
loadGeoFencing();
initializeGeoLocation({{geoServicesEnabled}}); initializeGeoLocation({{geoServicesEnabled}});
}); });
geoPublicUri = $("#geo-charts").data("geo-public-uri"); geoPublicUri = $("#geo-charts").data("geo-public-uri");

3
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/app.js
View File

@ -46,7 +46,8 @@ function initialLoad(geoFencingEnabled) {
} }
function initializeMap() { function initializeMap() {
if (typeof(map) !== 'undefined') { ///map.zoomControl is added to fix UI loading issue on Safari
if (typeof(map) !== 'undefined' && map.zoomControl != null) {
map.remove(); map.remove();
} }
if (document.getElementById('map') == null) { if (document.getElementById('map') == null) {

5
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_fencing.js
View File

@ -23,10 +23,9 @@ var drawnItems;
var lastId; var lastId;
var controlDiv; var controlDiv;
loadGeoFencing();
function loadGeoFencing() { function loadGeoFencing() {
if (map == null) { ///map.zoomControl is added to fix UI loading issue on Safari
if (map == null || map.zoomControl == null) {
setTimeout(loadGeoFencing, 1000); // give everything some time to render setTimeout(loadGeoFencing, 1000); // give everything some time to render
} else { } else {
map.on('draw:created', function (e) { map.on('draw:created', function (e) {