diff options
| author | Ananya Sen | 2012-02-23 13:52:32 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-02-23 13:52:32 -0800 |
| commit | ec3d07c2fea4e79c68606234074f43d694982e5b (patch) | |
| tree | dc7c830c361d35c04a4d9b6d55c6c36d7a5d61cd /js/panels/Materials/materials-popup.reel/materials-popup.html | |
| parent | 7283884c39df537694b21419a3ea9e3ca7793b4b (diff) | |
| parent | 287a0bad5b774a380ec6c8b3ddf24dc03234e248 (diff) | |
| download | ninja-ec3d07c2fea4e79c68606234074f43d694982e5b.tar.gz | |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts:
js/document/html-document.js
js/helper-classes/3D/snap-manager.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
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, 9 insertions, 9 deletions
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.html b/js/panels/Materials/materials-popup.reel/materials-popup.html index bac69f25..de4f98c1 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.html +++ b/js/panels/Materials/materials-popup.reel/materials-popup.html | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | } | 30 | } |
| 31 | }, | 31 | }, |
| 32 | "eventDelegator": { | 32 | "eventDelegator": { |
| 33 | "module": "montage/event/action-event-listener", | 33 | "module": "montage/core/event/action-event-listener", |
| 34 | "name": "ActionEventListener", | 34 | "name": "ActionEventListener", |
| 35 | "properties": { | 35 | "properties": { |
| 36 | "handler": {"@": "owner"}, | 36 | "handler": {"@": "owner"}, |
| @@ -38,7 +38,7 @@ | |||
| 38 | } | 38 | } |
| 39 | }, | 39 | }, |
| 40 | "propControl1": { | 40 | "propControl1": { |
| 41 | "module": "js/components/ui/property-control", | 41 | "module": "js/components/ui/property-control.reel", |
| 42 | "name": "PropertyControl", | 42 | "name": "PropertyControl", |
| 43 | "properties": { | 43 | "properties": { |
| 44 | "element": {"#": "mp_property"} | 44 | "element": {"#": "mp_property"} |
| @@ -64,7 +64,7 @@ | |||
| 64 | ] | 64 | ] |
| 65 | }, | 65 | }, |
| 66 | "materialsProperties": { | 66 | "materialsProperties": { |
| 67 | "module": "montage/ui/repetition", | 67 | "module": "montage/ui/repetition.reel", |
| 68 | "name": "Repetition", | 68 | "name": "Repetition", |
| 69 | "properties": { | 69 | "properties": { |
| 70 | "element": {"#": "mp_properties_list"} | 70 | "element": {"#": "mp_properties_list"} |
| @@ -95,7 +95,7 @@ | |||
| 95 | 95 | ||
| 96 | <body> | 96 | <body> |
| 97 | 97 | ||
| 98 | <div id="materials_popup"> | 98 | <div id="materials_popup" class="materials_popup"> |
| 99 | <div id="mp_title">Material Name</div> | 99 | <div id="mp_title">Material Name</div> |
| 100 | 100 | ||
| 101 | <hr /> | 101 | <hr /> |
| @@ -104,15 +104,15 @@ | |||
| 104 | 104 | ||
| 105 | <hr /> | 105 | <hr /> |
| 106 | 106 | ||
| 107 | <div id="mp_properties_list" style="-webkit-user-select: none;"> | 107 | <div id="mp_properties_list" class="mp_properties_list" style="-webkit-user-select: none;"> |
| 108 | <div id="mp_property"></div> | 108 | <div id="mp_property" class="mp_property"></div> |
| 109 | </div> | 109 | </div> |
| 110 | 110 | ||
| 111 | <hr /> | 111 | <hr /> |
| 112 | 112 | ||
| 113 | <div id="mp_buttons"> | 113 | <div id="mp_buttons" class="mp_buttons"> |
| 114 | <button id="mp_cancel_btn"></button> | 114 | <button id="mp_cancel_btn" class="mp_cancel_btn"></button> |
| 115 | <button id="mp_ok_btn"></button> | 115 | <button id="mp_ok_btn" class="mp_ok_btn"></button> |
| 116 | </div> | 116 | </div> |
| 117 | 117 | ||
| 118 | </div> | 118 | </div> |