Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Event list improvements #963

Merged
merged 10 commits into from
Sep 5, 2020
Merged

Event list improvements #963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1400c66
resolve build error
lucasnz Aug 29, 2020
d167ac9
increment app version
lucasnz Aug 31, 2020
e02255e
increase image size in event list, improve layout and loading code.
lucasnz Aug 31, 2020
0e57798
when click notification in montage, filter event view to only display…
lucasnz Aug 29, 2020
a711b32
display gif if api supports
lucasnz Aug 29, 2020
2f56592
Revert "resolve build error"
lucasnz Aug 31, 2020
1139b02
select event view thumbnails type, replaces enableThumbs in dev options.
lucasnz Sep 4, 2020
49235f8
remove unnneded debugging code
lucasnz Sep 4, 2020
956e88e
indent for readability
lucasnz Sep 4, 2020
1a4449a
Merge branch 'master' of [email protected]:pliablepixels/zmNinja.git
lucasnz Sep 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions www/js/DevOptionsCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,35 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope'
});
};

$scope.selectEventViewThumbs = function() {

var buttons = [
{ text: $translate.instant('kNone').toLowerCase(), value:'none' },
{ text: 'snapshot', value:'snapshot' },
{ text: 'objdetect', value:'objdetect' },
{ text: 'objdetect_jpg', value:'objdetect_jpg' },
{ text: 'objdetect_gif', value:'objdetect_gif' },

];

$ionicActionSheet.show({
titleText: $translate.instant('kSelect'),
buttons: buttons,

cancelText: $translate.instant('kButtonCancel'),
cancel: function() {
NVR.debug ('obfuscation actionsheet cancelled');
},
buttonClicked: function(index) {

$scope.loginData.eventViewThumbs = buttons[index].value;
NVR.debug ('changed event view thumbs to:'+$scope.loginData.eventViewThumbs );
return true;
},

});
};

$scope.saveDevOptions = function () {

saveDevOptions();
Expand Down
Loading