diff options
| author | Ananya Sen | 2012-02-23 13:52:32 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-02-23 13:52:32 -0800 |
| commit | ec3d07c2fea4e79c68606234074f43d694982e5b (patch) | |
| tree | dc7c830c361d35c04a4d9b6d55c6c36d7a5d61cd /js/components/ui/input-group.reel/input-group.html | |
| parent | 7283884c39df537694b21419a3ea9e3ca7793b4b (diff) | |
| parent | 287a0bad5b774a380ec6c8b3ddf24dc03234e248 (diff) | |
| download | ninja-ec3d07c2fea4e79c68606234074f43d694982e5b.tar.gz | |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts:
js/document/html-document.js
js/helper-classes/3D/snap-manager.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/components/ui/input-group.reel/input-group.html')
| -rwxr-xr-x | js/components/ui/input-group.reel/input-group.html | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/js/components/ui/input-group.reel/input-group.html b/js/components/ui/input-group.reel/input-group.html index c99e29d6..0050b8cb 100755 --- a/js/components/ui/input-group.reel/input-group.html +++ b/js/components/ui/input-group.reel/input-group.html | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
| 12 | { | 12 | { |
| 13 | "eventDelegator": { | 13 | "eventDelegator": { |
| 14 | "module": "montage/event/action-event-listener", | 14 | "module": "montage/core/event/action-event-listener", |
| 15 | "name": "ActionEventListener", | 15 | "name": "ActionEventListener", |
| 16 | "properties": { | 16 | "properties": { |
| 17 | "handler": {"@": "owner"}, | 17 | "handler": {"@": "owner"}, |
| @@ -19,7 +19,7 @@ | |||
| 19 | } | 19 | } |
| 20 | }, | 20 | }, |
| 21 | "propControl1": { | 21 | "propControl1": { |
| 22 | "module": "js/components/ui/property-control", | 22 | "module": "js/components/ui/property-control.reel", |
| 23 | "name": "PropertyControl", | 23 | "name": "PropertyControl", |
| 24 | "properties": { | 24 | "properties": { |
| 25 | "element": {"#": "inputPair"} | 25 | "element": {"#": "inputPair"} |
| @@ -44,7 +44,7 @@ | |||
| 44 | ] | 44 | ] |
| 45 | }, | 45 | }, |
| 46 | "propList": { | 46 | "propList": { |
| 47 | "module": "montage/ui/repetition", | 47 | "module": "montage/ui/repetition.reel", |
| 48 | "name": "Repetition", | 48 | "name": "Repetition", |
| 49 | "properties": { | 49 | "properties": { |
| 50 | "element": {"#": "inputList"} | 50 | "element": {"#": "inputList"} |
| @@ -58,7 +58,7 @@ | |||
| 58 | } | 58 | } |
| 59 | }, | 59 | }, |
| 60 | "owner": { | 60 | "owner": { |
| 61 | "module": "js/components/ui/input-group", | 61 | "module": "js/components/ui/input-group.reel", |
| 62 | "name": "InputGroup", | 62 | "name": "InputGroup", |
| 63 | "properties": { | 63 | "properties": { |
| 64 | "element": {"#": "inputRow"}, | 64 | "element": {"#": "inputRow"}, |
| @@ -69,7 +69,7 @@ | |||
| 69 | </script> | 69 | </script> |
| 70 | </head> | 70 | </head> |
| 71 | <body> | 71 | <body> |
| 72 | <div id="inputRow" style="-webkit-user-select: none;"> | 72 | <div id="inputRow" class="inputRow" style="-webkit-user-select: none;"> |
| 73 | <div id="inputList"> | 73 | <div id="inputList"> |
| 74 | <div id="inputPair"></div> | 74 | <div id="inputPair"></div> |
| 75 | </div> | 75 | </div> |