aboutsummaryrefslogtreecommitdiff
path: root/js/components
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-05-31 15:40:03 -0700
committerJose Antonio Marquez2012-05-31 15:40:03 -0700
commite88e42ec2b4fdf1bbd04765b56d17c7cbcdbc4ee (patch)
tree90e7217f3c8086f9bdaac6ef4826fb14fc72ae43 /js/components
parent450a3e64576d002787c2a611010d593d1967f3b7 (diff)
parent6042bdc5f2aada4412912fd01602d32c9088dc26 (diff)
downloadninja-e88e42ec2b4fdf1bbd04765b56d17c7cbcdbc4ee.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Components
Diffstat (limited to 'js/components')
-rw-r--r--js/components/toolbar.reel/toolbar-button.js28
-rw-r--r--js/components/toolbar.reel/toolbar.html2
2 files changed, 29 insertions, 1 deletions
diff --git a/js/components/toolbar.reel/toolbar-button.js b/js/components/toolbar.reel/toolbar-button.js
new file mode 100644
index 00000000..9ada9b29
--- /dev/null
+++ b/js/components/toolbar.reel/toolbar-button.js
@@ -0,0 +1,28 @@
1/* <copyright>
2 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5 </copyright> */
6
7var Montage = require("montage").Montage,
8 Component = require("montage/ui/component").Component,
9 Button = require("montage/ui/button.reel/button").Button;
10
11var ToolbarButton = exports.ToolbarButton = Montage.create(Button, {
12 hasTemplate : {
13 value: false
14 },
15 _sourceObject : {
16 value: null
17 },
18 sourceObject : {
19 get: function() {
20 return this._sourceObject;
21 },
22 set: function(value) {
23 if(value === this._sourceObject) { return; }
24
25 this._sourceObject = value;
26 }
27 }
28}); \ No newline at end of file
diff --git a/js/components/toolbar.reel/toolbar.html b/js/components/toolbar.reel/toolbar.html
index d2c5972a..51e7ebec 100644
--- a/js/components/toolbar.reel/toolbar.html
+++ b/js/components/toolbar.reel/toolbar.html
@@ -30,7 +30,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
30 }, 30 },
31 31
32 "button": { 32 "button": {
33 "prototype": "montage/ui/button.reel", 33 "prototype": "js/components/toolbar.reel/toolbar-button",
34 "properties": { 34 "properties": {
35 "element": {"#": "button" }, 35 "element": {"#": "button" },
36 "label": " " 36 "label": " "