diff options
| -rw-r--r-- | config.xml | 2 | ||||
| -rw-r--r-- | package.json | 4 | ||||
| -rw-r--r-- | www/css/style.css | 5 | ||||
| -rw-r--r-- | www/js/TimelineCtrl.js | 27 | ||||
| -rwxr-xr-x | www/js/app.js | 5 |
5 files changed, 35 insertions, 8 deletions
@@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninja_pro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.3.082" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninja_pro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.3.083" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <name>zmNinja</name> <description> High performance ZoneMinder client diff --git a/package.json b/package.json index 1d1291b0..f68d53ae 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "zmninjapro", "description": "Home security mobile app for ZoneMinder", - "version":"1.3.082", + "version": "1.3.082", "displayName": "zmNinja", "author": "Pliable Pixels", "license": "custom see LICENSE.md", @@ -191,4 +191,4 @@ ] } } -} +}
\ No newline at end of file diff --git a/www/css/style.css b/www/css/style.css index 0baec5fb..913ed225 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -98,11 +98,12 @@ image-loader { } - +/* #visualization { height: 70vh; -} +}*/ + ion-popover-view.fit { height: auto; } diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js index 450f5a6e..d030c131 100644 --- a/www/js/TimelineCtrl.js +++ b/www/js/TimelineCtrl.js @@ -326,6 +326,28 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla });*/ + + $scope.$on('sizechanged', function() { + + $timeout (function () { + if (timeline_instance) { + options.maxHeight = $rootScope.devHeight-100; + timeline_instance.setOptions(options); + timeline_instance.redraw(); + // console.log ('******* TIMELINE REDRAW'); + } + },10); + + }); + + + + + $scope.$on('$ionicView.beforeLeave', function () { + // window.removeEventListener("resize", redrawTimeline, false); + + }); + $scope.$on('$ionicView.beforeEnter', function () { $ionicSideMenuDelegate.canDragContent(false); $scope.$on ( "process-push", function () { @@ -356,7 +378,6 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla }; $scope.newEvents = ''; - if ($rootScope.platformOS == 'desktop') { @@ -1109,7 +1130,9 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla showCurrentTime: true, editable: false, verticalScroll: true, - height: '100%', + //height: '100%', + //maxHeight:"80%", + maxHeight:$rootScope.devHeight-100, //zoomKey: 'ctrlKey', //groupHeightMode:'fixed', diff --git a/www/js/app.js b/www/js/app.js index d01006d0..690c60c6 100755 --- a/www/js/app.js +++ b/www/js/app.js @@ -1465,7 +1465,10 @@ angular.module('zmApp', [ $rootScope.devWidth = ((window.innerWidth > 0) ? window.innerWidth : screen.width); $rootScope.devHeight = ((window.innerHeight > 0) ? window.innerHeight : screen.height); - // console.log("********NEW Computed Dev Width & Height as" + $rootScope.devWidth + "*" + $rootScope.devHeight); + //console.log("********NEW Computed Dev Width & Height as" + $rootScope.devWidth + "*" + $rootScope.devHeight); + + $rootScope.$broadcast('sizechanged'); + },300); |