diff options
| author | mqg734 | 2012-02-21 16:49:11 -0800 |
|---|---|---|
| committer | mqg734 | 2012-02-21 16:49:11 -0800 |
| commit | d2f4d5e5f6742d53b6324d585a700566f73c992a (patch) | |
| tree | 8a3de8de6dc5ac5f6f3f0795d00a7d2d788374d7 /js/components/ui/property-control.reel/property-control.html | |
| parent | abf78e2d7a97d295ce5a1c425fd359d47379137e (diff) | |
| download | ninja-d2f4d5e5f6742d53b6324d585a700566f73c992a.tar.gz | |
Updated Materials Library and Materials Editor Popup to work with latest version of Montage.
We had to change our css to not use id's.
Also, updated the popup to use Montage's Popup component.
It looks like bump material has a bug. So loading that material results in a runtime error.
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> |