diff options
| author | Jon Reid | 2012-05-15 11:24:53 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
| commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
| tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/components/ui/input-group.reel/input-group.html | |
| parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
| parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
| download | ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz | |
Merge branch 'timeline-local' into timeline-multiselect
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
resolved using theirs. (selectLayers)
Diffstat (limited to 'js/components/ui/input-group.reel/input-group.html')
| -rwxr-xr-x | js/components/ui/input-group.reel/input-group.html | 20 |
1 files changed, 8 insertions, 12 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..ba85c089 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"} |
| @@ -69,9 +65,9 @@ | |||
| 69 | </script> | 65 | </script> |
| 70 | </head> | 66 | </head> |
| 71 | <body> | 67 | <body> |
| 72 | <div id="inputRow" class="inputRow" style="-webkit-user-select: none;"> | 68 | <div data-montage-id="inputRow" class="inputRow" style="-webkit-user-select: none;"> |
| 73 | <div id="inputList"> | 69 | <div data-montage-id="inputList"> |
| 74 | <div id="inputPair"></div> | 70 | <div data-montage-id="inputPair"></div> |
| 75 | </div> | 71 | </div> |
| 76 | </div> | 72 | </div> |
| 77 | </body> | 73 | </body> |