File tree Expand file tree Collapse file tree 4 files changed +15
-4
lines changed Expand file tree Collapse file tree 4 files changed +15
-4
lines changed Original file line number Diff line number Diff 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 ) ;
Original file line number Diff line number Diff 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 &&
Original file line number Diff line number Diff 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 ;
Original file line number Diff line number Diff 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 }
You can’t perform that action at this time.
0 commit comments