Merge "Add grunt-lintspaces module to check cr-at-end in js files"

.jshintrc

@@ -66,4 +66,4 @@
         "element": false,
         "protractor": false // Protractor
     }
-}
+}

Gruntfile.js

@@ -121,6 +121,25 @@ module.exports = function (grunt) {
             }
         },
 
+        /**
+         * grunt newlines
+         *
+         * Checks that all js files end with a newline
+         */
+        lintspaces: {
+            dist: {
+                src: [
+                    dir.source + '/**/*.js',
+                    dir.test + '/**/*.js',
+                    './*.js'
+                ],
+                options: {
+                    newline: true,
+                    trailingspaces: true
+                }
+            },
+        },
+
         /**
          * grunt recess
          *
@@ -444,6 +463,14 @@ module.exports = function (grunt) {
                 ],
                 tasks: ['jshint']
             },
+            lintspaces: {
+                files: [
+                    'Gruntfile.js',
+                    dir.source + '/**/*.js',
+                    dir.test + '/**/*.js'
+                ],
+                tasks: ['lintspaces']
+            },
             livereload: {
                 options: {
                     livereload: config.livereload.port
@@ -559,6 +586,7 @@ module.exports = function (grunt) {
         'useminPrepare',
         'concat',
         'less',
+        'lintspaces',
         'imagemin',
         'html2js',
         'copy:dist',

karma-integration.conf.js

@@ -68,4 +68,4 @@ module.exports = function (config) {
                 '/karma-html-reporter/jasmine_template.html'
         }
     });
-};
+};

karma-unit.conf.js

@@ -69,4 +69,4 @@ module.exports = function (config) {
                 '/karma-html-reporter/jasmine_template.html'
         }
     });
-};
+};

package.json

@@ -55,6 +55,7 @@
         "selenium-standalone": "2.43.1-2.9.0-1",
         "karma-html-reporter": "0.2.4",
         "grunt-connect-proxy": "0.1.11",
-        "grunt-webfont": "0.4.8"
+        "grunt-webfont": "0.4.8",
+        "grunt-lintspaces": "0.6.0"
   }
 }

src/app/admin/controller/project_group_admin_controller.js

@@ -86,4 +86,4 @@ angular.module('sb.admin').controller('ProjectGroupAdminController',
 
         // Initialize
         $scope.search();
-    });
+    });

src/app/admin/controller/project_group_delete_controller.js

@@ -41,4 +41,4 @@ angular.module('sb.admin').controller('ProjectGroupDeleteController',
         $scope.close = function () {
             $modalInstance.dismiss('cancel');
         };
-    });
+    });

src/app/admin/controller/project_group_edit_controller.js

@@ -200,4 +200,4 @@ angular.module('sb.admin').controller('ProjectGroupEditController',
             // Put our model into the array
             $scope.projects[index] = model;
         };
-    });
+    });

src/app/admin/controller/project_group_item_controller.js

@@ -41,4 +41,4 @@ angular.module('sb.admin').controller('ProjectGroupItemController',
                 $log.error(error);
                 $scope.loadingProjectGroupItems = false;
             });
-    });
+    });

src/app/admin/controller/project_group_new_controller.js

@@ -164,4 +164,4 @@ angular.module('sb.admin').controller('ProjectGroupNewController',
             $modalInstance.dismiss('cancel');
         };
 
-    });
+    });

src/app/admin/controller/user_admin_controller.js

@@ -62,4 +62,4 @@ angular.module('sb.admin').controller('UserAdminController',
 
         // Initialize
         $scope.search();
-    });
+    });

src/app/admin/controller/user_edit_controller.js

@@ -32,4 +32,4 @@ angular.module('sb.admin').controller('UserEditController',
         $scope.cancel = function () {
             $state.go('admin.user');
         };
-    });
+    });

src/app/admin/controller/user_new_controller.js

@@ -57,4 +57,4 @@ angular.module('sb.admin').controller('UserNewController',
         $scope.close = function () {
             $modalInstance.dismiss('cancel');
         };
-    });
+    });

