Skip to content

Commit d1c7f85

Browse files
committed
Merge remote-tracking branch 'origin/master' into gh-pages
2 parents 72eb2f2 + 125d3b1 commit d1c7f85

File tree

1 file changed

+1
-46
lines changed

1 file changed

+1
-46
lines changed

Gruntfile.js

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -122,51 +122,6 @@ module.exports = function (grunt) {
122122
}
123123
},
124124

125-
/**
126-
* The `index` task compiles the `index.html` file as a Grunt template. CSS
127-
* and JS files co-exist here but they get split apart later.
128-
*/
129-
index: {
130-
/**
131-
* During development, we don't want to have wait for compilation,
132-
* concatenation, minification, etc. So to avoid these steps, we simply
133-
* add all script files directly to the `<head>` of `index.html`. The
134-
* `src` property contains the list of included files.
135-
*/
136-
build: {
137-
dir: '',
138-
src: [
139-
'bower_components/angular/angular.min.js',
140-
'app/**/*.js',
141-
'bower_components/momentjs/min/moment-with-locales.min.js',
142-
'bower_components/humanize-duration/humanize-duration.js',
143-
'docs/docs.js',
144-
'bower_components/jquery/jquery.min.js',
145-
'bower_components/bootstrap/docs/assets/js/bootstrap.min.js',
146-
'docs/prettify.js',
147-
'docs/application.js',
148-
'bower_components/bootstrap/docs/assets/css/bootstrap.css',
149-
'bower_components/bootstrap/docs/assets/css/bootstrap-responsive.css',
150-
'docs/css/docs.css',
151-
'docs/css/prettify.css'
152-
]
153-
},
154-
155-
/**
156-
* When it is time to have a completely compiled application, we can
157-
* alter the above to include only a single JavaScript and a single CSS
158-
* file. Now we're back!
159-
*/
160-
compile: {
161-
dir: '<%= dist_dir %>/',
162-
src: [
163-
'<%= dist_dir %>/assets/js/<%= pkg.name %>-bower.js',
164-
'<%= dist_dir %>/assets/js/<%= pkg.name %>-all.min.js',
165-
'<%= dist_dir %>/assets/css/<%= pkg.name %>-bower.css'
166-
]
167-
}
168-
},
169-
170125
'gh-pages': {
171126
options: {
172127
base: 'dist',
@@ -224,7 +179,7 @@ module.exports = function (grunt) {
224179
grunt.registerTask('tests', [ 'connect:testserver', 'build', 'karma:unit', 'karma:e2e']);
225180

226181
grunt.registerTask('build', [
227-
'clean', 'jshint', 'concat:compile_js', 'uglify', 'concat:compile_all_js', 'concat:compile_bower_js', 'concat:compile_bower_css','copy:examples','copy:nav','copy:example', 'index:compile', 'index:build'
182+
'clean', 'jshint', 'concat:compile_js', 'uglify', 'concat:compile_all_js', 'concat:compile_bower_js', 'concat:compile_bower_css','copy:examples','copy:nav','copy:example'
228183
]);
229184

230185
/**

0 commit comments

Comments
 (0)