diff --git a/.travis.yml b/.travis.yml index c8eca13..12ca731 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ cache: - node_modules - bower_components node_js: - - 4.2.3 + - 5.4.0 before_install: - npm install -g grunt-cli install: diff --git a/Gruntfile.js b/Gruntfile.js index 739ca27..38a1dbc 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -3,9 +3,6 @@ module.exports = function(grunt) { var path = require('path'); - // Time how long tasks take. Can help when optimizing build times - require('time-grunt')(grunt); - require('load-grunt-config')(grunt, { configPath: path.join(process.cwd(), 'config/grunt'), data: { @@ -17,7 +14,7 @@ module.exports = function(grunt) { ' * @link <%= pkg.homepage %>\n' + ' * @author <%= pkg.authors.join(", ") %>\n' + ' * @license MIT License, http://www.opensource.org/licenses/MIT\n' + - ' */\n', + ' */\n' }, pkg: grunt.file.readJSON('bower.json'), paths: { diff --git a/package.json b/package.json index 3fa386e..1490199 100644 --- a/package.json +++ b/package.json @@ -33,22 +33,23 @@ }, "devDependencies": { "grunt": "^0.4.5", - "grunt-contrib-clean": "^0.5.0", - "grunt-contrib-concat": "^0.4.0", - "grunt-contrib-connect": "^0.7.1", - "grunt-contrib-copy": "^0.5.0", - "grunt-contrib-jshint": "^0.11.3", - "grunt-contrib-uglify": "^0.10.1", + "grunt-contrib-clean": "^1.0.0", + "grunt-contrib-concat": "^1.0.0", + "grunt-contrib-connect": "^1.0.0", + "grunt-contrib-copy": "^1.0.0", + "grunt-contrib-jshint": "^1.0.0", + "grunt-contrib-uglify": "^1.0.0", "grunt-contrib-watch": "^0.6.1", - "grunt-karma": "^0.8.3", - "grunt-newer": "^0.7.0", + "grunt-karma": "^0.12.1", + "grunt-newer": "^1.1.2", "grunt-ng-annotate": "^1.0.1", + "jasmine-core": "^2.4.1", "jshint-stylish": "^2.1.0", - "karma": "^0.12.17", + "karma": "^0.13.21", "karma-jasmine": "^0.3.6", "karma-mocha-reporter": "^1.1.3", - "karma-phantomjs-launcher": "^0.1.4", - "load-grunt-config": "^0.19.0", - "time-grunt": "^1.2.2" + "karma-phantomjs-launcher": "^1.0.0", + "phantomjs-prebuilt": "^2.1.4", + "load-grunt-config": "^0.19.0" } } diff --git a/src/core/permissionModule.js b/src/core/permissionModule.js index 201c4e4..62de893 100644 --- a/src/core/permissionModule.js +++ b/src/core/permissionModule.js @@ -106,7 +106,7 @@ $state .go(toState.name, toParams, {notify: false}) .then(function () { - $rootScope.$broadcast('$stateChangeSuccess', toState, toParams, options); + $rootScope.$broadcast('$stateChangeSuccess', toState, toParams); }); }) .catch(function (rejectedPermission) { @@ -117,7 +117,7 @@ $state.go(redirectStateName, toParams, {notify: false}); }) .then(function () { - $rootScope.$broadcast('$stateChangeSuccess', toState, toParams, options); + $rootScope.$broadcast('$stateChangeSuccess', toState, toParams); }); }) .finally(function () {