Merge branch 'loic' into develop

2 files changed, 23 insertions, 20 deletions

diff --git a/client/js/controllers/home/home.js b/client/js/controllers/home/home.js
index 4402e62..2b355b1 100644
--- a/client/js/controllers/home/home.js
+++ b/client/js/controllers/home/home.js
@@ -8,23 +8,9 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','I
 
 	var callMeAfterPullData=function(data){
 		$scope.machines=Compute.getData().machines;
-			Loading.stop();
-	}
-
-	;
-	if(Compute.getData().machines == null && Identity.isAlreadyLogin()){
-		Loading.start();
-		Compute.pullData(callMeAfterPullData);		
-	}
-	else{
-		if(Identity.isAlreadyLogin()){
-			callMeAfterPullData();
-		}
-	}
-
+		Loading.stop();
+	};
 	
-	Image.getImages(function(){});
-
 	
 	$scope.raiseShowMachineDetailsEvent=function(id){
 
@@ -32,11 +18,27 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','I
 			Loading.stop();
 			var data=Compute.getData();
 			$rootScope.$broadcast("showMachineDetailsEvent", data.machines[id], data.axioms);		
-	
+			
 		}
 		Loading.start();
 		Compute.pullMachines(callback);
 	}
 
 
+
+
+	
+	if(Identity.isAlreadyLogin()){
+		if(Compute.getData().machines == null{
+			Loading.start();
+			Compute.pullData(callMeAfterPullData);		
+		}
+		   else{
+			   if(Identity.isAlreadyLogin()){
+				   callMeAfterPullData();
+			   }
+		   }
+		   Image.getImages(function(){});
+		  }
+
 }]);
diff --git a/client/js/controllers/home/machineDetails.js b/client/js/controllers/home/machineDetails.js
index c015eaa..371310b 100644
--- a/client/js/controllers/home/machineDetails.js
+++ b/client/js/controllers/home/machineDetails.js
@@ -3,9 +3,10 @@
  * 
  * @param {$scope} $scope The $scope service from angular
  */
-mainApp.controller('machineDetailsCtrl', [ '$scope', 'Compute', '$rootScope', '$timeout', function ($scope, Compute, $rootScope, $timeout)
+mainApp.controller('machineDetailsCtrl', [ '$scope', 'Compute', '$rootScope', '$timeout', 'Identity', function ($scope, Compute, $rootScope, $timeout, Identity)
 {
 
+
 	// Init scope
 	$scope.machine={};
 	$scope.machineIsStarting=false; // For loading icon
@@ -27,7 +28,7 @@ mainApp.controller('machineDetailsCtrl', [ '$scope', 'Compute', '$rootScope', '$
 			$scope.machineIsStarting=false;
 		}, 3000);
 		$timeout(function(){
-		$scope.machine.online=!$scope.machine.online;
+			$scope.machine.online=!$scope.machine.online;
 
 		}, 3000);
 
@@ -37,7 +38,7 @@ mainApp.controller('machineDetailsCtrl', [ '$scope', 'Compute', '$rootScope', '$
 	$scope.applyModifications=function(){
 		//Todo
 	}
-	
+
 
 	
 }]);