aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials/materials-popup.reel/materials-popup.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-popup.reel/materials-popup.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-popup.reel/materials-popup.html')
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.html18
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>