diff options
| author | Jon Reid | 2012-05-15 11:24:53 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
| commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
| tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/panels/Materials/materials-popup.reel/materials-popup.html | |
| parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
| parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
| download | ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz | |
Merge branch 'timeline-local' into timeline-multiselect
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
resolved using theirs. (selectLayers)
Diffstat (limited to 'js/panels/Materials/materials-popup.reel/materials-popup.html')
| -rwxr-xr-x | js/panels/Materials/materials-popup.reel/materials-popup.html | 44 |
1 files changed, 14 insertions, 30 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..d18599d6 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"}, |
| @@ -94,29 +88,19 @@ | |||
| 94 | </head> | 88 | </head> |
| 95 | 89 | ||
| 96 | <body> | 90 | <body> |
| 97 | 91 | <div data-montage-id="materials_popup" class="materials_popup"> | |
| 98 | <div id="materials_popup" class="materials_popup"> | 92 | <div data-montage-id="mp_title" class="mp_title">Material Name</div> |
| 99 | <div id="mp_title">Material Name</div> | ||
| 100 | |||
| 101 | <hr /> | 93 | <hr /> |
| 102 | 94 | <div data-montage-id="mp_preview" class="mp_preview">Preview Pane</div> | |
| 103 | <div id="mp_preview">Preview Pane</div> | ||
| 104 | |||
| 105 | <hr /> | 95 | <hr /> |
| 106 | 96 | <div data-montage-id="mp_properties_list" class="mp_properties_list"> | |
| 107 | <div id="mp_properties_list" class="mp_properties_list"> | 97 | <div data-montage-id="mp_property" class="mp_property"></div> |
| 108 | <div id="mp_property" class="mp_property"></div> | ||
| 109 | </div> | 98 | </div> |
| 110 | |||
| 111 | <hr /> | 99 | <hr /> |
| 112 | 100 | <div data-montage-id="mp_buttons" class="mp_buttons"> | |
| 113 | <div id="mp_buttons" class="mp_buttons"> | 101 | <button data-montage-id="mp_cancel_btn" class="mp_cancel_btn nj-skinned"></button> |
| 114 | <button id="mp_cancel_btn" class="mp_cancel_btn nj-skinned"></button> | 102 | <button data-montage-id="mp_ok_btn" class="mp_ok_btn nj-skinned"></button> |
| 115 | <button id="mp_ok_btn" class="mp_ok_btn nj-skinned"></button> | ||
| 116 | </div> | 103 | </div> |
| 117 | |||
| 118 | </div> | 104 | </div> |
| 119 | |||
| 120 | </body> | 105 | </body> |
| 121 | |||
| 122 | </html> \ No newline at end of file | 106 | </html> \ No newline at end of file |