aboutsummaryrefslogtreecommitdiff
path: root/js/components/toolbar.reel
diff options
context:
space:
mode:
authorhwc4872012-06-13 14:04:09 -0700
committerhwc4872012-06-13 14:04:09 -0700
commit3e481dd581e0305dd8b572ed0d17e86622223464 (patch)
treeaca2b28aa72857a52e047fb94090c34ab8dd1c2c /js/components/toolbar.reel
parenta7aa51e6b91623772eef54b827616432838b560e (diff)
parent682f4917d6badd105998c3dd84d031c38b51f017 (diff)
downloadninja-3e481dd581e0305dd8b572ed0d17e86622223464.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/components/toolbar.reel')
-rw-r--r--js/components/toolbar.reel/toolbar-button.js4
-rw-r--r--js/components/toolbar.reel/toolbar.js5
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
10exports.Toolbar = Montage.create(Component, { 10exports.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 },