Autosave

jhasselgren · Aug 12, 2014 · fa3efac · fa3efac
1 parent 1511950
commit fa3efac
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/app/js/controller/ActivitiesController.js b/app/js/controller/ActivitiesController.js
@@ -37,41 +37,41 @@ app.controller('ActivityController', function($scope, $sce, $location, $interval
 			else{
 				console.log("Scope not modified");
 			}
-		}, 60000);
+		}, 30000);
 
 	}
 
 	var timeout = null;
 
 
-	$scope.$watch('data.currentActivity.description', function(newVal, oldVal){
+	$scope.$watch('data.currentActivity', function(newVal, oldVal){
 		if(newVal != oldVal){
 
 			if(timeout){
 				$timeout.cancel(timeout);
 			}
 
 			timeout = $timeout(function(){
-				console.log("data.currentActivity.description changed");
+				console.log("data.currentActivity changed");
 				$scope.modified = true;
 				console.log("modified = true");
 			},1000);
 		};
-	});
-
-	$scope.$watch('data.currentActivity.shortDescription', function(newVal, oldVal){
-		if(newVal != oldVal){
-			if(timeout){
-				$timeout.cancel(timeout);
-			}
-
-			timeout = $timeout(function(){
-				console.log("data.currentActivity.shortDescription changed");
-				$scope.modified = true;
-				console.log("modified = true");
-			},1000);
-		};
-	});
+	}, true);
+
+//	$scope.$watch('data.currentActivity.shortDescription', function(newVal, oldVal){
+//		if(newVal != oldVal){
+//			if(timeout){
+//				$timeout.cancel(timeout);
+//			}
+//			
+//			timeout = $timeout(function(){
+//				console.log("data.currentActivity.shortDescription changed");
+//				$scope.modified = true;
+//				console.log("modified = true");
+//			},1000);
+//		};
+//	});
 
 	$scope.$on('currentActivity.updated', function(event){
 		console.log(event);

diff --git a/app/js/directives.js b/app/js/directives.js
@@ -167,7 +167,7 @@ app.directive("thing", function(Data, backEndAdress, activityDataService){
 		scope: {
 			thing: "="
 		},
-		controller: function($scope){
+		controller: function($rootScope, $scope){
 
 			this.activityId = Data.currentActivity.id;
 			this.backEndAdress = backEndAdress;