Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tasks/angular-templates.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ module.exports = function(grunt) {

var compiler = new Compiler(grunt, options, file.cwd);
var appender = new Appender(grunt);
var modules = compiler.modules(file.src);
var modules = compiler.modules(file);
var compiled = [];

for (var module in modules) {
Expand Down
17 changes: 10 additions & 7 deletions tasks/lib/compiler.js
Original file line number Diff line number Diff line change
Expand Up @@ -127,27 +127,30 @@ var Compiler = function(grunt, options, cwd) {

/**
* Get static or dynamic module name from file.
* @param {Object} files Files source
* @param {String} file File name
* @return {String}
*/
this.module = function(file) {
if (typeof options.module === 'function') {
return options.module(file, options);
this.module = function(files, file) {
var module = files.module || options.module;

if (typeof module === 'function') {
return module(file, options);
}

return options.module;
return module;
};

/**
* Group files into individual modules
* @param {Array} files Files
* @param {Object} files Files source
* @return {Object} Key/Value pair of module + files
*/
this.modules = function(files) {
var modules = {};

files.forEach(function(file) {
var module = this.module(file);
files.src.forEach(function(file) {
var module = this.module(files, file);

if (!modules[module]) {
modules[module] = [];
Expand Down