Fixed template inclusion for nested templates.

Nested templates were not being included in the template manifest,
because the ** selector apparently ignores slashes under some
circumstances. This fixes the issue, and also sets up a watch
target that matches the actual template-to-js command.

Change-Id: I86b13dfb16e21cc81cb391a82e7ccb63550dbb11
This commit is contained in:
Michael Krotscheck 2014-07-18 16:23:26 -07:00
parent 388f3dbd06
commit 6d8447c706

View File

@ -213,7 +213,7 @@ module.exports = function (grunt) {
base: dir.source base: dir.source
}, },
main: { main: {
src: [dir.source + '/app/*/template/**.html'], src: [dir.source + '/app/*/template/**/**.html'],
dest: dir.output + '/js/templates.js' dest: dir.output + '/js/templates.js'
} }
}, },
@ -424,7 +424,7 @@ module.exports = function (grunt) {
}, },
templates: { templates: {
files: [ files: [
dir.source + '/app/**/*.html' dir.source + '/app/*/template/**/**.html'
], ],
tasks: ['html2js'] tasks: ['html2js']
}, },