aboutsummaryrefslogtreecommitdiff
path: root/node_modules/tools/template
diff options
context:
space:
mode:
authorKruti Shah2012-06-27 09:25:42 -0700
committerKruti Shah2012-06-27 09:25:42 -0700
commitd6bffa2450f68bdf9bfff0f4e155778f59f3624a (patch)
treec37300f67a3fb502d7f4e277600944739d48fd82 /node_modules/tools/template
parentb52747edbeba7d210fca98acccb2d2df52134bca (diff)
parent46174eb0ce93d660c8d2e9276fbdc4f9a03f056a (diff)
downloadninja-d6bffa2450f68bdf9bfff0f4e155778f59f3624a.tar.gz
Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti
Diffstat (limited to 'node_modules/tools/template')
-rwxr-xr-xnode_modules/tools/template/template-creator.js2
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