summaryrefslogtreecommitdiff
path: root/www/js
diff options
context:
space:
mode:
authorpliablepixels <pliablepixels@gmail.com>2016-04-04 19:32:42 -0400
committerpliablepixels <pliablepixels@gmail.com>2016-04-04 19:32:42 -0400
commitf8aab9107b428d4734d9cf3774aad98b80a57319 (patch)
treed33dcd3501e2927b4268f109bace10980704a87c /www/js
parentc6c2ef5af33ead04ed143eac9bbdaf8ee528f6cc (diff)
fixed modal bug of not showing events footage from timeline
Former-commit-id: cb80f43b7a785ce3ce3094f4c49a9e5429f03478
Diffstat (limited to 'www/js')
-rw-r--r--www/js/TimelineCtrl.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js
index c3c05688..c99e0509 100644
--- a/www/js/TimelineCtrl.js
+++ b/www/js/TimelineCtrl.js
@@ -185,7 +185,8 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
$ionicModal.fromTemplateUrl('templates/events-modal.html', {
scope: $scope, // give ModalCtrl access to this scope
- animation: 'slide-in-up'
+ animation: 'slide-in-up',
+ id:'footage'
})
.then(function (modal) {
$scope.modal = modal;
@@ -193,7 +194,8 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
$ionicLoading.show({
template: "please wait...",
noBackdrop: true,
- duration: 10000
+ duration: 10000,
+
});
$scope.modal.show();