Merge remote-tracking branch 'upstream/master' into merge

# Conflicts:
#	app/js/on_config.js
#	package.json

Author: StrikeForceZero

README.md

@@ -82,7 +82,16 @@ export default {
 
 ##### Dependency injection
 
-Dependency injection is carried out with the `ng-annotate` library. The Gulp tasks will take care of injecting any dependencies, requiring you only to specify the dependencies within the function call and nothing more.
+Dependency injection is carried out with the `ng-annotate` library. In order to take advantage of this, a simple directive prologue of the format:
+
+```js
+function MyService($http) {
+  'ngInject';
+  ...
+}
+```
+
+needs to be added at the very beginning of any Angular functions/modules. The Gulp tasks will then take care of adding any dependency injection, requiring you to only specify the dependencies within the function parameters and nothing more.
 
 ---
 

app/js/filters/example.js

@@ -1,9 +1,11 @@
 'use strict';
 
 function ExampleFilter() {
+
   return function(input) {
     return input.replace(/keyboard/ig,'leopard');
   };
+
 }
 
 export default {

app/js/main.js

@@ -32,4 +32,6 @@ angular.module('app').config(require('./on_config'));
 
 angular.module('app').run(require('./on_run'));
 
-angular.bootstrap(document, ['app']);
+angular.bootstrap(document, ['app'], {
+  strictDi: true
+});

app/js/on_config.js

@@ -1,6 +1,7 @@
 'use strict';
 
 function OnConfig($stateProvider, $locationProvider, $urlRouterProvider, $compileProvider) {
+  'ngInject';
 
   /* This needs to remain disabled for bundled apps, as the base is disabled in the index.html */
   $locationProvider.html5Mode(false);

app/js/on_run.js

@@ -1,6 +1,7 @@
 'use strict';
 
 function OnRun($rootScope, AppSettings) {
+  'ngInject';
 
   // change page title based on state
   $rootScope.$on('$stateChangeSuccess', (event, toState) => {

app/js/services/example.js

@@ -1,6 +1,7 @@
 'use strict';
 
 function ExampleService($http) {
+  'ngInject';
 
   const service = {};
 

gulp/tasks/browserify.js

@@ -80,7 +80,6 @@ function buildScript(file) {
       .pipe(gulpif(createSourcemap, buffer()))
       .pipe(gulpif(createSourcemap, sourcemaps.init()))
       .pipe(gulpif(global.isProd, streamify(uglify({
-        mangle: false,
         compress: { drop_console: true }
       }))))
       .pipe(gulpif(createSourcemap, sourcemaps.write('./')))

gulp/tasks/production.js

@@ -4,11 +4,11 @@ import gulp        from 'gulp';
 import runSequence from 'run-sequence';
 
 gulp.task('prod', ['clean'], function(cb) {
-  
+
   cb = cb || function() {};
 
   global.isProd = true;
 
-  runSequence(['styles', 'images', 'fonts', 'views', 'browserify'], 'gzip', cb);
+  runSequence(['styles', 'images', 'fonts', 'views'], 'browserify', 'gzip', cb);
 
 });