diff options
author | Valerio Virgillito | 2012-04-27 14:21:35 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-04-27 14:21:35 -0700 |
commit | b08cc404d32dd1d4dbc2139ce8f06d7d88b681a8 (patch) | |
tree | ae45391131c7c5203ae8e0d3470d106d835c8c6b /js/components/ui/property-control.reel/property-control.html | |
parent | 314709dd189807bfc762aa150bb1b29d2ccdf25b (diff) | |
parent | 6c1aa27b7753bc9007514859b42160fae265740d (diff) | |
download | ninja-b08cc404d32dd1d4dbc2139ce8f06d7d88b681a8.tar.gz |
Merge branch 'refs/heads/serialization'
Diffstat (limited to 'js/components/ui/property-control.reel/property-control.html')
-rwxr-xr-x | js/components/ui/property-control.reel/property-control.html | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/js/components/ui/property-control.reel/property-control.html b/js/components/ui/property-control.reel/property-control.html index 43e8e67f..d85cb0e3 100755 --- a/js/components/ui/property-control.reel/property-control.html +++ b/js/components/ui/property-control.reel/property-control.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,15 +11,13 @@ | |||
11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
12 | { | 12 | { |
13 | "substitution1": { | 13 | "substitution1": { |
14 | "module": "montage/ui/substitution.reel", | 14 | "prototype": "montage/ui/substitution.reel", |
15 | "name": "Substitution", | ||
16 | "properties": { | 15 | "properties": { |
17 | "element": {"#": "propController"} | 16 | "element": {"#": "propController"} |
18 | } | 17 | } |
19 | }, | 18 | }, |
20 | "owner": { | 19 | "owner": { |
21 | "module": "js/components/ui/property-control.reel", | 20 | "prototype": "js/components/ui/property-control.reel", |
22 | "name": "PropertyControl", | ||
23 | "properties": { | 21 | "properties": { |
24 | "element": {"#": "propControl"}, | 22 | "element": {"#": "propControl"}, |
25 | "labelField": {"#": "propLabel"}, | 23 | "labelField": {"#": "propLabel"}, |