summaryrefslogtreecommitdiff
path: root/client/js/controllers/home/home.js
diff options
context:
space:
mode:
authormanzerbredes <loic.guegan_secondary@yahoo.fr>2016-03-20 11:23:06 +0100
committermanzerbredes <loic.guegan_secondary@yahoo.fr>2016-03-20 11:23:06 +0100
commit57006dba22e26273b6bcb75fff73522fb5f216f8 (patch)
tree382bc2675ab08519a405e285f8fa0e334fe497f4 /client/js/controllers/home/home.js
parent0ce2b2fa301dde1c5b9c50c826d3ed44b00a5c44 (diff)
Add login check
Diffstat (limited to 'client/js/controllers/home/home.js')
-rw-r--r--client/js/controllers/home/home.js36
1 files changed, 19 insertions, 17 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(){});
+ }
+
}]);