summaryrefslogtreecommitdiffstats
path: root/js
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2014-09-11 17:08:04 +0200
committerBernhard Posselt <dev@bernhard-posselt.com>2014-09-11 17:08:04 +0200
commitb4c8934dd3975ba8e5031ecf2f43a2432b7d375f (patch)
tree238cdc745df1929fc6e8c79934f749b8272a4a38 /js
parent7d5da5d6029bfe541c404e69307dc51ac568a13a (diff)
fix line lengths and indention
Diffstat (limited to 'js')
-rw-r--r--js/Gruntfile.js12
-rw-r--r--js/build/app.js2
-rw-r--r--js/directive/NewsStopPropagation.js2
-rw-r--r--js/karma.conf.js12
-rw-r--r--js/tests/unit/controller/ContentControllerSpec.js76
5 files changed, 56 insertions, 48 deletions
diff --git a/js/Gruntfile.js b/js/Gruntfile.js
index f82b86bb1..79c119087 100644
--- a/js/Gruntfile.js
+++ b/js/Gruntfile.js
@@ -58,7 +58,8 @@ module.exports = function (grunt) {
uglify: {
app: {
files: {
- '<%= meta.production %>app.min.js': ['<%= meta.production %>app.js']
+ '<%= meta.production %>app.min.js':
+ ['<%= meta.production %>app.js']
}
}
},
@@ -161,11 +162,14 @@ module.exports = function (grunt) {
});
// make tasks available under simpler commands
- grunt.registerTask('default', ['jshint', 'concat', 'wrap', 'ngAnnotate', 'uglify']);
+ grunt.registerTask('default', ['jshint', 'concat', 'wrap', 'ngAnnotate',
+ 'uglify']);
grunt.registerTask('dev', ['watch:concat']);
grunt.registerTask('test', ['karma:unit']);
grunt.registerTask('php', ['watch:phpunit']);
- grunt.registerTask('e2e', ['protractor_webdriver', 'connect', 'protractor']);
+ grunt.registerTask('e2e', ['protractor_webdriver', 'connect',
+ 'protractor']);
grunt.registerTask('ci-unit', ['default', 'karma:continuous']);
- grunt.registerTask('ci-e2e', ['protractor_webdriver', 'connect', 'protractor']);
+ grunt.registerTask('ci-e2e', ['protractor_webdriver', 'connect',
+ 'protractor']);
}; \ No newline at end of file
diff --git a/js/build/app.js b/js/build/app.js
index 5a875e21f..3527bd1a3 100644
--- a/js/build/app.js
+++ b/js/build/app.js
@@ -1627,7 +1627,7 @@ app.directive('newsScroll', ["$timeout", function ($timeout) {
};
}]);
app.directive('newsStopPropagation', function () {
- 'use strict';
+ 'use strict';
return {
restrict: 'A',
link: function (scope, element) {
diff --git a/js/directive/NewsStopPropagation.js b/js/directive/NewsStopPropagation.js
index 48d8ce3c4..e63d06c23 100644
--- a/js/directive/NewsStopPropagation.js
+++ b/js/directive/NewsStopPropagation.js
@@ -8,7 +8,7 @@
* @copyright Bernhard Posselt 2014
*/
app.directive('newsStopPropagation', function () {
- 'use strict';
+ 'use strict';
return {
restrict: 'A',
link: function (scope, element) {
diff --git a/js/karma.conf.js b/js/karma.conf.js
index d16be2dad..24e6f3a83 100644
--- a/js/karma.conf.js
+++ b/js/karma.conf.js
@@ -6,7 +6,8 @@ module.exports = function (config) {
config.set({
- // base path that will be used to resolve all patterns (eg. files, exclude)
+ // base path that will be used to resolve all patterns
+ // (eg. files, exclude)
basePath: '',
@@ -64,16 +65,19 @@ module.exports = function (config) {
// level of logging
- // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+ // 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
+ // enable / disable watching file and executing tests whenever any
+ // file changes
autoWatch: false,
// start these browsers
- // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
+ // available browser launchers:
+ // https://npmjs.org/browse/keyword/karma-launcher
browsers: ['Firefox'],
diff --git a/js/tests/unit/controller/ContentControllerSpec.js b/js/tests/unit/controller/ContentControllerSpec.js
index bdea6e16a..097744083 100644
--- a/js/tests/unit/controller/ContentControllerSpec.js
+++ b/js/tests/unit/controller/ContentControllerSpec.js
@@ -279,18 +279,18 @@ describe('ContentController', function () {
Publisher.subscribe(ItemResource).toChannels(['items']);
ItemResource.autoPage = jasmine.createSpy('autoPage')
- .andCallFake(function () {
- return {
- success: function (callback) {
- callback({
- 'items': []
- });
-
- return {
- error: function () {}
- };
- }
- };
+ .andCallFake(function () {
+ return {
+ success: function (callback) {
+ callback({
+ 'items': []
+ });
+
+ return {
+ error: function () {}
+ };
+ }
+ };
});
var ctrl = $controller('ContentController', {
@@ -329,18 +329,18 @@ describe('ContentController', function () {
Publisher.subscribe(ItemResource).toChannels(['items']);
ItemResource.autoPage = jasmine.createSpy('autoPage')
- .andCallFake(function () {
- return {
- success: function (callback) {
- callback({
- 'items': [{items: [{id: 3}]}]
- });
-
- return {
- error: function () {}
- };
- }
- };
+ .andCallFake(function () {
+ return {
+ success: function (callback) {
+ callback({
+ 'items': [{items: [{id: 3}]}]
+ });
+
+ return {
+ error: function () {}
+ };
+ }
+ };
});
var ctrl = $controller('ContentController', {
@@ -377,20 +377,20 @@ describe('ContentController', function () {
Publisher.subscribe(ItemResource).toChannels(['items']);
ItemResource.autoPage = jasmine.createSpy('autoPage')
- .andCallFake(function () {
- return {
- success: function (callback) {
- callback({
- 'items': []
- });
-
- return {
- error: function (callback) {
- callback();
- }
- };
- }
- };
+ .andCallFake(function () {
+ return {
+ success: function (callback) {
+ callback({
+ 'items': []
+ });
+
+ return {
+ error: function (callback) {
+ callback();
+ }
+ };
+ }
+ };
});
var ctrl = $controller('ContentController', {