aboutsummaryrefslogtreecommitdiff
path: root/node_modules/tools
diff options
context:
space:
mode:
authorEric Guzman2012-06-27 10:32:47 -0700
committerEric Guzman2012-06-27 10:32:47 -0700
commit58f1de4f1cb0f59abd47cec4430a032c073f85e9 (patch)
treea6c2af9be68e6881311074bd3c8cc461deee7203 /node_modules/tools
parenta72b6809e214eb524f866440a55f8366f078c240 (diff)
parent2ebf3e3ea24d0d580575dfa13d31588dac1de445 (diff)
downloadninja-58f1de4f1cb0f59abd47cec4430a032c073f85e9.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into CSSPanel_GIO
Diffstat (limited to 'node_modules/tools')
-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