diff -r b714bcbe915c -r 4b3bebe4355d client/app/app.js --- a/client/app/app.js Wed Mar 25 15:55:38 2015 +0100 +++ b/client/app/app.js Wed Mar 25 15:57:45 2015 +0100 @@ -20,11 +20,7 @@ controller: 'slidesCtrl', templateUrl: 'slides/slides.html' }). - when('/slide/edit/:idSlide', { - controller: 'slideEditCtrl', - templateUrl: 'slides/slides.html' - }). - when('/slideshow', { + when('/slideshow/', { controller: 'slideshowCtrl', templateUrl: 'slideshow/slideshow.html' }). @@ -49,8 +45,8 @@ templateUrl: 'search/search.html' }). when('/login', { - controller: 'loginCtrl', - templateUrl: 'login/login.html' + controller: 'authCtrl', + templateUrl: 'auth/auth.html' }). otherwise({ redirectTo: '/' @@ -65,7 +61,7 @@ .config(function($logProvider){ $logProvider.debugEnabled(true); }) - .service('searchApi', function($resource, context) { + .service('searchApi', function($resource, context, $sce) { this.searchResource = function(params){ return $resource(context.urls.searchUrl, { @@ -101,6 +97,15 @@ this.booksSlides = $resource(context.urls.ammicoUrl+'/books/:idBook/slides/', {idBook:'@idBook'}); this.listSlides= $resource(context.urls.ammicoUrl+'/slides/'); this.slide = $resource(context.urls.ammicoUrl+'/slides/:idSlide/', {idSlide:'@idSlide'}); + this.sanitizeUrls = function(data){ + console.log('heyr there !'); + console.log(data); + data.details.audio = $sce.trustAsResourceUrl(data.details.audio); + data.details.video = $sce.trustAsResourceUrl(data.details.video); + data.audio = $sce.trustAsResourceUrl(data.audio); + data.video = $sce.trustAsResourceUrl(data.video); + return data; + }; }); })();