diff options
author | Jose Antonio Marquez | 2012-04-27 14:29:01 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-04-27 14:29:01 -0700 |
commit | 7fdeb9feac4d2da9f86646cda4548ea60e5effa9 (patch) | |
tree | 6b43b7b2375fad6804ae88287906e3b77b4539b9 /js/panels/Materials/materials-popup.reel/materials-popup.html | |
parent | d988dead643ff4f9bfa417286a6b5f88be0e7c82 (diff) | |
parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
download | ninja-7fdeb9feac4d2da9f86646cda4548ea60e5effa9.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/panels/Materials/materials-popup.reel/materials-popup.html')
-rwxr-xr-x | js/panels/Materials/materials-popup.reel/materials-popup.html | 18 |
1 files changed, 6 insertions, 12 deletions
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"}, |