src/app/admin/module.js

@@ -87,4 +87,4 @@ angular.module('sb.admin', [ 'sb.services', 'sb.templates', 'sb.util',
                 url: '/team/:id',
                 templateUrl: 'app/admin/template/team_edit.html'
             });
-    });
+    });

src/app/auth/controller/auth_authorize_controller.js

@@ -41,4 +41,4 @@ angular.module('sb.auth').controller('AuthAuthorizeController',
 
         // We're not an error, let's fire the authorization.
         OpenId.authorize();
-    });
+    });

src/app/auth/controller/auth_deauthorize_controller.js

@@ -25,4 +25,4 @@ angular.module('sb.auth').controller('AuthDeauthorizeController',
         $log.debug('Logging out');
         Session.destroySession();
         $state.go('index');
-    });
+    });

src/app/auth/controller/auth_error_controller.js

@@ -24,4 +24,4 @@ angular.module('sb.auth').controller('AuthErrorController',
         $scope.error = $stateParams.error || 'Unknown';
         $scope.errorDescription = $stateParams.error_description ||
             'No description received from server.';
-    });
+    });

src/app/auth/controller/auth_token_controller.js

@@ -68,4 +68,4 @@ angular.module('sb.auth').controller('AuthTokenController',
                 $state.go('auth.error', error);
             }
         );
-    });
+    });

src/app/auth/controller/login_required_modal_controller.js

@@ -30,4 +30,4 @@ angular.module('sb.auth').controller('LoginRequiredModalController',
         $scope.close = function () {
             $modalInstance.dismiss('cancel');
         };
-    });
+    });

src/app/auth/directive/permission.js

@@ -44,4 +44,4 @@ angular.module('sb.util').directive('permission',
                 );
             }
         };
-    });
+    });

src/app/auth/http/http_authorization_header.js

@@ -41,4 +41,4 @@ angular.module('sb.auth').factory('httpAuthorizationHeader',
         'use strict';
 
         $httpProvider.interceptors.push('httpAuthorizationHeader');
-    });
+    });

src/app/auth/module.js

@@ -81,4 +81,4 @@ angular.module('sb.auth', [ 'sb.services', 'sb.templates', 'ui.router',
         }, Priority.LAST);
 
         RefreshManager.scheduleRefresh();
-    });
+    });

src/app/auth/provider/session_state.js

@@ -36,4 +36,4 @@ angular.module('sb.auth').value('SessionState', {
      */
     PENDING: 'pending'
 
-});
+});

src/app/auth/service/access_token.js

@@ -168,4 +168,4 @@ angular.module('sb.auth').factory('AccessToken',
                 return localStorageService.set(ID_TOKEN, value);
             }
         };
-    });
+    });

src/app/auth/service/current_user.js

@@ -134,4 +134,4 @@ angular.module('sb.auth').factory('CurrentUser',
                 return resolveCurrentUser();
             }
         };
-    });
+    });

src/app/auth/service/open_id.js

@@ -110,4 +110,4 @@ angular.module('sb.auth').factory('OpenId',
                 return deferred.promise;
             }
         };
-    });
+    });

src/app/auth/service/permission_manager.js

@@ -147,4 +147,4 @@ angular.module('sb.auth').factory('PermissionManager',
                 return resolvePermission(permName);
             }
         };
-    });
+    });

src/app/auth/service/refresh_manager.js

@@ -83,4 +83,4 @@ angular.module('sb.auth').service('RefreshManager',
         this.scheduleRefresh = scheduleRefresh;
 
     }
-);
+);

src/app/auth/service/session.js

@@ -176,4 +176,4 @@ angular.module('sb.auth').factory('Session',
                 return deferred.promise;
             }
         };
-    });
+    });

src/app/dashboard/directive/subscription_event.js

@@ -42,4 +42,4 @@ angular.module('sb.dashboard').directive('subscriptionEvent',
             },
             templateUrl: 'app/dashboard/template/subscription_event.html'
         };
-    });
+    });

src/app/notification/controller/notifications_controller.js

