diff --git a/.jshintrc b/.jshintrc index 6f00218e37..60f49fd369 100644 --- a/.jshintrc +++ b/.jshintrc @@ -1,13 +1,24 @@ { - "globalstrict": true, + "strict": "global", "globals": { + // Angular "angular": false, + + // Angular mocks + "module": false, + "inject": false, + + // Jasmine + "jasmine": false, "describe": false, - "it": false, - "expect": false, "beforeEach": false, "afterEach": false, - "module": false, - "inject": false + "it": false, + "expect": false, + + // Protractor + "browser": false, + "element": false, + "by": false } -} \ No newline at end of file +} diff --git a/.travis.yml b/.travis.yml index cce5c682a8..a549d113c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: node_js node_js: - - "0.10" + - '4.4' before_script: - export DISPLAY=:99.0 diff --git a/README.md b/README.md index e7aece1083..c0deb480c9 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ this server is: npm start ``` -Now browse to the app at `http://localhost:8000/app/index.html`. +Now browse to the app at `http://localhost:8000/index.html`. diff --git a/app/app.js b/app/app.js index 21eccdb8ea..6ea2401bcd 100644 --- a/app/app.js +++ b/app/app.js @@ -7,6 +7,8 @@ angular.module('myApp', [ 'myApp.view2', 'myApp.version' ]). -config(['$routeProvider', function($routeProvider) { +config(['$locationProvider', '$routeProvider', function($locationProvider, $routeProvider) { + $locationProvider.hashPrefix('!'); + $routeProvider.otherwise({redirectTo: '/view1'}); }]); diff --git a/app/index-async.html b/app/index-async.html index a559b7168e..39a592fb57 100644 --- a/app/index-async.html +++ b/app/index-async.html @@ -46,8 +46,8 @@
diff --git a/app/index.html b/app/index.html index 3c4bb6b02e..ec9da03650 100644 --- a/app/index.html +++ b/app/index.html @@ -16,8 +16,8 @@