Skip to content
Snippets Groups Projects
Commit f3f962a4 authored by bpresles's avatar bpresles
Browse files

Fixes scroll locked after closing modals. Fixes potential UI freeze on iOS....

Fixes scroll locked after closing modals. Fixes potential UI freeze on iOS. Fixes cordova-plugin-minisodium installation from NPM
parent 070765d6
No related branches found
No related tags found
No related merge requests found
Pipeline #6958 skipped
......@@ -33,24 +33,25 @@
"cordova": "^9.0.0",
"cordova-android": "6.4.0",
"cordova-ios": "https://github.com/bpresles/cordova-ios.git#5.1.0",
"cordova-osx": "^5.0.0",
"cordova-plugin-camera": "^2.4.1",
"cordova-plugin-compat": "^1.2.0",
"cordova-plugin-console": "^1.0.7",
"cordova-plugin-console": "^1.1.0",
"cordova-plugin-crosswalk-webview": "^2.3.0",
"cordova-plugin-device": "^1.1.6",
"cordova-plugin-dialogs": "^1.3.3",
"cordova-plugin-minisodium": "https://github.com/E-IS/cordova-plugin-minisodium/archive/v1.0.1.tar.gz",
"cordova-plugin-device": "^1.1.7",
"cordova-plugin-dialogs": "^1.3.4",
"cordova-plugin-minisodium": "git+https://github.com/bpresles/cordova-plugin-minisodium.git",
"cordova-plugin-secure-storage": "^2.6.8",
"cordova-plugin-splashscreen": "^3.2.2",
"cordova-plugin-statusbar": "^2.4.2",
"cordova-plugin-vibration": "^2.1.5",
"cordova-plugin-statusbar": "^2.4.3",
"cordova-plugin-vibration": "^2.1.6",
"cordova-plugin-websocket": "^0.12.2",
"cordova-plugin-whitelist": "^1.3.2",
"cordova-plugin-x-toast": "^2.6.0",
"cordova-plugin-whitelist": "^1.3.4",
"cordova-plugin-x-toast": "^2.7.2",
"ionic-plugin-keyboard": "^2.2.1",
"moment": "~2.19.3",
"numeral": "1.5.3",
"phonegap-plugin-barcodescanner": "https://github.com/phonegap/phonegap-plugin-barcodescanner.git"
"phonegap-plugin-barcodescanner": "git+https://github.com/phonegap/phonegap-plugin-barcodescanner.git"
},
"devDependencies": {
"bower": "^1.8.0",
......@@ -115,7 +116,7 @@
"cordova-clipboard",
{
"id": "cordova-plugin-minisodium",
"locator": "https://github.com/E-IS/cordova-plugin-minisodium.git"
"locator": "https://github.com/bpresles/cordova-plugin-minisodium.git"
},
{
"id": "phonegap-plugin-barcodescanner",
......@@ -130,8 +131,7 @@
},
{
"platform": "android",
"version": "6.4.0",
"locator": "android@6.4.0"
"locator": "osx"
}
],
"cordova": {
......@@ -155,7 +155,8 @@
},
"platforms": [
"ios",
"android"
"android",
"osx"
]
}
}
\ No newline at end of file
......@@ -462,6 +462,11 @@ html, body {
}
}
// Fix for iOS 11+
.ios ion-content {
pointer-events: auto;
}
.popover-share {
height: 110px;
......
This diff is collapsed.
......@@ -65,6 +65,8 @@ angular.module('cesium.modal.services', ['cesium.utils.services'])
return $scope.modal.remove()
.then(function() {
// Workaround modal-open not removed
document.body.classList.remove('modal-open');
$scope.deferred.resolve(result);
return result;
});
......@@ -94,7 +96,10 @@ angular.module('cesium.modal.services', ['cesium.utils.services'])
$timeout(function() {
$scope.deferred.resolve();
return $scope.modal.remove();
return $scope.modal.remove().then(function() {
// Workaround modal-open not removed
document.body.classList.remove('modal-open');
});
}, ($scope.modal.hideDelay || 320) + 20);
}
});
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment