diff options
| author | Jose Antonio Marquez | 2012-06-13 14:03:00 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-06-13 14:03:00 -0700 |
| commit | efbe5f83157a8dcbcc209c88877d9cd0113d4d20 (patch) | |
| tree | 50565e097fe4a9db59e554af179f66938fa59f1c /js/components/toolbar.reel/toolbar-button.js | |
| parent | ae90152ae2889a10d44c22e1eeb5bff16cc44a19 (diff) | |
| parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
| download | ninja-efbe5f83157a8dcbcc209c88877d9cd0113d4d20.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into Color
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 | }, |