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.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.js')
-rw-r--r-- | js/components/toolbar.reel/toolbar.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/js/components/toolbar.reel/toolbar.js b/js/components/toolbar.reel/toolbar.js index 2ccdb2c5..43f45f2b 100644 --- a/js/components/toolbar.reel/toolbar.js +++ b/js/components/toolbar.reel/toolbar.js | |||
@@ -8,6 +8,11 @@ var Montage = require("montage/core/core").Montage, | |||
8 | Component = require("montage/ui/component").Component; | 8 | Component = require("montage/ui/component").Component; |
9 | 9 | ||
10 | exports.Toolbar = Montage.create(Component, { | 10 | exports.Toolbar = Montage.create(Component, { |
11 | repetition: { | ||
12 | value: null, | ||
13 | serializable: true | ||
14 | }, | ||
15 | |||
11 | _needsButtonProperties : { | 16 | _needsButtonProperties : { |
12 | value: null | 17 | value: null |
13 | }, | 18 | }, |