Merge branch 'dev' into new-listings

Author: tladendo

app/directives/challenge-links/challenge-links.jade

@@ -1,10 +1,10 @@
 .challenge-links(ng-class="view + '-view'")
-  a.registrants(ng-href="{{challenge|challengeLinks:'registrants'}}", ng-switch="challenge.subTrack")
+  a.registrants(ng-href="{{challenge|challengeLinks:'registrants'}}", ng-switch="challenge.subTrack", target="_self")
     .icon.registrants-icon
     p(ng-switch-when="MARATHON_MATCH") {{challenge.numRegistrants[0]}}
     p(ng-switch-default) {{challenge.numRegistrants}}
 
-  a.submissions(ng-hide="challenge.track === 'DATA_SCIENCE'", ng-href="{{challenge|challengeLinks:'submissions'}}")
+  a.submissions(ng-hide="challenge.track === 'DATA_SCIENCE'", ng-href="{{challenge|challengeLinks:'submissions'}}", target="_self")
     .icon.submissions-icon
     p {{challenge.numSubmissions}}
 

app/my-challenges/my-challenges.controller.js

@@ -146,6 +146,14 @@ import _ from 'lodash'
       vm.getChallenges(currentOffset, false)
     }
 
+    window.onscroll = function() {
+      if ((window.innerHeight + window.scrollY) >= document.body.offsetHeight) {
+        if (vm.totalCount > vm.myChallenges.length) {
+          vm.loadMore()
+        }
+      }
+    }
+
     function _checkForParticipation() {
       return ChallengeService.checkChallengeParticipation(vm.handle, function(participated) {
         vm.neverParticipated = !participated

app/my-challenges/my-challenges.jade

@@ -1,6 +1,6 @@
 .my-challenges-container
   .my-challenges
-    
+
     .page-header
       page-state-header(handle="{{vm.handle}}", page-title="My Challenges", hide-money="true", show-back-link="true", default-state="dashboard")
 
@@ -26,10 +26,7 @@
 
         .hasChallenges(ng-show="vm.myChallenges.length", state="vm.loading")
 
-          .data(ng-class="vm.view + '-view'")                      
+          .data(ng-class="vm.view + '-view'")
             challenge-tile(
-              ng-repeat="challenge in vm.myChallenges | orderBy:vm.orderBy:true", 
+              ng-repeat="challenge in vm.myChallenges | orderBy:vm.orderBy:true",
               challenge="challenge", view="vm.view", ng-class="vm.view + '-view'")
-
-          tc-section.load-more-section(state="vm.loading")
-              button.tc-btn(ng-show="vm.totalCount > vm.myChallenges.length", ng-click="vm.loadMore()") Load More

app/my-dashboard/header-dashboard/header-dashboard.spec.js

@@ -3,56 +3,15 @@ const mockData = require('../../../tests/test-helpers/mock-data')
 
 /* jshint -W117, -W030 */
 describe('Header Dashboard Controller', function() {
-  var userService, profileService, identity
   var profile = mockData.getMockProfile()
-  var stats = mockData.getMockStats()
-  var financials = mockData.getMockUserFinancials()
 
   beforeEach(function() {
     bard.appModule('topcoder')
     bard.inject(this,
       '$controller',
       '$rootScope',
       '$q',
-      'UserService',
-      'ProfileService',
       'Helpers')
-
-    userService = UserService
-    profileService = ProfileService
-
-    identity = function() {
-      return {
-        handle: 'albertwang',
-        userId: 123456
-      }
-    }
-
-    // mock user api
-    sinon.stub(userService, 'getUserIdentity', function() {
-      return {
-        userId: 1234567,
-        handle: 'ut',
-        email: 'ut@topcoder.com'
-      }
-    })
-
-    // mock profile api
-    sinon.stub(profileService, 'getUserProfile', function(handle) {
-      var deferred = $q.defer()
-      deferred.resolve(profile)
-      return deferred.promise
-    })
-    sinon.stub(profileService, 'getUserStats', function(handle) {
-      var deferred = $q.defer()
-      deferred.resolve(stats)
-      return deferred.promise
-    })
-    sinon.stub(profileService, 'getUserFinancials', function(handle) {
-      var deferred = $q.defer()
-      deferred.resolve(financials)
-      return deferred.promise
-    })
   })
 
   bard.verifyNoOutstandingHttpRequests()
@@ -61,33 +20,6 @@ describe('Header Dashboard Controller', function() {
     var controller = null
     beforeEach( function(){
       controller = $controller('HeaderDashboardController', {
-        UserService : userService,
-        ProfileService: profileService,
-        userIdentity: identity,
-        profile: profile
-      })
-      $rootScope.$apply()
-    })
-
-    it('variables should be initialized to correct value', function() {
-      expect(controller.profile).to.exist
-      expect(controller.profile.handle).to.equal('albertwang')
-    })
-  })
-
-  describe('inialization with profile api stats endpoint error', function() {
-    var controller = null
-    beforeEach( function(){
-      profileService.getUserStats.restore()
-      sinon.stub(profileService, 'getUserStats', function(handle) {
-        var deferred = $q.defer()
-        deferred.reject('failed')
-        return deferred.promise
-      })
-      controller = $controller('HeaderDashboardController', {
-        UserService : userService,
-        ProfileService: profileService,
-        userIdentity: identity,
         profile: profile
       })
       $rootScope.$apply()
@@ -99,27 +31,17 @@ describe('Header Dashboard Controller', function() {
     })
   })
 
-  describe('inialization with profile api profile endpoint error', function() {
+  describe('inialization with null profile', function() {
     var controller = null
     beforeEach( function(){
-      profileService.getUserProfile.restore()
-      sinon.stub(profileService, 'getUserProfile', function(handle) {
-        var deferred = $q.defer()
-        deferred.reject('failed')
-        return deferred.promise
-      })
       controller = $controller('HeaderDashboardController', {
-        UserService : userService,
-        ProfileService: profileService,
-        userIdentity: identity,
-        profile: profileService.getUserProfile()
+        profile: null
       })
       $rootScope.$apply()
     })
 
     it('variables should be initialized to correct value', function() {
-      expect(controller.profile.$$state.status).to.equal(2)
-      expect(controller.profile.$$state.value).to.equal('failed')
+      expect(controller.profile).to.be.null
     })
   })
 

app/profile/badges/badges.jade

@@ -1,4 +1,5 @@
 header.head
+  .ngdialog-close
   .breadcrumbs
     .handle
       img.profile-circle(fallback-src=require("../../../assets/images/avatarPlaceholder.png"), ng-src="{{vm.profile.photoURL}}")

app/services/externalAccounts.service.js

@@ -194,7 +194,7 @@ import _ from 'lodash'
         } else {
           logger.error('Unsupported social login backend', provider)
 
-          $q.reject({
+          reject({
             status: 'failed',
             'error': 'Unsupported social login backend \'' + provider + '\''
           })