Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added support of redirectTo instruction at segment params. #16

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
33 changes: 30 additions & 3 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
module.exports = function(grunt) {

grunt.initConfig({

pkg: grunt.file.readJSON('package.json'),
Expand Down Expand Up @@ -50,6 +49,14 @@ module.exports = function(grunt) {
autoWatch: false,
singleRun: true
}
},
angular15: {
options: {
keepalive: true,
configFile: 'karma-angular-1.5.conf.js',
autoWatch: false,
singleRun: true
}
}
},

Expand All @@ -59,15 +66,35 @@ module.exports = function(grunt) {
prop: 'gitdescribe'
}
}
},

"dgeni-alive": {
options: {
serve: {
port: '10000',
openBrowser: false
},
},
api: {
title: '<%= pkg.title %>',
version: '<%= pkg.version %>',
expand: false,
src: [
'src/**/*.js',
'docs/**/*.ngdoc'
],
dest: 'build/docs'
}
}

});

grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-karma');
grunt.loadNpmTasks('grunt-git-describe');

grunt.loadNpmTasks('dgeni-alive');

grunt.registerTask('default', ['concat:prod']);
grunt.registerTask('prod', ['git-describe:run', 'concat:prod', 'uglify']);
};
1 change: 1 addition & 0 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"karma-angular-1.2.conf.js",
"karma-angular-1.3.conf.js",
"karma-angular-1.4.conf.js",
"karma-angular-1.5.conf.js",
"package.json",
"src",
"**/*.min.js"
Expand Down
16 changes: 16 additions & 0 deletions docs/api/index.ngdoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
@ngdoc overview
@name index
@area api
@title API Docs
@description
# Angular-route-segment API Docs

Welcome to the angular-route-segment API docs page. These pages contain the reference materials for version <strong ng-bind="version"></strong>.

## Modules

## {@link route-segment route-segment (routing module)}
Module defines routing configuration.

## {@link view-segment view-segment (presentation module)}
Module defines routing views and helper components.
7 changes: 4 additions & 3 deletions karma-angular-1.2.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ module.exports = function(config) {

basePath: './',

frameworks: ["jasmine"],
frameworks: [
'jasmine',
'jasmine-jquery-matchers'
],

files: [
'test/lib/jquery.min.js',
'test/lib/helpers.js',
'https://ajax.googleapis.com/ajax/libs/angularjs/1.2.21/angular.js',
'https://ajax.googleapis.com/ajax/libs/angularjs/1.2.21/angular-route.js',
'https://ajax.googleapis.com/ajax/libs/angularjs/1.2.21/angular-animate.js',
Expand Down
7 changes: 4 additions & 3 deletions karma-angular-1.3.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ module.exports = function(config) {

basePath: './',

frameworks: ["jasmine"],
frameworks: [
'jasmine',
'jasmine-jquery-matchers'
],

files: [
'test/lib/jquery.min.js',
'test/lib/helpers.js',
'https://ajax.googleapis.com/ajax/libs/angularjs/1.3.16/angular.js',
'https://ajax.googleapis.com/ajax/libs/angularjs/1.3.16/angular-route.js',
'https://ajax.googleapis.com/ajax/libs/angularjs/1.3.16/angular-animate.js',
Expand Down
7 changes: 4 additions & 3 deletions karma-angular-1.4.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ module.exports = function(config) {

basePath: './',

frameworks: ["jasmine"],
frameworks: [
'jasmine',
'jasmine-jquery-matchers'
],

files: [
'test/lib/jquery.min.js',
'test/lib/helpers.js',
'https://ajax.googleapis.com/ajax/libs/angularjs/1.4.0/angular.js',
'https://ajax.googleapis.com/ajax/libs/angularjs/1.4.0/angular-route.js',
'https://ajax.googleapis.com/ajax/libs/angularjs/1.4.0/angular-animate.js',
Expand Down
26 changes: 26 additions & 0 deletions karma-angular-1.5.conf.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
module.exports = function(config) {
config.set({

basePath: './',

frameworks: [
'jasmine',
'jasmine-jquery-matchers'
],

files: [
'https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0-rc.1/angular.js',
'https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0-rc.1/angular-route.js',
'https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0-rc.1/angular-animate.js',
'https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0-rc.1/angular-mocks.js',
'https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0-rc.1/angular-scenario.js',
'src/**/*.js',
'test/unit/**/*.js'
],

autoWatch: true,

browsers: ['PhantomJS']

});
};
41 changes: 24 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,26 @@
{
"name": "angular-route-segment",
"version": "1.5.0",
"devDependencies": {
"grunt": "",
"grunt-contrib-uglify": "",
"grunt-contrib-concat": "",
"grunt-karma": "",
"karma": "",
"karma-jasmine": "0.1.5",
"karma-phantomjs-launcher": "",
"karma-junit-reporter": "",
"grunt-git-describe": ""
},
"main": "build/angular-route-segment.js",
"scripts": {
"test": "grunt karma"
}
"name": "angular-route-segment",
"title": "Angular Route Segment",
"version": "1.5.0",
"devDependencies": {
"dgeni-alive": "~0.2.0",
"grunt": "",
"grunt-contrib-concat": "",
"grunt-contrib-uglify": "",
"grunt-git-describe": "",
"grunt-karma": "",
"jasmine-core": "~2.4.1",
"jasmine-jquery-matchers": "~1.0.1",
"jquery": "~2.2.0",
"karma": "~0.13.19",
"karma-jasmine": "~0.3.6",
"karma-jasmine-jquery-matchers": "~1.0.0",
"karma-junit-reporter": "",
"karma-phantomjs-launcher": "~1.0.0",
"phantomjs-prebuilt": "~2.1.3"
},
"main": "build/angular-route-segment.js",
"scripts": {
"test": "grunt karma"
}
}
Loading