client/app/slideshow/slideshow_controller.js
changeset 8 824c87a9084c
parent 4 28208a0ad8b9
child 9 962604899225
--- a/client/app/slideshow/slideshow_controller.js	Mon Oct 06 17:36:47 2014 +0200
+++ b/client/app/slideshow/slideshow_controller.js	Mon Oct 06 22:52:30 2014 +0200
@@ -9,19 +9,25 @@
           controller: 'slideshowCtrl'
         });
     })
-    .service('slideshowApi', function($resource, context) {
+    /*.service('slideshowApi', function($resource, context) {
       console.log('slideshow 5',this);
       this.slideshow = $resource(context.urls.slideshowUrl);
-    })
-    .service('slideshowModel', function(slideshowApi) {
+    })*/
+    .service('slideshowModel', function(searchApi) {
       console.log('slideshow 6',this);
-      this.slideshow = slideshowApi.slideshow.get();
+      /*this.slideshow = function(myVarForData){
+          searchApi.searchResource({q:'stop_email=toto@gmail.com', of: 'json', synthesis: 'false', nresults:'50', callback: 'JSON_CALLBACK'}, myVarForData);
+      };*/
+      this.slideshow = searchApi.searchResource({q:'stop_email=toto@gmail.com', of: 'json', synthesis: 'false', nresults:'50', callback: 'JSON_CALLBACK'}).getJsonp();
+      console.log('slideshow 6-2',this);
     })
     .controller('slideshowCtrl', function($scope, $filter, $location, $routeParams, $timeout, searchApi, slideshowModel){
-      console.log('slideshow 7', $location, $routeParams, searchApi, slideshowModel);
+      //console.log('slideshow 7', $location, $routeParams, searchApi);
+      console.log('slideshow 7');
       $scope.slideshow = slideshowModel.slideshow;
+      
       $scope.iSlide = parseInt($routeParams.iSlide) || 0;
-      console.log('$routeParams',$routeParams);
+      //console.log('$routeParams',$routeParams);
       if(typeof $routeParams.searched !== 'undefined'){
           var a = $routeParams.searched.split(',');
           var q = a[0], i = parseInt(a[1]);
@@ -44,17 +50,17 @@
           }
       }
       $timeout(function(){
-          if($scope.iSlide>=0 && $scope.iSlide<$scope.slideshow.images.length){
-              $scope.slideshow.images[$scope.iSlide].active = true;
+          if($scope.iSlide>=0 && $scope.iSlide<$scope.slideshow.hits.length){
+              $scope.slideshow.hits[$scope.iSlide].active = true;
               var l = $location.path();
               if(l.substr(0,16)==='/slideshow/edit/'){
-                  $scope.slideshow.images[$scope.iSlide].editMode = true;
+                  $scope.slideshow.hits[$scope.iSlide].editMode = true;
               }
           }
-      }, 200);
-
+      }, 500);
+      
       $scope.save = function(){
-          console.log('8 call save POST',$scope.slideshow);
+          //console.log('8 call save POST',$scope.slideshow);
           $scope.slideshow
           .$save()
           .then(