summaryrefslogtreecommitdiff
path: root/client/js/controllers/home/machineDetails.js
diff options
context:
space:
mode:
authormanzerbredes <loic.guegan_secondary@yahoo.fr>2016-03-20 11:24:03 +0100
committermanzerbredes <loic.guegan_secondary@yahoo.fr>2016-03-20 11:24:03 +0100
commit3216a69b752e8d8129913d24ced4cffbd794fef2 (patch)
tree30822db71088c82cb662f0766cb2583c50674937 /client/js/controllers/home/machineDetails.js
parent700a849da8a6905ba33ccf47cdbc5c031e1994f3 (diff)
parent57006dba22e26273b6bcb75fff73522fb5f216f8 (diff)
Merge branch 'loic' into develop
Diffstat (limited to 'client/js/controllers/home/machineDetails.js')
-rw-r--r--client/js/controllers/home/machineDetails.js7
1 files changed, 4 insertions, 3 deletions
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
}
-
+
}]);