Merge branch 'dev' of https://github.com/appirio-tech/topcoder-app into dev

Author: Nick Litwin

.version

@@ -1 +1 @@
-v1.0.16
+v1.0.17

app/directives/external-account/external-link-data.directive.jade

@@ -102,4 +102,4 @@
         p.link-title(data-ellipsis, ng-bind="account.title", ng-hide="account.status === 'PENDING'")
         p.link-title(ng-show="account.status === 'PENDING'") Loading data. This will take a few minutes.
 
-        a.link-url(ng-href="{{account.URL}}", ng-bind="account.URL")
+        a.link-url(ng-href="{{account.URL | urlProtocol}}", ng-bind="account.URL")

app/filters/filters.spec.js

@@ -3,7 +3,7 @@ describe('filters', function() {
 
   beforeEach(function() {
     bard.appModule('topcoder');
-    bard.inject(this, 'CONSTANTS', 'roleFilter', 'percentageFilter', 'ordinalFilter', 'displayLocationFilter', 'listRolesFilter', 'trackFilter', 'challengeLinksFilter', 'externalLinkColorFilter', 'emptyFilter', 'ternaryFilter');
+    bard.inject(this, 'CONSTANTS', 'roleFilter', 'percentageFilter', 'ordinalFilter', 'displayLocationFilter', 'listRolesFilter', 'trackFilter', 'challengeLinksFilter', 'externalLinkColorFilter', 'emptyFilter', 'ternaryFilter', 'urlProtocolFilter');
     domain = CONSTANTS.domain;
   });
 
@@ -135,4 +135,19 @@ describe('filters', function() {
       expect(ternaryFilter(true, 'm', 'n')).to.be.equal('m');
     });
   });
+
+  describe('urlProtocolFilter', function() {
+    it('should add http to the url ', function() {
+      expect(urlProtocolFilter('google.com')).to.be.equal('http://google.com');
+    });
+    it('should add http to the url ', function() {
+      expect(urlProtocolFilter('www.google.com')).to.be.equal('http://www.google.com');
+    });
+    it('should not add anything to the url ', function() {
+      expect(urlProtocolFilter('http://google.com')).to.be.equal('http://google.com');
+    });
+    it('should not add anything to the url ', function() {
+      expect(urlProtocolFilter('https://google.com')).to.be.equal('https://google.com');
+    });
+  });
 });

app/filters/url-protocol.filter.js

@@ -0,0 +1,23 @@
+(function() {
+  'use strict';
+
+  angular.module('topcoder').filter('urlProtocol', urlProtocol);
+
+  function urlProtocol() {
+    return function(link) {
+      if (!link) {
+        return link;
+      }
+      var result;
+      var startingUrl = "http://";
+      var httpsStartingUrl = "https://"; 
+      if(link.indexOf(startingUrl) === 0||link.indexOf(httpsStartingUrl) === 0) {
+        result = link;
+      } else {
+        result = startingUrl + link;
+      }
+      return result;
+    };
+  }
+
+})();

app/index.jade

@@ -232,6 +232,7 @@ html
     script(src="filters/track.filter.js")
     script(src="filters/truncate.filter.js")
     script(src="filters/underscore-strip.filter.js")
+    script(src="filters/url-protocol.filter.js")
     script(src="layout/layout.module.js")
     script(src="layout/header/header.controller.js")
     script(src="my-challenges/my-challenges.module.js")