aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui/input-group.reel/input-group.html
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-04-27 14:29:01 -0700
committerJose Antonio Marquez2012-04-27 14:29:01 -0700
commit7fdeb9feac4d2da9f86646cda4548ea60e5effa9 (patch)
tree6b43b7b2375fad6804ae88287906e3b77b4539b9 /js/components/ui/input-group.reel/input-group.html
parentd988dead643ff4f9bfa417286a6b5f88be0e7c82 (diff)
parentc8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff)
downloadninja-7fdeb9feac4d2da9f86646cda4548ea60e5effa9.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/components/ui/input-group.reel/input-group.html')
-rwxr-xr-xjs/components/ui/input-group.reel/input-group.html14
1 files changed, 5 insertions, 9 deletions
diff --git a/js/components/ui/input-group.reel/input-group.html b/js/components/ui/input-group.reel/input-group.html
index 0050b8cb..4cdb4e69 100755
--- a/js/components/ui/input-group.reel/input-group.html
+++ b/js/components/ui/input-group.reel/input-group.html
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!DOCTYPE HTML>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,16 +11,14 @@
11 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
12 { 12 {
13 "eventDelegator": { 13 "eventDelegator": {
14 "module": "montage/core/event/action-event-listener", 14 "prototype": "montage/core/event/action-event-listener",
15 "name": "ActionEventListener",
16 "properties": { 15 "properties": {
17 "handler": {"@": "owner"}, 16 "handler": {"@": "owner"},
18 "action": "forwardEvent" 17 "action": "forwardEvent"
19 } 18 }
20 }, 19 },
21 "propControl1": { 20 "propControl1": {
22 "module": "js/components/ui/property-control.reel", 21 "prototype": "js/components/ui/property-control.reel",
23 "name": "PropertyControl",
24 "properties": { 22 "properties": {
25 "element": {"#": "inputPair"} 23 "element": {"#": "inputPair"}
26 }, 24 },
@@ -44,8 +42,7 @@
44 ] 42 ]
45 }, 43 },
46 "propList": { 44 "propList": {
47 "module": "montage/ui/repetition.reel", 45 "prototype": "montage/ui/repetition.reel",
48 "name": "Repetition",
49 "properties": { 46 "properties": {
50 "element": {"#": "inputList"} 47 "element": {"#": "inputList"}
51 }, 48 },
@@ -58,8 +55,7 @@
58 } 55 }
59 }, 56 },
60 "owner": { 57 "owner": {
61 "module": "js/components/ui/input-group.reel", 58 "prototype": "js/components/ui/input-group.reel",
62 "name": "InputGroup",
63 "properties": { 59 "properties": {
64 "element": {"#": "inputRow"}, 60 "element": {"#": "inputRow"},
65 "controlsList": {"@": "propList"} 61 "controlsList": {"@": "propList"}