aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-23 17:05:43 -0800
committerValerio Virgillito2012-02-23 17:05:43 -0800
commitafc53c6f553c97ab778154154aa2b7a146cb5fef (patch)
tree66b5ec886a49894feda44ccf8b5233ef39a46536 /js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
parent8974ecd564563a991ff96f9cb6d47da172174242 (diff)
parentdb2fd02a1b0e909bb536fa63cefd2144f4642ead (diff)
downloadninja-afc53c6f553c97ab778154154aa2b7a146cb5fef.tar.gz
Merge branch 'refs/heads/master' into local-storage-version
Diffstat (limited to 'js/panels/Materials/materials-library-panel.reel/materials-library-panel.html')
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.html8
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