diff options
Diffstat (limited to 'js/panels/Materials')
-rwxr-xr-x | js/panels/Materials/materials-library-panel.reel/materials-library-panel.html | 17 | ||||
-rwxr-xr-x | js/panels/Materials/materials-popup.reel/materials-popup.html | 18 |
2 files changed, 12 insertions, 23 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 4e41512f..741ff6aa 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 | |||
@@ -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/> |
@@ -47,12 +47,10 @@ | |||
47 | ] | 47 | ] |
48 | }, | 48 | }, |
49 | "materialInfo": { | 49 | "materialInfo": { |
50 | "module": "js/panels/Materials/materials-popup.reel", | 50 | "prototype": "js/panels/Materials/materials-popup.reel" |
51 | "name": "MaterialsPopup" | ||
52 | }, | 51 | }, |
53 | "materialsController" : { | 52 | "materialsController" : { |
54 | "module": "js/controllers/tree-controller", | 53 | "prototype": "js/controllers/tree-controller", |
55 | "name": "TreeController", | ||
56 | "properties" : { | 54 | "properties" : { |
57 | "branchKey" : "children", | 55 | "branchKey" : "children", |
58 | "labelKey" : "label", | 56 | "labelKey" : "label", |
@@ -66,8 +64,7 @@ | |||
66 | } | 64 | } |
67 | }, | 65 | }, |
68 | "materialsContainer" : { | 66 | "materialsContainer" : { |
69 | "module" : "js/components/treeview/treeview.reel", | 67 | "prototype" : "js/components/treeview/treeview.reel", |
70 | "name" : "Treeview", | ||
71 | "properties" : { | 68 | "properties" : { |
72 | "element" : {"#": "materials_library_tree"}, | 69 | "element" : {"#": "materials_library_tree"}, |
73 | "branchComponent" : {"@": "branch" }, | 70 | "branchComponent" : {"@": "branch" }, |
@@ -76,12 +73,10 @@ | |||
76 | } | 73 | } |
77 | }, | 74 | }, |
78 | "branch" : { | 75 | "branch" : { |
79 | "module" : "js/components/treeview/ninja-branch.reel", | 76 | "prototype" : "js/components/treeview/ninja-branch.reel[Branch]" |
80 | "name" : "Branch" | ||
81 | }, | 77 | }, |
82 | "owner": { | 78 | "owner": { |
83 | "module": "js/panels/Materials/materials-library-panel.reel", | 79 | "prototype": "js/panels/Materials/materials-library-panel.reel[MaterialsLibraryPanels]", |
84 | "name": "MaterialsLibraryPanels", | ||
85 | "properties": { | 80 | "properties": { |
86 | "element": {"#": "materials_library_panel"}, | 81 | "element": {"#": "materials_library_panel"}, |
87 | "_materialInfo": {"@": "materialInfo"} | 82 | "_materialInfo": {"@": "materialInfo"} |
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.html b/js/panels/Materials/materials-popup.reel/materials-popup.html index ae0ee2c8..9fdbc00d 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.html +++ b/js/panels/Materials/materials-popup.reel/materials-popup.html | |||
@@ -14,32 +14,28 @@ | |||
14 | <script type="text/montage-serialization"> | 14 | <script type="text/montage-serialization"> |
15 | { | 15 | { |
16 | "okButton": { | 16 | "okButton": { |
17 | "module": "montage/ui/button.reel", | 17 | "prototype": "montage/ui/button.reel", |
18 | "name": "Button", | ||
19 | "properties": { | 18 | "properties": { |
20 | "element": {"#": "mp_ok_btn"}, | 19 | "element": {"#": "mp_ok_btn"}, |
21 | "label": "OK" | 20 | "label": "OK" |
22 | } | 21 | } |
23 | }, | 22 | }, |
24 | "cancelButton": { | 23 | "cancelButton": { |
25 | "module": "montage/ui/button.reel", | 24 | "prototype": "montage/ui/button.reel", |
26 | "name": "Button", | ||
27 | "properties": { | 25 | "properties": { |
28 | "element": {"#": "mp_cancel_btn"}, | 26 | "element": {"#": "mp_cancel_btn"}, |
29 | "label": "Cancel" | 27 | "label": "Cancel" |
30 | } | 28 | } |
31 | }, | 29 | }, |
32 | "eventDelegator": { | 30 | "eventDelegator": { |
33 | "module": "montage/core/event/action-event-listener", | 31 | "prototype": "montage/core/event/action-event-listener", |
34 | "name": "ActionEventListener", | ||
35 | "properties": { | 32 | "properties": { |
36 | "handler": {"@": "owner"}, | 33 | "handler": {"@": "owner"}, |
37 | "action": "updatePreview" | 34 | "action": "updatePreview" |
38 | } | 35 | } |
39 | }, | 36 | }, |
40 | "propControl1": { | 37 | "propControl1": { |
41 | "module": "js/components/ui/property-control.reel", | 38 | "prototype": "js/components/ui/property-control.reel", |
42 | "name": "PropertyControl", | ||
43 | "properties": { | 39 | "properties": { |
44 | "element": {"#": "mp_property"} | 40 | "element": {"#": "mp_property"} |
45 | }, | 41 | }, |
@@ -64,8 +60,7 @@ | |||
64 | ] | 60 | ] |
65 | }, | 61 | }, |
66 | "materialsProperties": { | 62 | "materialsProperties": { |
67 | "module": "montage/ui/repetition.reel", | 63 | "prototype": "montage/ui/repetition.reel", |
68 | "name": "Repetition", | ||
69 | "properties": { | 64 | "properties": { |
70 | "element": {"#": "mp_properties_list"} | 65 | "element": {"#": "mp_properties_list"} |
71 | }, | 66 | }, |
@@ -78,8 +73,7 @@ | |||
78 | } | 73 | } |
79 | }, | 74 | }, |
80 | "owner": { | 75 | "owner": { |
81 | "module": "js/panels/Materials/materials-popup.reel", | 76 | "prototype": "js/panels/Materials/materials-popup.reel", |
82 | "name": "MaterialsPopup", | ||
83 | "properties": { | 77 | "properties": { |
84 | "materialsProperties": {"@": "materialsProperties"}, | 78 | "materialsProperties": {"@": "materialsProperties"}, |
85 | "element": {"#": "materials_popup"}, | 79 | "element": {"#": "materials_popup"}, |