diff options
| author | Jonathan Duran | 2012-06-26 13:28:59 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-26 13:28:59 -0700 |
| commit | 42ea74de49cc9f06d8231b99c2ee6c65b0f8a61a (patch) | |
| tree | ad15f365ffae331ae76060a1ebdfc0f0f029725a /node_modules/tools | |
| parent | cdb5af99be5fca15265e4940dd22870f4c5fef4b (diff) | |
| parent | 87a8b62f71bb72274c3dd1fa389e88c12d482ebb (diff) | |
| download | ninja-42ea74de49cc9f06d8231b99c2ee6c65b0f8a61a.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'node_modules/tools')
| -rwxr-xr-x | node_modules/tools/template/template-creator.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/tools/template/template-creator.js b/node_modules/tools/template/template-creator.js index 646c4171..7cc66093 100755 --- a/node_modules/tools/template/template-creator.js +++ b/node_modules/tools/template/template-creator.js | |||
| @@ -105,7 +105,7 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le | |||
| 105 | 105 | ||
| 106 | _generateLabelForComponent: {value: function(component, labels) { | 106 | _generateLabelForComponent: {value: function(component, labels) { |
| 107 | var componentInfo = Montage.getInfoForObject(component), | 107 | var componentInfo = Montage.getInfoForObject(component), |
| 108 | componentLabel = componentInfo.label, | 108 | componentLabel = componentInfo.label || component.identifier, |
| 109 | componentName, | 109 | componentName, |
| 110 | index; | 110 | index; |
| 111 | 111 | ||