Merge branch 'dev' into tom-history-graph

Conflicts:
	app/services/profile.service.js

Author: tladendo

app/account/login/login.controller.js

@@ -101,6 +101,7 @@
       TcAuthService.socialLogin(backend, callbackUrl);
     };
 
+    vm.$stateParams = $stateParams;
   }
 
 })();

app/account/login/login.jade

@@ -32,5 +32,5 @@
   a.forgot-password(ui-sref="resetPassword") Forgot Password?
 
   p.redirect Don't have an account? 
-    a(ui-sref="register") Join Now.
+    a(ui-sref="register(vm.$stateParams)") Join Now.
 

app/account/register/register.controller.js

@@ -87,7 +87,7 @@
           userId: vm.socialUserId,
           name: vm.firstname + " " + vm.lastname,
           email: vm.socialProfile.email,
-          emailVerified: vm.socialProfile.emailVerified,
+          emailVerified: vm.socialProfile.email_verified,
           providerType: vm.socialProvider
         }
       }
@@ -120,5 +120,7 @@
           callbackURL: callbackUrl
         });
     }
+
+    vm.$stateParams = $stateParams;
   }
 })();

app/account/register/register.jade

@@ -67,7 +67,7 @@
       p.form-error(ng-show="vm.registerForm.email.$dirty && vm.registerForm.email.$invalid") Please enter a valid email address.
 
     .validation-bar(ng-class="{ 'success-bar': (vm.registerForm.password.$valid) }")
-      toggle-password
+      toggle-password(ng-if="!vm.isSocialRegistration")
 
       .tips.password-tips(ng-show="vm.passwordFocus")
         h3 Password Tips:
@@ -96,4 +96,4 @@
       i.fa.fa-google-plus-square(ng-click="vm.socialRegister('google-oauth2')")
 
   p.redirect Already have an account? 
-    a(ui-sref="login") Login.
+    a(ui-sref="login(vm.$stateParams)") Login.

app/directives/account/toggle-password/toggle-password.directive.js

@@ -20,6 +20,12 @@
           passwordInput.focus();
         });
 
+        element.bind('keyup', function(event) {
+          if (event.keyCode === 13) {
+            passwordInput.blur();
+          }
+        });
+
         vm.onFocus = function(event) {
           vm.passwordFocus = true;
           vm.placeholder = '';

app/directives/challenge-tiles/challenge-tile.spec.js

@@ -2,13 +2,16 @@
 describe('Challenge Tile Directive', function() {
   var scope;
   var element;
+  var domain;
   var challenge = mockData.getMockChallengeWithUserDetails();
   var spotlightChallenge = mockData.getMockSpotlightChallenges()[0];
 
   beforeEach(function() {
     bard.appModule('topcoder');
-    bard.inject(this, '$compile', '$rootScope');
+    bard.inject(this, '$compile', '$rootScope', 'CONSTANTS');
+
     scope = $rootScope.$new();
+    domain = CONSTANTS.domain;
   });
 
   bard.verifyNoOutstandingHttpRequests();
@@ -34,7 +37,7 @@ describe('Challenge Tile Directive', function() {
     });
 
     it('should have domain added to the scope', function() {
-      expect(element.isolateScope().DOMAIN).to.equal('topcoder-dev.com');
+      expect(element.isolateScope().DOMAIN).to.equal(domain);
     });
   });
 

app/directives/profile-widget/profile-widget.directive.js

@@ -11,12 +11,14 @@
         profile: '=profile',
         editProfileLink: '=editProfileLink'
       },
-      link: function($scope, elem, attrs, ctrl) {
-        $scope.DOMAIN = CONSTANTS.domain;
+      link: function(scope, elem, attrs) {
+        scope.DOMAIN = CONSTANTS.domain;
 
-        if (_.isUndefined($scope.editProfileLink)) {
-          $scope.editProfileLink = false;
-        }
+        scope.$watch('editProfileLink', function(newValue, oldValue, scope) {
+          if (newValue) {
+            scope.editProfileLink = newValue;
+          }
+        });
       }
     };
   }

app/directives/profile-widget/profile-widget.jade

@@ -1,11 +1,11 @@
 .profile-widget-directive
-  a(ui-sref="profile.about({userHandle: profile.handle})") 
-    img.profile-circle(fallback-src="/images/avatarPlaceholder.png", ng-src="{{profile.photo.photoUrl}}")
+  a(ui-sref="profile.about({userHandle: profile.handle})")
+    img.profile-circle(fallback-img="/images/avatarPlaceholder.png", loading-src="/images/avatarPlaceholder.png", ng-src="{{profile.photoURL}}")
 
   .info
