--- a/client/app/slideshow/slideshow_controller.js	Fri Oct 03 12:41:56 2014 +0200
+++ b/client/app/slideshow/slideshow_controller.js	Fri Oct 03 16:15:50 2014 +0200
@@ -13,21 +13,15 @@
       console.log('slideshow 5',this);
       this.slideshow = $resource(context.urls.slideshowUrl);
     })
-    .service('slideshowModel', function(slideshowApi, context) {
+    .service('slideshowModel', function(slideshowApi) {
       console.log('slideshow 6',this);
-      if(typeof context.slideshow === 'undefined') {
-          console.log('slideshow 6-1');
-          this.slideshow = slideshowApi.slideshow.get();
-      }
-      else {
-          console.log('slideshow 6-2');
-          this.slideshow = new slideshowApi.slideshow(context.slideshow);
-      }
+      this.slideshow = slideshowApi.slideshow.get();
     })
     .controller('slideshowCtrl', function($scope, $filter, $location, $routeParams, $timeout, searchApi, slideshowModel){
-      console.log('slideshow 7', $filter, $routeParams, searchApi, slideshowModel);
+      console.log('slideshow 7', $location, $routeParams, searchApi, slideshowModel);
       $scope.slideshow = slideshowModel.slideshow;
       $scope.iSlide = parseInt($routeParams.iSlide) || 0;
+      console.log('$routeParams',$routeParams);
       if(typeof $routeParams.searched !== 'undefined'){
           var a = $routeParams.searched.split(',');
           var q = a[0], i = parseInt(a[1]);
@@ -49,6 +43,15 @@
               );
           }
       }
+      $timeout(function(){
+          if($scope.iSlide>=0 && $scope.iSlide<$scope.slideshow.images.length){
+              $scope.slideshow.images[$scope.iSlide].active = true;
+              var l = $location.path();
+              if(l.substr(0,16)==='/slideshow/edit/'){
+                  $scope.slideshow.images[$scope.iSlide].editMode = true;
+              }
+          }
+      }, 200);
 
       $scope.save = function(){
           console.log('8 call save POST',$scope.slideshow);
@@ -79,7 +82,17 @@
                   for (var i = $scope.slide.tags.length - 1; i >= 0; i--) {
                       $scope.slide.tags[i] = $scope.slide.tags[i].trim();
                   }
-                  $scope.editMode = false;
+                  $scope.slide.editMode = false;
+                  $scope.save();
+              };
+              $scope.editSlidesave = function(){
+                  if(typeof $scope.slide.tags === 'string'){
+                      $scope.slide.tags = $scope.slide.tags.split(',');
+                  }
+                  for (var i = $scope.slide.tags.length - 1; i >= 0; i--) {
+                      $scope.slide.tags[i] = $scope.slide.tags[i].trim();
+                  }
+                  $scope.slide.editMode = false;
                   $scope.save();
               };
           }