@@ -66,4 +66,4 @@ angular.module('sb.notification').controller('NotificationsController',
                 }
             )
         );
-    });
+    });

src/app/notification/directive/notifications.js

@@ -27,4 +27,4 @@ angular.module('sb.notification').directive('notifications',
             templateUrl: 'app/notification/template/notifications.html',
             controller: 'NotificationsController'
         };
-    });
+    });

src/app/notification/module.js

@@ -18,4 +18,4 @@
  * This module acts as the central routing point for all errors that occur
  * within storyboard.
  */
-angular.module('sb.notification', []);
+angular.module('sb.notification', []);

src/app/notification/provider/priority.js

@@ -24,4 +24,4 @@ angular.module('sb.notification').constant('Priority', {
     FIRST: 0,
     LAST: 999,
     AFTER: 1000
-});
+});

src/app/notification/provider/severity.js

@@ -24,4 +24,4 @@ angular.module('sb.notification').constant('Severity', {
     WARNING: 'warning',
     INFO: 'info',
     SUCCESS: 'success'
-});
+});

src/app/notification/service/notification_service.js

@@ -134,4 +134,4 @@ angular.module('sb.notification').factory('Notification',
                 };
             }
         };
-    });
+    });

src/app/pages/module.js

@@ -37,4 +37,4 @@ angular.module('sb.pages',
                 url: '/about',
                 templateUrl: 'app/pages/template/about.html'
             });
-    });
+    });

src/app/profile/controller/profile_preferences_controller.js

@@ -32,4 +32,4 @@ angular.module('sb.profile').controller('ProfilePreferencesController',
 
             $scope.message = 'Preferences Saved!';
         };
-    });
+    });

src/app/profile/controller/profile_token_new_controller.js

@@ -60,4 +60,4 @@ angular.module('sb.profile').controller('ProfileTokenNewController',
         $scope.close = function () {
             $modalInstance.dismiss('cancel');
         };
-    });
+    });

src/app/profile/controller/profile_tokens_controller.js

@@ -67,4 +67,4 @@ angular.module('sb.profile').controller('ProfileTokenItemController',
         $scope.expired = $scope.expires.getTime() < now.getTime();
         $scope.current =
             $scope.token.access_token === AccessToken.getAccessToken();
-    });
+    });

src/app/profile/module.js

@@ -81,4 +81,4 @@ angular.module('sb.profile',
                     }
                 }
             });
-    });
+    });

src/app/search/directive/search_results.js

@@ -150,4 +150,4 @@ angular.module('sb.search').directive('searchResults',
                     });
             }
         };
-    });
+    });

src/app/services/criteria/story_status.js

@@ -59,4 +59,4 @@ angular.module('sb.services').factory('StoryStatus',
                 return deferred.promise;
             }
         };
-    });
+    });

src/app/services/criteria/task_priority.js

@@ -59,4 +59,4 @@ angular.module('sb.services').factory('TaskPriority',
                 return deferred.promise;
             }
         };
-    });
+    });

src/app/services/criteria/task_status.js

@@ -61,4 +61,4 @@ angular.module('sb.services').factory('TaskStatus',
                 return deferred.promise;
             }
         };
-    });
+    });

src/app/services/criteria/text.js

@@ -36,4 +36,4 @@ angular.module('sb.services').factory('Text',
                 return deferred.promise;
             }
         };
-    });
+    });

src/app/services/http/http_cache_handler.js

@@ -59,4 +59,4 @@ angular.module('sb.services').factory('httpCacheHandler',
     .config(function ($httpProvider) {
         'use strict';
         $httpProvider.interceptors.push('httpCacheHandler');
-    });
+    });

src/app/services/http/http_error_broadcaster.js

@@ -63,4 +63,4 @@ angular.module('sb.services')
     .config(function ($httpProvider) {
         'use strict';
         $httpProvider.interceptors.unshift('httpErrorBroadcaster');
-    });
+    });

src/app/services/module.js

