summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package.json16
-rw-r--r--plugins/fetch.json28
-rw-r--r--www/css/style.css3
-rw-r--r--www/index.html4
-rw-r--r--www/js/app.js5
-rw-r--r--www/templates/devoptions.html2
-rw-r--r--www/templates/events-date-time-filter.html2
-rw-r--r--www/templates/eventserversettings.html2
-rw-r--r--www/templates/help.html2
-rw-r--r--www/templates/log.html2
-rw-r--r--www/templates/login.html2
-rw-r--r--www/templates/monitors.html2
-rw-r--r--www/templates/montage-history.html2
-rw-r--r--www/templates/montage.html2
-rw-r--r--www/templates/news.html2
-rw-r--r--www/templates/state.html2
-rw-r--r--www/templates/timeline.html2
-rw-r--r--www/templates/wizard.html2
18 files changed, 40 insertions, 42 deletions
diff --git a/package.json b/package.json
index 448df406..08a00eea 100644
--- a/package.json
+++ b/package.json
@@ -67,11 +67,11 @@
"locator": "https://github.com/jcjee/email-composer",
"id": "com.jcjee.plugins.emailcomposer"
},
- "cordova-plugin-compat",
{
"locator": "https://github.com/pliablepixels/cordova-plugin-media",
- "id": "cordova-plugin-media"
+ "id": "org.apache.cordova.media"
},
+ "cordova-plugin-compat",
{
"locator": "https://github.com/litehelpers/Cordova-sqlite-storage.git",
"id": "cordova-sqlite-storage"
@@ -80,11 +80,19 @@
"cordova-plugin-android-permissions",
"cordova-plugin-network-information",
"cordova-plugin-statusbar",
+ "cordova-plugin-settings-hook",
+ {
+ "locator": "https://github.com/phonegap/phonegap-mobile-accessibility.git",
+ "id": "phonegap-plugin-mobile-accessibility"
+ },
+ {
+ "locator": "https://github.com/apache/cordova-plugin-device.git",
+ "id": "cordova-plugin-device"
+ },
{
"locator": "https://github.com/hypery2k/cordova-certificate-plugin",
"id": "cordova-plugin-certificates"
- },
- "cordova-plugin-settings-hook"
+ }
],
"cordovaPlatforms": [
{},
diff --git a/plugins/fetch.json b/plugins/fetch.json
index 27ba9870..98cdea11 100644
--- a/plugins/fetch.json
+++ b/plugins/fetch.json
@@ -134,30 +134,11 @@
"is_top_level": true,
"variables": {}
},
- "org.apache.cordova.media": {
- "source": {
- "type": "git",
- "url": "https://github.com/pliablepixels/cordova-plugin-media",
- "subdir": ".",
- "ref": "playback-only"
- },
- "is_top_level": true,
- "variables": {}
- },
"cordova-plugin-compat": {
"source": {
"type": "registry",
"id": "cordova-plugin-compat"
},
- "is_top_level": false,
- "variables": {}
- },
- "cordova-plugin-media": {
- "source": {
- "type": "git",
- "url": "https://github.com/pliablepixels/cordova-plugin-media",
- "subdir": "."
- },
"is_top_level": true,
"variables": {}
},
@@ -236,5 +217,14 @@
},
"is_top_level": true,
"variables": {}
+ },
+ "cordova-plugin-media": {
+ "source": {
+ "type": "git",
+ "url": "https://github.com/pliablepixels/cordova-plugin-media",
+ "subdir": "."
+ },
+ "is_top_level": true,
+ "variables": {}
}
} \ No newline at end of file
diff --git a/www/css/style.css b/www/css/style.css
index 33e6f972..f45aeab8 100644
--- a/www/css/style.css
+++ b/www/css/style.css
@@ -912,4 +912,5 @@ body {
}
.white-button-text {
color: #fff !important;
-} \ No newline at end of file
+}
+
diff --git a/www/index.html b/www/index.html
index aa0ac36a..13710772 100644
--- a/www/index.html
+++ b/www/index.html
@@ -144,7 +144,7 @@
<script src="external/ionic.content.banner.js"></script>
<script src="external/FileSaver.min.js"></script>
<script src="external/canvas-toBlob.js"></script>
- <script src="external/ionic.headerShrink.js"></script>
+
<script src="external/imagesloaded.pkgd.js"></script>
<script src="external/packery.pkgd.js"></script>
@@ -188,7 +188,7 @@
</ion-side-menu-content>
<ion-side-menu>
- <ion-header-bar class="bar bar-header bar-dark">
+ <ion-header-bar class="bar bar-header bar-stable">
<h1 class="title">{{'kMenuOptions'|translate}}</h1>
</ion-header-bar>
diff --git a/www/js/app.js b/www/js/app.js
index b9472ac9..47c27e66 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -29,7 +29,6 @@ angular.module('zmApp', [
'ionic-native-transitions',
'mgo-angular-wizard',
'pascalprecht.translate',
- 'ionic.ion.headerShrink',
'jett.ionic.scroll.sista'
@@ -1269,8 +1268,8 @@ angular.module('zmApp', [
// org.apache.cordova.statusbar required
NVRDataModel.log("Updating statusbar");
StatusBar.styleDefault();
- //StatusBar.overlaysWebView(true);
- //StatusBar.backgroundColorByHexString("#2980b9");
+ //StatusBar.overlaysWebView(false);
+ StatusBar.backgroundColorByHexString("#2980b9");
}
diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html
index 4e0b6f6b..b206a559 100644
--- a/www/templates/devoptions.html
+++ b/www/templates/devoptions.html
@@ -11,7 +11,7 @@
</ion-nav-buttons>
- <ion-content scroll-sista delegate-handle="none" overflow-scroll="true" mouse-wheel-scroll >
+ <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll >
<div class="list list-inset">
<span style="color:rgb(100,100,100)">
<i class="ion-android-settings" style="font-size:150%"></i> {{'kDeveloperOptionsFor'|translate}} {{loginData.serverName}}
diff --git a/www/templates/events-date-time-filter.html b/www/templates/events-date-time-filter.html
index 15a6585a..af97ad60 100644
--- a/www/templates/events-date-time-filter.html
+++ b/www/templates/events-date-time-filter.html
@@ -2,7 +2,7 @@
- <ion-content scroll-sista delegate-handle="none" overflow-scroll="true" mouse-wheel-scroll >
+ <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll >
<label class="item item-input">
<span class="input-label">{{'kFromDate'|translate}}:</span>
<input type="date" ng-model="$root.fromDate" max={{today}}>
diff --git a/www/templates/eventserversettings.html b/www/templates/eventserversettings.html
index d982fc05..e6ec4614 100644
--- a/www/templates/eventserversettings.html
+++ b/www/templates/eventserversettings.html
@@ -12,7 +12,7 @@
<button class="button button-clear" ng-click="saveItems()">{{'kSave'|translate}}</button>
</ion-nav-buttons>
- <ion-content scroll-sista delegate-handle="none" overflow-scroll="true" mouse-wheel-scroll >
+ <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll >
<div class="list list-inset">
{{'kEventServerConfig1' | translate }}
diff --git a/www/templates/help.html b/www/templates/help.html
index ebe61931..fffdf2d1 100644
--- a/www/templates/help.html
+++ b/www/templates/help.html
@@ -8,7 +8,7 @@
</ion-nav-buttons>
- <ion-content class="padding" scroll-sista delegate-handle="none" overflow-scroll="true" mouse-wheel-scroll>
+ <ion-content class="padding" scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll>
<p><small>{{$root.appName}} v{{zmAppVersion}}</small></p>
<div class="list">
diff --git a/www/templates/log.html b/www/templates/log.html
index 42e308e5..e53f00aa 100644
--- a/www/templates/log.html
+++ b/www/templates/log.html
@@ -22,7 +22,7 @@
</div>
</ion-nav-buttons>
- <ion-content scroll-sista delegate-handle="none" overflow-scroll="true" mouse-wheel-scroll>
+ <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll>
<b>{{$root.appName}} {{'kVersion'|translate}}: {{zmAppVersion}}</b><br/>
<!-- don't indent here -- its a pre-->
<pre>{{log.logString}}</pre>
diff --git a/www/templates/login.html b/www/templates/login.html
index aa61a900..738c1c46 100644
--- a/www/templates/login.html
+++ b/www/templates/login.html
@@ -13,7 +13,7 @@
<button class="button button-clear" ng-click="saveItems()">Save</button>
</ion-nav-buttons>
- <ion-content scroll-sista delegate-handle="none" overflow-scroll="true" mouse-wheel-scroll >
+ <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll >
<div class="item item-input-inset">
{{'kServerName' | translate }}:&nbsp;
diff --git a/www/templates/monitors.html b/www/templates/monitors.html
index 07d34cab..a9168c09 100644
--- a/www/templates/monitors.html
+++ b/www/templates/monitors.html
@@ -9,7 +9,7 @@
</ion-nav-buttons>
- <ion-content scroll-sista delegate-handle="none" overflow-scroll="true" mouse-wheel-scroll >
+ <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll >
<ion-refresher pulling-text="Pull to reload Monitors..." spinner="bubbles" on-refresh="doRefresh()">
</ion-refresher>
<div style="float:right;margin-top:3px;margin-right:8px;">
diff --git a/www/templates/montage-history.html b/www/templates/montage-history.html
index 7f54f2c8..a49622b2 100644
--- a/www/templates/montage-history.html
+++ b/www/templates/montage-history.html
@@ -21,7 +21,7 @@
</ion-nav-buttons>
- <ion-content scroll-sista has-bouncing="false" style="background-color:#444444" delegate-handle="none" overflow-scroll="true" mouse-wheel-scroll>
+ <ion-content scroll-sista has-bouncing="false" style="background-color:#444444" delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll>
diff --git a/www/templates/montage.html b/www/templates/montage.html
index 76534b7d..b442f998 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -33,7 +33,7 @@
</ion-nav-buttons>
- <ion-content scroll-sista ng-cloak has-bouncing="false" style="background-color:#444444" delegate-handle="montage-delegate" overflow-scroll="true" >
+ <ion-content scroll-sista ng-cloak has-bouncing="false" style="background-color:#444444" delegate-handle="montage-delegate" overflow-scroll="false" >
diff --git a/www/templates/news.html b/www/templates/news.html
index d560b053..f4a87e4f 100644
--- a/www/templates/news.html
+++ b/www/templates/news.html
@@ -8,7 +8,7 @@
</ion-nav-buttons>
- <ion-content scroll-sista delegate-handle="none" overflow-scroll="true" mouse-wheel-scroll >
+ <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll >
<div class="list">
<span ng-repeat = "post in newsItems">
diff --git a/www/templates/state.html b/www/templates/state.html
index af50e9c5..bf0cda4a 100644
--- a/www/templates/state.html
+++ b/www/templates/state.html
@@ -4,7 +4,7 @@
<button class="button button-icon button-clear ion-navicon" ng-click="openMenu()"></button>
<button data-badge="{{$root.alarmCount}}" class="animated infinite tada button button-icon button-clear ion-ios-bell notification-badge" ng-click="handleAlarms();" ng-if="$root.isAlarm"></button>
</ion-nav-buttons>
- <ion-content scroll-sista delegate-handle="none" overflow-scroll="true" mouse-wheel-scroll>
+ <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll>
<ion-refresher pulling-text="{{'kPullToReload' | translate}}..."
spinner="bubbles" on-refresh="doRefresh()"></ion-refresher>
<ion-list>
diff --git a/www/templates/timeline.html b/www/templates/timeline.html
index 71e2e41c..e443e705 100644
--- a/www/templates/timeline.html
+++ b/www/templates/timeline.html
@@ -23,7 +23,7 @@
</ion-nav-buttons>
<!--<ion-content data-tap-disabled="true">-->
- <ion-content scroll-sista delegate-handle="none" overflow-scroll="true" mouse-wheel-scroll>
+ <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll>
<div style="padding-left:15px; font-size:10px; color:grey">
{{prettify(fromDate)}} - {{prettify(toDate)}} ({{'kTimelineOnlyDisplaying1' | translate:translationData}})
diff --git a/www/templates/wizard.html b/www/templates/wizard.html
index 0ee3f319..3d20c522 100644
--- a/www/templates/wizard.html
+++ b/www/templates/wizard.html
@@ -5,7 +5,7 @@
</ion-nav-buttons>
- <ion-content class="padding" overflow-scroll="true">
+ <ion-content class="padding" overflow-scroll="false">
<wizard on-finish="finishedWizard()">
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-06 18:08:16 +0000