diff options
author | Eric Guzman | 2012-06-19 01:20:36 -0700 |
---|---|---|
committer | Eric Guzman | 2012-06-19 01:20:36 -0700 |
commit | 2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch) | |
tree | f69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/components/toolbar.reel/toolbar-button.js | |
parent | 5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff) | |
parent | 1007cbf983ad0f2460a4122a492a96023fdb4439 (diff) | |
download | ninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts:
js/stage/binding-view.reel/binding-view.js
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 | }, |