Correct conflicts

1 files changed, 8 insertions, 4 deletions

diff --git a/client/js/controllers/home/machineDetails.js b/client/js/controllers/home/machineDetails.js
index f84a073..c015eaa 100644
--- a/client/js/controllers/home/machineDetails.js
+++ b/client/js/controllers/home/machineDetails.js
@@ -6,21 +6,25 @@
 mainApp.controller('machineDetailsCtrl', [ '$scope', 'Compute', '$rootScope', '$timeout', function ($scope, Compute, $rootScope, $timeout)
 {
 
+	// Init scope
 	$scope.machine={};
-	$("#waitingForToggleMachine").hide();
+	$scope.machineIsStarting=false; // For loading icon
 
-	$scope.$on('showMachineDetailsEvent', function(eventName ,machine){
+
+	$scope.$on('showMachineDetailsEvent', function(eventName ,machine, axioms){
 		$scope.machine=machine;
+		$scope.axioms=axioms;
 		$('#machineDetailsModal').modal({backdrop: false, keyboard: true});
 	});
 
 
 	$scope.toggleMachineState=function(){
-		$("#waitingForToggleMachine").show();
+		// Display gif
+		$scope.machineIsStarting=true;
 
 		// Fake timeout
 		$timeout(function(){
-		$("#waitingForToggleMachine").hide();	
+			$scope.machineIsStarting=false;
 		}, 3000);
 		$timeout(function(){
 		$scope.machine.online=!$scope.machine.online;