diff options
| author | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2016-03-01 22:50:37 +0100 |
|---|---|---|
| committer | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2016-03-01 22:50:37 +0100 |
| commit | e9108d4b97132e853a71cb1dfbad6cf4bddb599b (patch) | |
| tree | ba6d0e3f6ac7a7e9fe05372f1bab1cafbdadc9ee /client/js/controllers/home | |
| parent | 5ef1c9b8b1ab47b659f512db86e51dacf1bec860 (diff) | |
Finish details machine
Diffstat (limited to 'client/js/controllers/home')
| -rw-r--r-- | client/js/controllers/home/machineDetails.js | 3 | ||||
| -rw-r--r-- | client/js/controllers/home/main.js | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/client/js/controllers/home/machineDetails.js b/client/js/controllers/home/machineDetails.js index 7476c69..24fac42 100644 --- a/client/js/controllers/home/machineDetails.js +++ b/client/js/controllers/home/machineDetails.js @@ -9,8 +9,9 @@ mainApp.controller('machineDetailsCtrl', [ '$scope', 'Compute', '$rootScope', '$ $scope.machine={}; $("#waitingForToggleMachine").hide(); - $scope.$on('showMachineDetailsEvent', function(eventName ,machine){ + $scope.$on('showMachineDetailsEvent', function(eventName ,machine, axioms){ $scope.machine=machine; + $scope.axioms=axioms; console.log(machine); $('#machineDetailsModal').modal({backdrop: false, keyboard: true}); }); diff --git a/client/js/controllers/home/main.js b/client/js/controllers/home/main.js index b44836b..9d7ddfc 100644 --- a/client/js/controllers/home/main.js +++ b/client/js/controllers/home/main.js @@ -6,19 +6,19 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', function ($scope, Compute, $rootScope) { - var callMeAfterGetMachines=function(data){ + var callMeAfterPullData=function(data){ $scope.machines=Compute.getData().machines; } - Compute.pullMachines(callMeAfterGetMachines); + Compute.pullData(callMeAfterPullData); $scope.raiseShowMachineDetailsEvent=function(id){ var callback=function(){ var data=Compute.getData(); - $rootScope.$broadcast("showMachineDetailsEvent", data.machines[id]); + $rootScope.$broadcast("showMachineDetailsEvent", data.machines[id], data.axioms); } Compute.pullMachines(callback); |