-    h1 {{profile.handle}} 
+    h1 {{profile.handle}}
 
-      a(href="http://forums.{{DOMAIN}}/?module=History&userID={{vm.profile.userId}}")
+      a(href="http://forums.{{DOMAIN}}/?module=History&userID={{profile.userId}}")
         i.fa.fa-comment-o
 
     h3.tracks {{profile.tracks || [] | track | join: ', '}}

app/directives/tc-pager/tc-pager.jade

@@ -1,17 +1,17 @@
 (function() {
   'use strict';
-  angular.module('tcUIComponents').directive('tcPager', function() {
+  angular.module('tcUIComponents').directive('tcPaginator', function() {
     return {
       restrict: 'E',
       transclude: true,
       replace: true,
-      templateUrl: 'directives/tc-pager/tc-pager.html',
+      templateUrl: 'directives/tc-paginator/tc-paginator.html',
       scope: {
         pageParams: '=',
         data: '='
       },
       controller: ['$log', '$scope', '$element', function($log, $scope, $element) {
-        $element.addClass('tc-pager');
+        $element.addClass('tc-paginator');
         var vm = this;
 
         // pageParams.offset 0 based index of the first challenge to be shown

app/directives/tc-pager/tc-pager.directive.js renamed to app/directives/tc-paginator/tc-paginator.directive.js

@@ -0,0 +1,10 @@
+p.pager
+  a.prev(ng-click="vm.prevPage()", ng-class="{disabled: !vm.prevPageAvailable}") Prev
+  span   |  
+  span.first(ng-bind="vm.pageParams.offset + 1")
+  span -
+  span.last(ng-bind="vm.pageParams.offset + vm.pageParams.count")
+  span   of  
+  span.total(ng-bind="vm.pageParams.totalCount")
+  span   |  
+  a.next(ng-click="vm.nextPage()", ng-class="{disabled: !vm.nextPageAvailable}") Next

app/directives/tc-paginator/tc-paginator.jade

@@ -0,0 +1,196 @@
+/* jshint -W117, -W030 */
+describe('TC Paginator Directive', function() {
+  var scope;
+  var element;
+  var controller;
+  var data = [{
+    id: 1
+  }, {
+    id: 2
+  }, {
+    id: 3
+  }, {
+    id: 4
+  }, {
+    id: 5
+  }];
+  var pageParams = {
+    offset: 0,
+    limit: 2,
+    count: 0,
+    totalCount: 0,
+    updated: 0
+  };
+
+  beforeEach(function() {
+    bard.appModule('topcoder');
+    bard.inject(this, '$compile', '$rootScope');
+    scope = $rootScope.$new();
+  });
+
+  bard.verifyNoOutstandingHttpRequests();
+
+  describe('TC Paginator', function() {
+    var pager;
+
+    beforeEach(function() {
+      scope.data = data.slice(0, 2);
+      scope.data.metadata = {totalCount : 5};
+      pageParams = {
+        offset: 0,
+        limit: 2,
+        count: 0,
+        totalCount: 0,
+        updated: 0
+      };
+      scope.pageParams = pageParams;
+      element = angular.element('<tc-paginator data="data" page-params="pageParams"></tc-paginator>)');
+      pager = $compile(element)(scope);
+      scope.$digest();
+      controller = element.controller('tcPaginator')
+    });
+
+    it('should have pager related html', function() {
+      var prev = pager.find('.prev');
+      expect(prev).not.to.null;
+      // with offset 0, prev link should be disabled
+      expect(prev.hasClass('disabled')).to.equal(true);
+      var first = pager.find('.first');
+      expect(first).not.to.null;
+      expect(first.text()).to.equal("1");
+      var last = pager.find('.last');
+      expect(last).not.to.null;
+      expect(last.text()).to.equal("2");
+      var total = pager.find('.total');
+      expect(total).not.to.null;
+      expect(total.text()).to.equal("5");
+      var next = pager.find('.next');
+      expect(next).not.to.null;
+      // with offset 0, page size 2 and 5 total records, next link should be enabled
+      expect(next.hasClass('disabled')).to.equal(false);
+    });
+
+    it('change in scope data should trigger paginator update', function() {
+      // change the data
+      scope.data = data.slice(3, 4);
+      scope.data.metadata = {totalCount: 7};
+      scope.$apply();
+
+      var total = pager.find('.total');
+      expect(total).not.to.null;
+      // correct totalCount should be reflected in the HTML
+      expect(total.text()).to.equal("7");
+      // pageParams should also reflect the correct totalCount
+      expect(pageParams.totalCount).to.equal(7);
+      // count should 1 because the length of the scope.data is 1
+      expect(pageParams.count).to.equal(1);
+    });
+
+    it('controller.nextPage() should update the pageParams', function() {
+      // calls nextPage method on controller
+      controller.nextPage();
+      expect(pageParams.offset).to.equal(2);
+      expect(pageParams.limit).to.equal(2);
+      expect(pageParams.updated).to.equal(1);
+    });
+
+    it('clicking on next link should update the pageParams', function() {
+      // clicks on the next page link
+      var next = pager.find('.next');
+      expect(next).not.to.null;
+      next.click();
+
+      expect(pageParams.offset).to.equal(2);
+      expect(pageParams.limit).to.equal(2);
+      expect(pageParams.updated).to.equal(1);
+    });
+
+    it('controller.nextPage() should not update pageParams on last page', function() {
+      // on first page nextPageAvailable should be true
+      expect(controller.nextPageAvailable).to.equal(true);
+      // calls nextPage method on controller: page 2
+      controller.nextPage();
+      expect(pageParams.offset).to.equal(2);
+      expect(pageParams.limit).to.equal(2);
+      expect(pageParams.updated).to.equal(1);
+      // update the data to trigger paginator state update
+      scope.data = data.slice(2, 4);
+      scope.$apply();
+      // on second page nextPageAvailable should be true
+      expect(controller.nextPageAvailable).to.equal(true);
+
+      // calls nextPage method on controller: page 3
+      controller.nextPage();
+      expect(pageParams.offset).to.equal(4);
+      expect(pageParams.limit).to.equal(2);
+      expect(pageParams.updated).to.equal(2);
+      // update the data to trigger paginator state update
+      scope.data = data.slice(2, 4);
+      scope.$apply();
+      // on thrid/last page nextPageAvailable should be false
+      expect(controller.nextPageAvailable).to.equal(false);
+
+      // calls nextPage
+      controller.nextPage();
+      // should not have any effect on page Params
+      expect(pageParams.offset).to.equal(4);
+      expect(pageParams.limit).to.equal(2);
+      expect(pageParams.updated).to.equal(2);
+
+    });
+
+    it('controller.prevPage() should not update the pageParams on first page', function() {
+      // prev page link should not be available
+      expect(controller.prevPageAvailable).to.equal(false);
+
+      // calls prevPage to move one page backward
+      controller.prevPage();
+      // verifies prevPage call does not have any effect
+      expect(pageParams.offset).to.equal(0);
+      expect(pageParams.limit).to.equal(2);
+      expect(pageParams.updated).to.equal(0);
+    });
+
+    it('controller.prevPage() should update the pageParams', function() {
+      // calls nextPage to move one page forward
+      controller.nextPage();
+      // verifies next page is successful
+      expect(pageParams.offset).to.equal(2);
+      expect(pageParams.limit).to.equal(2);
+      expect(pageParams.updated).to.equal(1);
+      // update the data to trigger paginator state update
+      scope.data = data.slice(2, 4);
+      scope.$apply();
+      expect(controller.prevPageAvailable).to.equal(true);
+
+      // calls prevPage to move one page backward
+      controller.prevPage();
+      // verifies prev page is successful
+      expect(pageParams.offset).to.equal(0);
+      expect(pageParams.limit).to.equal(2);
+      expect(pageParams.updated).to.equal(2);
+    });
+
+    it('clicking on prev link should update the pageParams', function() {
+      // calls nextPage to move one page forward
+      controller.nextPage();
+      // verifies next page is successful
+      expect(pageParams.offset).to.equal(2);
+      expect(pageParams.limit).to.equal(2);
+      expect(pageParams.updated).to.equal(1);
+      // update the data to trigger paginator state update
+      scope.data = data.slice(2, 4);
+      scope.$apply();
+      expect(controller.prevPageAvailable).to.equal(true);
+
+      // clicks on the prve page link
+      var prev = pager.find('.prev');
+      expect(prev).not.to.null;
+      prev.click();
+      // verifies prev page call is successful
+      expect(pageParams.offset).to.equal(0);
+      expect(pageParams.limit).to.equal(2);
+      expect(pageParams.updated).to.equal(2);
+    });
+  });
+});