Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit 389d487

Browse files
chore(doc-gen): new docs
chore(doc-gen): implement dgeni
1 parent a564160 commit 389d487

File tree

109 files changed

+8410
-6316
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+8410
-6316
lines changed

Gruntfile.js

+8-9
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ module.exports = function(grunt) {
2323
parallel: {
2424
travis: {
2525
tasks: [
26-
util.parallelTask(['test:unit', 'test:docgen', 'test:promises-aplus', 'tests:docs'], {stream: true}),
26+
util.parallelTask(['test:unit', 'test:promises-aplus'/*, 'tests:docs'*/], {stream: true}),
2727
util.parallelTask(['test:e2e'])
2828
]
2929
}
@@ -77,7 +77,7 @@ module.exports = function(grunt) {
7777
tests: {
7878
jqlite: 'karma-jqlite.conf.js',
7979
jquery: 'karma-jquery.conf.js',
80-
docs: 'karma-docs.conf.js',
80+
//docs: 'karma-docs.conf.js',
8181
modules: 'karma-modules.conf.js'
8282
},
8383

@@ -86,7 +86,7 @@ module.exports = function(grunt) {
8686
jqlite: 'karma-jqlite.conf.js',
8787
jquery: 'karma-jquery.conf.js',
8888
modules: 'karma-modules.conf.js',
89-
docs: 'karma-docs.conf.js'
89+
//docs: 'karma-docs.conf.js'
9090
},
9191

9292

@@ -217,9 +217,9 @@ module.exports = function(grunt) {
217217
},
218218

219219

220-
docs: {
221-
process: ['build/docs/*.html', 'build/docs/.htaccess']
222-
},
220+
// docs: {
221+
// process: ['build/docs/*.html', 'build/docs/.htaccess']
222+
// },
223223

224224
"jasmine_node": {
225225
projectRoot: 'docs/spec'
@@ -286,17 +286,16 @@ module.exports = function(grunt) {
286286

287287

288288
//alias tasks
289-
grunt.registerTask('test', 'Run unit, docs and e2e tests with Karma', ['jshint', 'package','test:unit','test:promises-aplus', 'tests:docs', 'test:protractor']);
289+
grunt.registerTask('test', 'Run unit, docs and e2e tests with Karma', ['jshint', 'package','test:unit','test:promises-aplus'/*, 'tests:docs'*/, 'test:protractor']);
290290
grunt.registerTask('test:jqlite', 'Run the unit tests with Karma' , ['tests:jqlite']);
291291
grunt.registerTask('test:jquery', 'Run the jQuery unit tests with Karma', ['tests:jquery']);
292292
grunt.registerTask('test:modules', 'Run the Karma module tests with Karma', ['tests:modules']);
293-
grunt.registerTask('test:docs', 'Run the doc-page tests with Karma', ['package', 'tests:docs']);
293+
grunt.registerTask('test:docs', 'Run the doc-page tests with Karma', ['package'/*, 'tests:docs'*/]);
294294
grunt.registerTask('test:unit', 'Run unit, jQuery and Karma module tests with Karma', ['tests:jqlite', 'tests:jquery', 'tests:modules']);
295295
grunt.registerTask('test:protractor', 'Run the end to end tests with Protractor and keep a test server running in the background', ['webdriver', 'connect:testserver', 'protractor:normal']);
296296
grunt.registerTask('test:jq-protractor', 'Run the end to end tests against jquery with Protractor and keep a test server running in the background', ['webdriver', 'connect:testserver', 'protractor:jquery']);
297297
grunt.registerTask('test:ci-protractor', 'Run the end to end tests with Protractor and keep a test server running in the background', ['webdriver', 'connect:testserver', 'protractor:jenkins']);
298298
grunt.registerTask('test:e2e', 'Alias for test:protractor', ['test:protractor']);
299-
grunt.registerTask('test:docgen', ['jasmine_node']);
300299
grunt.registerTask('test:promises-aplus',['build:promises-aplus-adapter','shell:promises-aplus-tests']);
301300

302301
grunt.registerTask('minify', ['bower','clean', 'build', 'minall']);

bower.json

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
{
22
"name": "AngularJS",
33
"devDependencies": {
4-
"jquery": "1.10.2",
5-
"lunr.js": "0.4.0",
6-
"google-code-prettify": "1.0.0",
7-
"components-font-awesome": "3.1.0",
8-
"bootstrap": "https://raw.github.com/twbs/bootstrap/v2.0.2/docs/assets/bootstrap.zip",
4+
5+
"jquery": "~1.10.2",
6+
"lunr.js": "~0.4.3",
7+
"open-sans-fontface": "~1.0.4",
8+
"google-code-prettify": "~1.0.1",
9+
910
"closure-compiler": "https://closure-compiler.googlecode.com/files/compiler-20130603.zip",
1011
"ng-closure-runner": "https://raw.github.com/angular/ng-closure-runner/v0.2.3/assets/ng-closure-runner.zip"
1112
}

docs/app/assets/css/animations.css

Whitespace-only changes.

0 commit comments

Comments
 (0)