diff options
author | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
commit | 596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch) | |
tree | 480f42ffc0782ca768284c1208a8f99adb5636a2 /js/components/toolbar.reel/toolbar-button.js | |
parent | 75df16b937bb420e7d93a411e73f7b59578b1b7e (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/components/toolbar.reel/toolbar-button.js')
-rw-r--r-- | js/components/toolbar.reel/toolbar-button.js | 4 |
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 | }, |