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.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.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 | }, |