diff options
| author | hwc487 | 2012-04-27 14:35:46 -0700 |
|---|---|---|
| committer | hwc487 | 2012-04-27 14:35:46 -0700 |
| commit | 1a92b93994cd90abc8df61b7a1e5cfc1f65a19ce (patch) | |
| tree | 3853b15ca684a7bdc7e7a8bdb7935be61ff85671 /js/components/ui/property-control.reel | |
| parent | 5a1965bf2ed9a54601ca16fd67555335c510ce08 (diff) | |
| parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
| download | ninja-1a92b93994cd90abc8df61b7a1e5cfc1f65a19ce.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/components/ui/property-control.reel')
| -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"}, |