aboutsummaryrefslogtreecommitdiff
path: root/js/components/toolbar.reel/toolbar-button.js
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-19 00:45:26 -0700
committerArmen Kesablyan2012-06-19 00:45:26 -0700
commitc59eb371559a3061ce53223e249ca97daace5968 (patch)
treef9540e26c0f273d35f92010605da65dd85bbe70c /js/components/toolbar.reel/toolbar-button.js
parent0f040acabfb7a4bf3138debec5aff869487ceb11 (diff)
parent918a4f5870e972b6e4e301c3237e065a1ffd26f5 (diff)
downloadninja-c59eb371559a3061ce53223e249ca97daace5968.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/components/toolbar.reel/toolbar-button.js')
-rw-r--r--js/components/toolbar.reel/toolbar-button.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/js/components/toolbar.reel/toolbar-button.js b/js/components/toolbar.reel/toolbar-button.js
index 9ada9b29..74129c2a 100644
--- a/js/components/toolbar.reel/toolbar-button.js
+++ b/js/components/toolbar.reel/toolbar-button.js
@@ -12,6 +12,10 @@ var ToolbarButton = exports.ToolbarButton = Montage.create(Button, {
12 hasTemplate : { 12 hasTemplate : {
13 value: false 13 value: false
14 }, 14 },
15 label: {
16 value: null,
17 serializable: true
18 },
15 _sourceObject : { 19 _sourceObject : {
16 value: null 20 value: null
17 }, 21 },