diff options
author | Armen Kesablyan | 2012-06-19 00:45:26 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-19 00:45:26 -0700 |
commit | c59eb371559a3061ce53223e249ca97daace5968 (patch) | |
tree | f9540e26c0f273d35f92010605da65dd85bbe70c /js/components/toolbar.reel | |
parent | 0f040acabfb7a4bf3138debec5aff869487ceb11 (diff) | |
parent | 918a4f5870e972b6e4e301c3237e065a1ffd26f5 (diff) | |
download | ninja-c59eb371559a3061ce53223e249ca97daace5968.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/components/toolbar.reel')
-rw-r--r-- | js/components/toolbar.reel/toolbar-button.js | 4 | ||||
-rw-r--r-- | js/components/toolbar.reel/toolbar.js | 5 |
2 files changed, 9 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 | }, |
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 | }, |