@@ -19,4 +19,4 @@
  * used by the storyboard client. Its resources are available via injection to
  * any module that declares it as a dependency.
  */
-angular.module('sb.services', ['ngResource', 'sb.notification']);
+angular.module('sb.services', ['ngResource', 'sb.notification']);

src/app/services/notification/http_message_filter.js

@@ -89,4 +89,4 @@ angular.module('sb.services')
         Notification.intercept(filterTemplateRequests, Priority.BEFORE);
         Notification.intercept(filterSuccessful, Priority.LAST);
         Notification.intercept(rewriteHttpStatus, Priority.AFTER);
-    });
+    });

src/app/services/provider/page_size.js

@@ -19,4 +19,4 @@
  * Our globally configured page size.
  */
 
-angular.module('sb.services').constant('pageSize', 500);
+angular.module('sb.services').constant('pageSize', 500);

src/app/services/resource/comment.js

@@ -32,4 +32,4 @@ angular.module('sb.services').factory('Comment',
                 story_id: '@story_id'
             }
         );
-    });
+    });

src/app/services/resource/preference.js

@@ -111,4 +111,4 @@ angular.module('sb.services').provider('Preference',
         PreferenceProvider.addPreference('page_size', 10);
 
     })
-;
+;

src/app/services/resource/project.js

@@ -39,4 +39,4 @@ angular.module('sb.services').factory('Project',
         );
 
         return resource;
-    });
+    });

src/app/services/resource/project_group.js

@@ -38,4 +38,4 @@ angular.module('sb.services').factory('ProjectGroup',
         );
 
         return resource;
-    });
+    });

src/app/services/resource/project_group_item.js

@@ -47,4 +47,4 @@ angular.module('sb.services').factory('ProjectGroupItem',
                 }
             }
         );
-    });
+    });

src/app/services/resource/story.js

@@ -43,4 +43,4 @@ angular.module('sb.services').factory('Story',
         );
 
         return resource;
-    });
+    });

src/app/services/resource/subscription.js

@@ -28,4 +28,4 @@ angular.module('sb.services').factory('Subscription',
             '/subscriptions/search',
             {id: '@id'}
         );
-    });
+    });

src/app/services/resource/subscription_event.js

@@ -26,4 +26,4 @@ angular.module('sb.services').factory('SubscriptionEvent',
             '/subscription_events/search',
             {id: '@id'}
         );
-    });
+    });

src/app/services/resource/task.js

@@ -46,4 +46,4 @@ angular.module('sb.services').factory('Task',
         );
 
         return resource;
-    });
+    });

src/app/services/resource/team.js

@@ -32,4 +32,4 @@ angular.module('sb.services').factory('Team',
                 id: '@id'
             }
         );
-    });
+    });

src/app/services/resource/timeline_event.js

@@ -32,4 +32,4 @@ angular.module('sb.services').factory('TimelineEvent',
                 story_id: '@story_id'
             }
         );
-    });
+    });

src/app/services/resource/user.js

@@ -39,4 +39,4 @@ angular.module('sb.services').factory('User',
         );
 
         return resource;
-    });
+    });

src/app/services/resource/user_token.js

@@ -32,4 +32,4 @@ angular.module('sb.services').factory('UserToken',
         );
 
         return resource;
-    });
+    });

src/app/stories/controller/story_delete_controller.js

@@ -39,4 +39,4 @@ angular.module('sb.story').controller('StoryDeleteController',
         $scope.close = function () {
             $modalInstance.dismiss('cancel');
         };
-    });
+    });

src/app/stories/controller/story_task_delete_controller.js

@@ -38,4 +38,4 @@ angular.module('sb.story').controller('StoryTaskDeleteController',
         $scope.close = function () {
             $modalInstance.dismiss('cancel');
         };
-    });
+    });

src/app/stories/controller/timeline_filter_controller.js

@@ -36,4 +36,4 @@ angular.module('sb.story').controller('TimelineFilterController',
         init();
 
     })
-;
+;

src/app/storyboard/auto_configuration.js

@@ -47,4 +47,4 @@ angular.element(document)
             }
         );
     }
