Skip to content

Removing duplicated template declarations #147

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.

Sign up for GitHub

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

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Removing duplicated template declarations #147

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
eaa2468
Removed duplicated template declarations
andrewhosgood Aug 11, 2015
de08bc0
Updated to fall inline with previous master
andrewhosgood Aug 11, 2015
cf3df00
Limit max line length to 120 characters
andrewhosgood Aug 12, 2015
cc41460
Merge branch 'master' of https://github.com/gruntjs/grunt-contrib-han…
andrewhosgood May 18, 2016
dc0baa0
Updated object keys to contain namespaces
andrewhosgood May 18, 2016
f72d0cf
Update handlebars.js
andrewhosgood May 18, 2016
cbd8c58
Update handlebars.js
andrewhosgood May 18, 2016
98ce9da
Update handlebars.js
andrewhosgood May 18, 2016
af71f48
Update handlebars.js
andrewhosgood May 18, 2016
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
21 changes: 12 additions & 9 deletions tasks/handlebars.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ module.exports = function(grunt) {

this.files.forEach(function(f) {
var declarations = [];
var partials = [];
var templates = [];
var partials = {};
var templates = {};
// template identifying parts
var ast, compiled, filename;

Expand Down Expand Up @@ -144,10 +144,12 @@ module.exports = function(grunt) {
if (nsInfo.declaration) {
declarations.push(nsInfo.declaration);
}
partials.push('Handlebars.registerPartial(' + JSON.stringify(filename) + ', ' + nsInfo.namespace +
'[' + JSON.stringify(filename) + '] = ' + compiled + ');');
partials[nsInfo.namespace + ':' + JSON.stringify(filename)] = ('Handlebars.registerPartial(' +
JSON.stringify(filename) + ', ' + nsInfo.namespace + '[' + JSON.stringify(filename) + '] = ' +
compiled + ');');
} else {
partials.push('Handlebars.registerPartial(' + JSON.stringify(filename) + ', ' + compiled + ');');
partials[JSON.stringify(filename)] = ('Handlebars.registerPartial(' + JSON.stringify(filename) +
', ' + compiled + ');');
}
} else {
if ((options.amd || options.commonjs) && !useNamespace) {
Expand All @@ -159,16 +161,17 @@ module.exports = function(grunt) {
if (nsInfo.declaration) {
declarations.push(nsInfo.declaration);
}
templates.push(nsInfo.namespace + '[' + JSON.stringify(filename) + '] = ' + compiled + ';');
templates[nsInfo.namespace + ':' + JSON.stringify(filename)] = (nsInfo.namespace + '[' +
JSON.stringify(filename) + '] = ' + compiled + ';');
} else if (options.commonjs === true) {
templates.push(compiled + ';');
templates[JSON.stringify(filename)] = compiled + ';';
} else {
templates.push(compiled);
templates[JSON.stringify(filename)] = compiled;
}
}
});

var output = declarations.concat(partials, templates);
var output = declarations.concat(_.values(partials), _.values(templates));
if (output.length < 1) {
grunt.log.warn('Destination not written because compiled files were empty.');
} else {
Expand Down