Merge pull request #1813 from kripton/0.10-UpdateNewWebUI

New WebUI: Update angular and angular-route and add workaround to be compatible

Author: kripton

javascript/new-src/bower.json

@@ -7,9 +7,9 @@
   "license": "GPL",
   "private": true,
   "dependencies": {
-    "angular": "~1.3.14",
+    "angular": "~1.8.3",
     "bootstrap": "~3.3.1",
-    "angular-route": "~1.3.14"
+    "angular-route": "~1.8.3"
   },
   "exportsOverride": {
     "angular": {

javascript/new-src/package.json

@@ -3,13 +3,13 @@
   "license": "GPL-2.0+",
   "repository": "OpenLightingProject/ola",
   "devDependencies": {
-    "olp-javascript-style": "OpenLightingProject/javascript-style",
     "grunt": "~0.4.5",
     "grunt-bower-task": "^0.4.0",
     "grunt-contrib-cssmin": "^0.11.0",
     "grunt-contrib-jshint": "^1.1.0",
     "grunt-contrib-uglify": "^0.7.0",
     "grunt-contrib-watch": "^0.6.1",
-    "grunt-jscs": "^1.8.0"
+    "grunt-jscs": "^1.8.0",
+    "olp-javascript-style": "OpenLightingProject/javascript-style"
   }
 }

javascript/new-src/src/app.js

@@ -20,6 +20,15 @@
 /* global angular */
 var ola = angular.module('olaApp', ['ngRoute']);
 
+// AngularJS 1.6 now uses an '!' as the default hashPrefix, breaking
+// our routes. Following lines revert the default to the previous empty
+// string.
+// See https://docs.angularjs.org/guide/migration#commit-aa077e8
+ola.config(['$locationProvider', function($locationProvider) {
+  'use strict';
+  $locationProvider.hashPrefix('');
+}]);
+
 ola.config(['$routeProvider',
   function($routeProvider) {
     'use strict';