diff options
author | Eric Guzman | 2012-02-27 11:13:35 -0800 |
---|---|---|
committer | Eric Guzman | 2012-02-27 11:13:35 -0800 |
commit | 1a6604a50f6cfbbf0cd6f45ab94b63a001d02162 (patch) | |
tree | bbfc75d1be1ff98d22042dbbed4ca93b4a845e0c /js/panels/Materials/materials-library-panel.reel/materials-library-panel.html | |
parent | 9e8cd4448a6d0f809a55c3bdea8b45ed75339794 (diff) | |
parent | 8125c8c6c9431067840d81c46624b6a2dd5eb4a7 (diff) | |
download | ninja-1a6604a50f6cfbbf0cd6f45ab94b63a001d02162.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/panels/Materials/materials-library-panel.reel/materials-library-panel.html')
-rwxr-xr-x | js/panels/Materials/materials-library-panel.reel/materials-library-panel.html | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html index eede02bd..6ba4ac75 100755 --- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html +++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html | |||
@@ -10,14 +10,18 @@ | |||
10 | <link rel="stylesheet" type="text/css" href="materials-library-panel.css"> | 10 | <link rel="stylesheet" type="text/css" href="materials-library-panel.css"> |
11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
12 | { | 12 | { |
13 | "materialInfo": { | ||
14 | "module": "js/panels/Materials/materials-popup.reel", | ||
15 | "name": "MaterialsPopup" | ||
16 | }, | ||
13 | "owner": { | 17 | "owner": { |
14 | "module": "js/panels/Materials/materials-library-panel.reel", | 18 | "module": "js/panels/Materials/materials-library-panel.reel", |
15 | "name": "MaterialsLibraryPanels", | 19 | "name": "MaterialsLibraryPanels", |
16 | "properties": { | 20 | "properties": { |
17 | "element": {"#": "materials_library_panel"} | 21 | "element": {"#": "materials_library_panel"}, |
22 | "_materialInfo": {"@": "materialInfo"} | ||
18 | } | 23 | } |
19 | } | 24 | } |
20 | |||
21 | } | 25 | } |
22 | </script> | 26 | </script> |
23 | 27 | ||