diff options
author | Armen Kesablyan | 2012-03-22 14:31:43 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-03-22 14:31:43 -0700 |
commit | cd0b4714b782f8cc4cf9255fa2653d3d5eeade43 (patch) | |
tree | 297399e5ece4aa5800abd17b74da47af1899708c /js/panels/Materials/materials-popup.reel/materials-popup.html | |
parent | 49596f2a6b518ed0ee945006787d3c69e40a5757 (diff) | |
parent | 57cc00a5ef3ab525e54a030d7692b2d9eefaa68b (diff) | |
download | ninja-cd0b4714b782f8cc4cf9255fa2653d3d5eeade43.tar.gz |
Merge branch 'refs/heads/master' into DataBinding
Diffstat (limited to 'js/panels/Materials/materials-popup.reel/materials-popup.html')
-rwxr-xr-x | js/panels/Materials/materials-popup.reel/materials-popup.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.html b/js/panels/Materials/materials-popup.reel/materials-popup.html index de4f98c1..34f68554 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.html +++ b/js/panels/Materials/materials-popup.reel/materials-popup.html | |||
@@ -14,7 +14,7 @@ | |||
14 | <script type="text/montage-serialization"> | 14 | <script type="text/montage-serialization"> |
15 | { | 15 | { |
16 | "okButton": { | 16 | "okButton": { |
17 | "module": "js/components/button.reel", | 17 | "module": "montage/ui/button.reel", |
18 | "name": "Button", | 18 | "name": "Button", |
19 | "properties": { | 19 | "properties": { |
20 | "element": {"#": "mp_ok_btn"}, | 20 | "element": {"#": "mp_ok_btn"}, |
@@ -22,7 +22,7 @@ | |||
22 | } | 22 | } |
23 | }, | 23 | }, |
24 | "cancelButton": { | 24 | "cancelButton": { |
25 | "module": "js/components/button.reel", | 25 | "module": "montage/ui/button.reel", |
26 | "name": "Button", | 26 | "name": "Button", |
27 | "properties": { | 27 | "properties": { |
28 | "element": {"#": "mp_cancel_btn"}, | 28 | "element": {"#": "mp_cancel_btn"}, |
@@ -111,8 +111,8 @@ | |||
111 | <hr /> | 111 | <hr /> |
112 | 112 | ||
113 | <div id="mp_buttons" class="mp_buttons"> | 113 | <div id="mp_buttons" class="mp_buttons"> |
114 | <button id="mp_cancel_btn" class="mp_cancel_btn"></button> | 114 | <button id="mp_cancel_btn" class="mp_cancel_btn nj-skinned"></button> |
115 | <button id="mp_ok_btn" class="mp_ok_btn"></button> | 115 | <button id="mp_ok_btn" class="mp_ok_btn nj-skinned"></button> |
116 | </div> | 116 | </div> |
117 | 117 | ||
118 | </div> | 118 | </div> |