diff options
| author | Jon Reid | 2012-06-26 14:58:10 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-26 14:58:10 -0700 |
| commit | 2599f74d72293b809929d8a0b36fb8e721f194cd (patch) | |
| tree | ca4cd45b23b8debea32f95d7dea807c77b6633b2 /node_modules/tools | |
| parent | ab9d14780eed98f39786fae4518e69861b34bad7 (diff) | |
| parent | e4304b9ac6c58802de4dd334be1f5802533f5160 (diff) | |
| download | ninja-2599f74d72293b809929d8a0b36fb8e721f194cd.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
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 | ||