Added cloaking, fixed navigation to dev page

Author: tladendo

app/profile/develop/develop.controller.js

@@ -13,6 +13,7 @@
     vm.domain = CONSTANTS.domain;
     vm.challenges = [];
     vm.profile = {};
+    vm.loading = true;
 
     activate();
 
@@ -21,13 +22,17 @@
       $scope.initProfile(vm);
       vm.deferred = $q.defer();
       vm.deferred.promise.then(function() {
+        console.log('resol')
         vm.typeStats = ProfileService.getChallengeTypeStats(vm.stats, 'develop', vm.subTrack.toLowerCase().replace(/ /g, ''));
         ChallengeService.getChallenges({
           filter: 'userId=' + vm.profile.userId
         }).then(function(data) {
           vm.challenges = data;
         });
       });
+      if (vm.altResolve) {
+        vm.deferred.resolve(vm);
+      }
     }
 
   }

app/profile/develop/develop.jade

@@ -1,4 +1,4 @@
-.profile-develop-container
+.profile-develop-container(ng-hide='vm.loading', ng-cloak)
   hr
   h1.type Develop: {{vm.subTrack}}
   hr

app/profile/profile.controller.js

@@ -12,6 +12,7 @@
     vm.title = "Profile";
     vm.message = "Message"
     vm.profile = {};
+    vm.loading = true;
     vm.userHandle = userHandle;
 
     activate(vms);
@@ -42,12 +43,24 @@
           // until horizontal scroll is implemented
           vm.skills = skills.skills;
           vm.categories = ProfileService.getRanks(vm.stats);
+          vm.loading = false;
         });
       });
     }
 
-    $scope.initProfile = function(vm) {
-      vms.push(vm);
+    $scope.initProfile = function(newVm) {
+      if (!vm.stats) {
+        vms.push(newVm);
+      } else {
+        newVm.profile = vm.profile;
+        newVm.stats = vm.stats;
+        newVm.numProjects = vm.numProjects;
+        newVm.numWins = vm.numWins;
+        newVm.skills = vm.skills;
+        newVm.categories = vm.categories;
+        newVm.altResolve = true;
+        newVm.loading = false;
+      }
     }
 
   }

app/profile/profile.jade

@@ -1,7 +1,7 @@
-.profile-header-container
+.profile-header-container(ng-hide="vm.loading", ng-cloak)
   .left
     profile-widget(profile="vm.profile", edit-profile-link="vm.showEditProfileLink")
   .right
     h4 member for {{vm.tenure}} years
 
-ui-view
+ui-view(ng-hide="vm.loading", ng-cloak)