summaryrefslogtreecommitdiff
path: root/www/js
diff options
context:
space:
mode:
Diffstat (limited to 'www/js')
-rw-r--r--www/js/EventModalCtrl.js1
-rwxr-xr-xwww/js/app.js7
2 files changed, 8 insertions, 0 deletions
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index f1953c5d..b8a7acbc 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -177,6 +177,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
handle.pause();
handle.setPlayback(NVRDataModel.getLogin().videoPlaybackSpeed);
handle.play();
+ NVRDataModel.debug ("*** Invoking play");
}, 300);
diff --git a/www/js/app.js b/www/js/app.js
index b006390a..09e4d444 100755
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -102,6 +102,13 @@ angular.module('zmApp', [
})
+//http://stackoverflow.com/a/24519069/1361529
+.filter('trusted', ['$sce', function ($sce) {
+ return function(url) {
+ return $sce.trustAsResourceUrl(url);
+ };
+}])
+
// for events view
.filter ('eventListFilter', function(NVRDataModel)