Merge branch 'v1.2'

Author: marc92w

Diff for: .babelrc

@@ -0,0 +1,3 @@
+{
+  "presets": ["es2015"]
+}

Diff for: .bootstraprc

@@ -0,0 +1,68 @@
+---
+bootstrapVersion: 3
+#loglevel: debug
+
+env:
+  development:
+    extractStyles: false
+  production:
+    extractStyles: true
+
+styleLoaders:
+  - style
+  - css
+  - sass
+
+styles:
+
+  # Mixins
+  mixins: true
+
+  # Reset and dependencies
+  normalize: true
+  print: true
+  glyphicons: true
+
+  # Core CSS
+  scaffolding: true
+  type: true
+  code: true
+  grid: true
+  tables: true
+  forms: true
+  buttons: true
+
+  # Components
+  component-animations: true
+  dropdowns: true
+  button-groups: true
+  input-groups: true
+  navs: true
+  navbar: true
+  breadcrumbs: false
+  pagination: true
+  pager: true
+  labels: true
+  badges: false
+  jumbotron: true
+  thumbnails: false
+  alerts: true
+  progress-bars: false
+  media: true
+  list-group: true
+  panels: true
+  wells: true
+  responsive-embed: false
+  close: true
+
+  # Components w/ JavaScript
+  modals: false
+  tooltip: false
+  popovers: false
+  carousel: false
+
+  # Utility classes
+  utilities: true
+  responsive-utilities: true
+
+scripts: false

Diff for: .eslintrc

@@ -3,15 +3,32 @@
   "parser": "babel-eslint",
   "env": {
     "browser": true,
-    "node": true
+    "node": true,
+    "jasmine": true,
+    "jest": true
   },
   "rules": {
+    "camelcase": 1,
+    "complexity": 1,
+    "curly": 1,
+    "eqeqeq": 2,
+    "indent": [0, 2],
+    "no-bitwise": 1,
     "no-console": 0,
     "new-cap": 0,
     "strict": 0,
     "no-underscore-dangle": 0,
     "no-use-before-define": 0,
     "eol-last": 0,
-    "quotes": [2, "single", "avoid-escape"]
+    "quotes": [2, "single", "avoid-escape"],
+    "max-len": [1, 120],
+    "max-params": [1, 10],
+    "max-statements": [1, 40],
+    "no-var": 0,
+    "valid-jsdoc": [1, {
+      "requireReturn": false,
+      "requireParamDescription": false, 
+      "requireReturnDescription": false
+    }]
   }
 }

Diff for: .gitignore

@@ -2,3 +2,6 @@ node_modules/
 coverage/
 dist/
 .idea/
+.vscode/
+production.conf.json
+development.conf.json

Diff for: .jshintrc

@@ -13,6 +13,10 @@ LD-VOWL requires [Node.js](https://nodejs.org/) to be built.
 3. Run `npm install` in the root directory of LD-VOWL to install the dependencies.
 4. Run `npm run-script start` to start a local webpack development server on port 8080 or run `npm run-script deploy` for a production build.
 
+## Build
+
+To get a production build, run `npm run-script deploy`. After the build is finished, the results will be inside the `dist` directory.
+
 ## Tests
 
 In order to run the unit tests, run `npm run-script test`.

Diff for: README.md

@@ -3,15 +3,23 @@ import settingsTemplate from './components/settings/settings.html';
 import graphTemplate from './components/graph/graph.html';
 import aboutTemplate from './components/about/about.html';
 
+/**
+ * @param {$httpProvider} $httpProvider
+ * @param {$routeProvider} $routeProvider
+ * @param {$logProvider} $logProvider
+ *
+ * @ngInject
+ */
 function routing($httpProvider, $routeProvider, $logProvider) {
 
-  'ngInject';
-
   // set up http interceptor
   $httpProvider.interceptors.push('RequestCounter');
   $httpProvider.defaults.useXDomain = true;
   delete $httpProvider.defaults.headers.common['X-Requested-With'];
 
+  // apply changes in the next $digest cycle (around 10 milliseconds later, depending on the browser)
+  $httpProvider.useApplyAsync();
+
   // set up routes
   $routeProvider
     .when('/', {
@@ -42,9 +50,7 @@ function routing($httpProvider, $routeProvider, $logProvider) {
       redirectTo: '/'
     });
 
-  // jshint ignore:start
   $logProvider.debugEnabled(__LOGGING__); // eslint-disable-line no-undef
-  //jshint ignore:end
 
 } // end of routing()
 

Diff for: app/app.config.js

@@ -11,7 +11,10 @@ import routing from './app.config';
 import runBlock from './app.run';
 
 // create main app module
-module.exports = angular.module('ldVOWLApp', ['ngRoute', 'ngAnimate', 'ui.bootstrap', 'ngCookies', components, filters,
-  services, utilities])
+export default angular.module('ldVOWLApp', ['ngRoute', 'ngAnimate', 'ui.bootstrap',
+                                            components.name, 
+                                            filters.name,
+                                            services.name, 
+                                            utilities.name])
   .config(routing)
   .run(runBlock);

Diff for: app/app.js

@@ -1,7 +1,10 @@
+/**
+ * @param {$rootScope} $rootScope
+ *
+ * @ngInject
+ */
 function runBlock($rootScope) {
 
-  'ngInject';
-
   $rootScope.$on('$routeChangeSuccess', function (event, current) {
     if (current && current.$$route && current.$$route.title) {
       $rootScope.title = current.$$route.title;

Diff for: app/app.run.js

@@ -2,6 +2,12 @@ import angular from 'angular';
 
 import AboutCtrl from './about.ctrl';
 
+/**
+ * @ngdoc module
+ * @name components.about
+ * @description
+ *
+ * Module for the about page of the application.
+ */
 export default angular.module('components.about', [])
-  .controller('AboutCtrl', AboutCtrl)
-  .name;
+  .controller('AboutCtrl', AboutCtrl);

Diff for: app/components/about/about.module.js

@@ -7,5 +7,9 @@ import sidebar from './sidebar/sidebar.module';
 import start from './start/start.module';
 import about from './about/about.module';
 
-export default angular.module('components', [graph, header, settings, sidebar, start, about])
-                      .name;
+export default angular.module('components', [graph.name, 
+                                              header.name, 
+                                              settings.name,
+                                              sidebar.name,
+                                              start.name,
+                                              about.name]);