-);
+);

src/app/storyboard/module.js

@@ -70,4 +70,4 @@ angular.module('storyboard',
         });
 
         $http.defaults.cache = DSCacheFactory.get('defaultCache');
-    });
+    });

src/app/subscription/directive/subscribe.js

@@ -179,4 +179,4 @@ angular.module('sb.util').directive('subscribe',
                 resolveSubscription();
             }
         };
-    });
+    });

src/app/subscription/module.js

@@ -20,4 +20,4 @@
  *
  * @author Michael Krotscheck
  */
-angular.module('sb.subscription', ['sb.notification']);
+angular.module('sb.subscription', ['sb.notification']);

src/app/util/constant/title_regex.js

@@ -22,4 +22,4 @@ angular.module('sb.util').run(function ($rootScope) {
     'use strict';
     var regex = '^[a-zA-Z0-9]+([\\-\\./]?[a-zA-Z0-9]+)*$';
     $rootScope.PROJECT_NAME_REGEX = new RegExp(regex);
-});
+});

src/app/util/control/tag_input.js

@@ -89,4 +89,4 @@ angular.module('sb.util').controller('TagInputController',
             event.stopImmediatePropagation();
         };
     }
-);
+);

src/app/util/directive/active_path.js

@@ -47,4 +47,4 @@ angular.module('sb.util').directive('activePath',
                 setActivePath();
             }
         };
-    });
+    });

src/app/util/directive/focus.js

@@ -46,4 +46,4 @@ angular.module('sb.util').directive('focus',
                 }
             }
         };
-    });
+    });

src/app/util/directive/input_inline.js

@@ -80,4 +80,4 @@ angular.module('sb.util').directive('inputInline',
                 });
             }
         };
-    });
+    });

src/app/util/directive/resolve_story.js

@@ -34,4 +34,4 @@ angular.module('sb.util').directive('resolveStory',
                 }
             }
         };
-    });
+    });

src/app/util/directive/story_status_label.js

@@ -66,4 +66,4 @@ angular.module('sb.util').directive('storyStatusLabel',
                 updateStoryLabel();
             }
         };
-    });
+    });

src/app/util/directive/story_task_status.js

@@ -29,4 +29,4 @@ angular.module('sb.util').directive('storyTaskStatus',
                 story: '='
             }
         };
-    });
+    });

src/app/util/directive/task_status_dropdown.js

@@ -71,4 +71,4 @@ angular.module('sb.util').directive('taskStatusDropdown',
                 };
             }
         };
-    });
+    });

src/app/util/filter/capitalize_filter.js

@@ -28,4 +28,4 @@ angular.module('sb.util').filter('capitalize',
                 return value;
             }
         };
-    });
+    });

src/app/util/filter/debug_filter.js

@@ -28,4 +28,4 @@ angular.module('sb.util').filter('debug',
             console.warn('DEBUG', value);
             return value;
         };
-    });
+    });

src/app/util/filter/task_status_label.js

@@ -38,4 +38,4 @@ angular.module('sb.util').filter('taskStatusLabel',
                     return 'Unknown Status';
             }
         };
-    });
+    });

src/app/util/filter/truncate_filter.js

@@ -27,4 +27,4 @@ angular.module('sb.util').filter('truncate',
             }
             return value;
         };
-    });
+    });

src/app/util/helper/string_util.js

@@ -65,4 +65,4 @@ angular.module('sb.util').factory('StringUtil',
             }
         };
     }
-);
+);

src/app/util/helper/url_util.js

@@ -82,4 +82,4 @@ angular.module('sb.util').factory('UrlUtil',
             }
         };
     }
-);
+);

src/app/util/provider/search_param_provider.js

@@ -32,4 +32,4 @@ angular.module('sb.util').factory('$searchParams',
             return UrlUtil.deserializeParameters(search);
         }
         return params;
-    });
+    });

test/unit/custom_matchers.js

@@ -54,4 +54,4 @@ beforeEach(function () {
             };
         }
     });
-});
+});