Skip to content

Commit 7c26bdb

Browse files
committed
window.Capacitor.isNativePlatform
fixes #4325
1 parent 36b6724 commit 7c26bdb

File tree

4 files changed

+15
-4
lines changed

4 files changed

+15
-4
lines changed

src/core/components/statusbar/statusbar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const isCapacitor = () => {
77
const window = getWindow();
88
return (
99
window.Capacitor &&
10-
window.Capacitor.isNative &&
10+
(window.Capacitor.isNative || window.Capacitor.isNativePlatform) &&
1111
window.Capacitor.Plugins &&
1212
window.Capacitor.Plugins.StatusBar
1313
);

src/core/modules/router/router-class.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -890,7 +890,10 @@ class Router extends Framework7Class {
890890
const { browserHistory, browserHistoryOnLoad, browserHistorySeparator } = router.params;
891891
let { browserHistoryRoot } = router.params;
892892
if (
893-
(window.cordova || (window.Capacitor && window.Capacitor.isNative)) &&
893+
(window.cordova ||
894+
(window.Capacitor &&
895+
(window.Capacitor.isNative ||
896+
(window.Capacitor.isNativePlatform && window.Capacitor.isNativePlatform())))) &&
894897
browserHistory &&
895898
!browserHistorySeparator &&
896899
!browserHistoryRoot &&

src/core/modules/service-worker/service-worker.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,13 @@ export default {
8686
const window = getWindow();
8787
if (!('serviceWorker' in window.navigator)) return;
8888
const app = this;
89-
if (app.device.cordova || (window.Capacitor && window.Capacitor.isNative)) return;
89+
if (
90+
app.device.cordova ||
91+
(window.Capacitor &&
92+
(window.Capacitor.isNative ||
93+
(window.Capacitor.isNativePlatform && window.Capacitor.isNativePlatform())))
94+
)
95+
return;
9096
if (!app.serviceWorker.container) return;
9197
const paths = app.params.serviceWorker.path;
9298
const scope = app.params.serviceWorker.scope;

src/core/modules/touch/touch.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,9 @@ function initTouch() {
459459
(device.ios ||
460460
device.android ||
461461
device.cordova ||
462-
(window.Capacitor && window.Capacitor.isNative))
462+
(window.Capacitor &&
463+
(window.Capacitor.isNative ||
464+
(window.Capacitor.isNativePlatform && window.Capacitor.isNativePlatform()))))
463465
) {
464466
e.preventDefault();
465467
}

0 commit comments

Comments
 (0)