diff options
| author | Jose Antonio Marquez | 2012-02-23 10:38:51 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-23 10:38:51 -0800 |
| commit | d764428023d87446fbbb153d8e04a23b900d71d5 (patch) | |
| tree | 2581815db5567b52d4c59663ea9e37d6df057ca3 /js/components/ui/property-control.reel/property-control.html | |
| parent | 3e1be6d4d4f0d3a2474af7d915954f9b6464fe2e (diff) | |
| parent | cc295dd0fb873505eed01c232bd987cf6e2dcdd9 (diff) | |
| download | ninja-d764428023d87446fbbb153d8e04a23b900d71d5.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'js/components/ui/property-control.reel/property-control.html')
| -rwxr-xr-x | js/components/ui/property-control.reel/property-control.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/components/ui/property-control.reel/property-control.html b/js/components/ui/property-control.reel/property-control.html index 2e7c7b53..43e8e67f 100755 --- a/js/components/ui/property-control.reel/property-control.html +++ b/js/components/ui/property-control.reel/property-control.html | |||
| @@ -11,14 +11,14 @@ | |||
| 11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
| 12 | { | 12 | { |
| 13 | "substitution1": { | 13 | "substitution1": { |
| 14 | "module": "montage/ui/substitution", | 14 | "module": "montage/ui/substitution.reel", |
| 15 | "name": "Substitution", | 15 | "name": "Substitution", |
| 16 | "properties": { | 16 | "properties": { |
| 17 | "element": {"#": "propController"} | 17 | "element": {"#": "propController"} |
| 18 | } | 18 | } |
| 19 | }, | 19 | }, |
| 20 | "owner": { | 20 | "owner": { |
| 21 | "module": "js/components/ui/property-control", | 21 | "module": "js/components/ui/property-control.reel", |
| 22 | "name": "PropertyControl", | 22 | "name": "PropertyControl", |
| 23 | "properties": { | 23 | "properties": { |
| 24 | "element": {"#": "propControl"}, | 24 | "element": {"#": "propControl"}, |
| @@ -30,7 +30,7 @@ | |||
| 30 | </script> | 30 | </script> |
| 31 | </head> | 31 | </head> |
| 32 | <body> | 32 | <body> |
| 33 | <div id="propControl"> | 33 | <div id="propControl" class="propControl"> |
| 34 | <div id="propLabel" class="prop-label"></div> | 34 | <div id="propLabel" class="prop-label"></div> |
| 35 | <div id="propController" class="prop-controller"> | 35 | <div id="propController" class="prop-controller"> |
| 36 | <div id="subDummy"></div> | 36 | <div id="subDummy"></div> |