Add .jshintrc and bring project into compliance.

Remove global module variable to better align with style guide.
gdg-x · Mar 29, 2015 · ee4b414 · ee4b414
1 parent fc60286
commit ee4b414
Show file tree

Hide file tree

Showing 21 changed files with 124 additions and 34 deletions.
diff --git a/.jshintrc b/.jshintrc
@@ -0,0 +1,73 @@
+{
+    "bitwise": true,
+    "camelcase": true,
+    "curly": true,
+    "eqeqeq": true,
+    "es3": false,
+    "forin": true,
+    "freeze": true,
+    "immed": true,
+    "indent": 4,
+    "latedef": "nofunc",
+    "newcap": false,
+    "noarg": true,
+    "noempty": true,
+    "nonbsp": true,
+    "nonew": true,
+    "plusplus": false,
+    "quotmark": "single",
+    "undef": true,
+    "unused": false,
+    "strict": false,
+    "maxparams": 10,
+    "maxdepth": 5,
+    "maxstatements": 40,
+    "maxcomplexity": 16,
+    "maxlen": 120,
+    "asi": false,
+    "boss": false,
+    "debug": false,
+    "eqnull": true,
+    "esnext": true,
+    "evil": false,
+    "expr": false,
+    "funcscope": false,
+    "globalstrict": false,
+    "iterator": false,
+    "lastsemic": false,
+    "laxbreak": false,
+    "laxcomma": false,
+    "loopfunc": true,
+    "maxerr": 500,
+    "moz": false,
+    "multistr": false,
+    "notypeof": false,
+    "proto": false,
+    "scripturl": false,
+    "shadow": false,
+    "sub": true,
+    "supernew": false,
+    "validthis": false,
+    "noyield": false,
+    "devel": true,
+    "browser": true,
+    "node": true,
+    "globals": {
+        "angular": false,
+        "inject": false,
+        "gapi": false,
+        "$": false,
+        "moment": false,
+        "protractor": false,
+        "module": false,
+        "require": false,
+        "browser": false,
+        "element": false,
+        "by": false,
+        "describe": false,
+        "expect": false,
+        "beforeEach": false,
+        "afterEach": false,
+        "it": false
+    }
+}
diff --git a/app/about/about.js b/app/about/about.js
@@ -1,4 +1,5 @@
-boomerang.controller('AboutController', function ($http, $sce, Config, NavService) {
+angular.module('gdgXBoomerang')
+.controller('AboutController', function ($http, $sce, Config, NavService) {
     var vm = this;
     vm.loading = true;
     NavService.setNavTab(0);

diff --git a/app/boomerang.config.js b/app/boomerang.config.js
@@ -1,4 +1,5 @@
-boomerang.config(function ($routeProvider, $locationProvider, $mdThemingProvider) {
+angular.module('gdgXBoomerang')
+.config(function ($routeProvider, $locationProvider, $mdThemingProvider) {
 
     $locationProvider.hashPrefix('!');
 

diff --git a/app/boomerang.module.js b/app/boomerang.module.js
@@ -1,6 +1,5 @@
-var boomerang = angular.module('gdgXBoomerang', ['ngRoute', 'ngSanitize', 'ngAria', 'ngAnimate', 'ngMaterial']);
-
-boomerang.controller('MainController', function ($rootScope, Config, NavService) {
+angular.module('gdgXBoomerang', ['ngRoute', 'ngSanitize', 'ngAria', 'ngAnimate', 'ngMaterial'])
+.controller('MainController', function ($rootScope, Config, NavService) {
     var mc = this;
     mc.chapterName = Config.name;
     mc.googlePlusLink = 'https://plus.google.com/' + Config.id;

diff --git a/app/events/events.js b/app/events/events.js
@@ -1,4 +1,4 @@
-boomerang.controller('EventsController', function ($http, $log, $filter, Config, NavService) {
+angular.module('gdgXBoomerang').controller('EventsController', function ($http, $log, $filter, Config, NavService) {
     var vm = this;
     NavService.setNavTab(2);
     vm.chapterName = Config.name;

diff --git a/app/filters/hashLinkyFilter.js b/app/filters/hashLinkyFilter.js
@@ -1,5 +1,5 @@
 // Google+ hashtag linky from http://plnkr.co/edit/IEpLfZ8gO2B9mJcTKuWY?p=preview
-boomerang.filter('hashLinky', function() {
+angular.module('gdgXBoomerang').filter('hashLinky', function() {
     var ELEMENT_NODE = 1;
     var TEXT_NODE = 3;
     var linkifiedDOM = document.createElement('div');

diff --git a/app/filters/htmlLinkyFilter.js b/app/filters/htmlLinkyFilter.js
@@ -1,5 +1,5 @@
 // HTML-ified linky from http://plnkr.co/edit/IEpLfZ8gO2B9mJcTKuWY?p=preview
-boomerang.filter('htmlLinky', function($filter) {
+angular.module('gdgXBoomerang').filter('htmlLinky', function($filter) {
     var ELEMENT_NODE = 1;
     var TEXT_NODE = 3;
     var linkifiedDOM = document.createElement('div');

diff --git a/app/news/components/gplusAlbum.js b/app/news/components/gplusAlbum.js
@@ -1,4 +1,5 @@
-boomerang.directive('gplusAlbum', function () {
+angular.module('gdgXBoomerang')
+.directive('gplusAlbum', function () {
     return {
         scope: {
             article: '=',

diff --git a/app/news/components/gplusArticle.js b/app/news/components/gplusArticle.js
@@ -1,4 +1,5 @@
-boomerang.directive('gplusArticle', function () {
+angular.module('gdgXBoomerang')
+.directive('gplusArticle', function () {
     return {
         scope: {
             article: '=',

diff --git a/app/news/components/gplusEvent.js b/app/news/components/gplusEvent.js
@@ -1,4 +1,5 @@
-boomerang.directive('gplusEvent', function () {
+angular.module('gdgXBoomerang')
+.directive('gplusEvent', function () {
     return {
         scope: { article: '=' },
         templateUrl: '/app/news/components/gplusEvent.html'

diff --git a/app/news/components/gplusNoAttachments.js b/app/news/components/gplusNoAttachments.js
@@ -1,4 +1,5 @@
-boomerang.directive('gplusNoAttachments', function () {
+angular.module('gdgXBoomerang')
+.directive('gplusNoAttachments', function () {
     return {
         scope: { article: '=' },
         templateUrl: '/app/news/components/gplusNoAttachments.html'

diff --git a/app/news/components/gplusPhotoVideo.js b/app/news/components/gplusPhotoVideo.js
@@ -1,4 +1,5 @@
-boomerang.directive('gplusPhotoVideo', function () {
+angular.module('gdgXBoomerang')
+.directive('gplusPhotoVideo', function () {
     return {
         scope: {
             article: '=',

diff --git a/app/news/components/gplusPostContent.js b/app/news/components/gplusPostContent.js
@@ -1,4 +1,5 @@
-boomerang.directive('gplusPostContent', function () {
+angular.module('gdgXBoomerang')
+.directive('gplusPostContent', function () {
     return {
         transclude: true,
         templateUrl: '/app/news/components/gplusPostContent.html'

diff --git a/app/news/components/gplusPostImage.js b/app/news/components/gplusPostImage.js
@@ -1,4 +1,5 @@
-boomerang.directive('gplusPostImage', function () {
+angular.module('gdgXBoomerang')
+.directive('gplusPostImage', function () {
     return {
         templateUrl: '/app/news/components/gplusPostImage.html'
     };

diff --git a/app/news/components/gplusPostVideo.js b/app/news/components/gplusPostVideo.js
@@ -1,4 +1,5 @@
-boomerang.directive('gplusPostVideo', function ($sce) {
+angular.module('gdgXBoomerang')
+.directive('gplusPostVideo', function ($sce) {
     return {
         link: function (scope, element) {
             scope.videoUrl = $sce.trustAsResourceUrl(scope.attachment.embed.url);

diff --git a/app/news/components/newsItemFooter.js b/app/news/components/newsItemFooter.js
@@ -1,4 +1,5 @@
-boomerang.directive('newsItemFooter', function () {
+angular.module('gdgXBoomerang')
+.directive('newsItemFooter', function () {
     return {
         templateUrl: '/app/news/components/newsItemFooter.html'
     };

diff --git a/app/news/news.js b/app/news/news.js
@@ -1,4 +1,5 @@
-boomerang.controller('NewsController', function ($http, $timeout, $filter, $log, $sce, Config, NavService) {
+angular.module('gdgXBoomerang')
+.controller('NewsController', function ($http, $timeout, $filter, $log, $sce, Config, NavService) {
     var vm = this;
     NavService.setNavTab(1);
     vm.loading = true;

diff --git a/app/photos/photos.js b/app/photos/photos.js
@@ -1,4 +1,5 @@
-boomerang.controller('PhotosController', function ($http, Config, NavService) {
+angular.module('gdgXBoomerang')
+.controller('PhotosController', function ($http, Config, NavService) {
     var vm = this;
     vm.loading = true;
     NavService.setNavTab(3);
@@ -11,19 +12,22 @@ boomerang.controller('PhotosController', function ($http, Config, NavService) {
 
     $http.jsonp(pwa).
         success(function (data) {
-            var p = data.feed.entry;
-            for (var x in p) {
-                var photo = {
-                    link: p[x].link[1].href,
-                    src: p[x].content.src,
-                    alt: p[x].title.$t,
-                    title: p[x].summary.$t
-                };
-                vm.photos.push(photo);
+            var photoList = data.feed.entry;
+            var i;
+            if (photoList) {
+                for (i = 0; i < photoList.length; i++) {
+                    var photo = {
+                        link: photoList[i].link[1].href,
+                        src: photoList[i].content.src,
+                        alt: photoList[i].title.$t,
+                        title: photoList[i].summary.$t
+                    };
+                    vm.photos.push(photo);
+                }
             }
             vm.loading = false;
         })
-        .error(function (data) {
+        .error(function () {
             vm.errorMsg = 'Sorry, we failed to retrieve the Photos from the Picasa Web Albums API. ' +
                 'Logging out of your Google Account and logging back in may resolve this issue.';
             vm.loading = false;

diff --git a/app/services/configService.js b/app/services/configService.js
@@ -1,9 +1,10 @@
-boomerang.factory('Config', function () {
+angular.module('gdgXBoomerang')
+.factory('Config', function () {
     return {
         // TODO Modify these to configure your app
         'name'          : 'GDG Space Coast',
         'id'            : '103959793061819610212',
-        'googleApi'     : '<insert your API key here>',
+        'googleApi'     : 'AIzaSyA9ALjr2iWvhf3Rsz9-bH0cEcDcrdkpuAg',
         'pwaId'         : '5915725140705884785', // Picasa Web Album id, must belong to Google+ id above
         'domain'        : 'http://www.gdgspacecoast.org',
         'twitter'       : 'gdgspacecoast',

diff --git a/app/services/navService.js b/app/services/navService.js
@@ -1,4 +1,5 @@
-boomerang.factory('NavService', function () {
+angular.module('gdgXBoomerang')
+.factory('NavService', function () {
     var navTab = '0';
     var navListener;
 

diff --git a/test/unit/karma.conf.js b/test/unit/karma.conf.js
@@ -42,8 +42,8 @@ module.exports = function (config) {
         // enable / disable colors in the output (reporters and logs)
         colors: true,
 
-        // level of logging
-        // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+        // Level of logging. Possible values:
+        // config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
         logLevel: config.LOG_INFO,
 
         // enable / disable watching file and executing tests whenever any file changes