diff options
author | Ananya Sen | 2012-06-19 11:00:49 -0700 |
---|---|---|
committer | Ananya Sen | 2012-06-19 11:00:49 -0700 |
commit | f1d8401aeb84e0eb0680caf72878dae26fd78a37 (patch) | |
tree | 31771ccaf3d1e2ddf01fa9605438d20be0d155d7 /js/components/toolbar.reel/toolbar-button.js | |
parent | 9ea2610cec6569e7b7d5268b6c65bbf94c4753e5 (diff) | |
parent | 483ad57efcd6475776f580c3af5b60e6deeaf781 (diff) | |
download | ninja-f1d8401aeb84e0eb0680caf72878dae26fd78a37.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
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 | }, |