aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials/materials-popup.reel
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-19 13:53:40 -0700
committerValerio Virgillito2012-03-19 13:53:40 -0700
commit1b39a039291bcbabbcca9f778bc5a9bc990eafbb (patch)
tree400a419cfc32f84f52fea46a27eb2f91f001411f /js/panels/Materials/materials-popup.reel
parent954f5a13e371febcb1c0fb8015c577ee51c23130 (diff)
parent50ee8428d398d2a5f21f4d642642ba85d7df3e5e (diff)
downloadninja-1b39a039291bcbabbcca9f778bc5a9bc990eafbb.tar.gz
Merge pull request #128 from mqg734/WebGLMaterials
Replacing old button component with montage button component in our UI.
Diffstat (limited to 'js/panels/Materials/materials-popup.reel')
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.html8
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.js5
2 files changed, 6 insertions, 7 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>
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js
index c57bb2d7..193e72b7 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.js
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.js
@@ -5,9 +5,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
5</copyright> */ 5</copyright> */
6 6
7var Montage = require("montage/core/core").Montage, 7var Montage = require("montage/core/core").Montage,
8 Component = require("montage/ui/component").Component; 8 Component = require("montage/ui/component").Component,
9var Button = require("js/components/button.reel").Button; 9 MaterialsModel = require("js/models/materials-model").MaterialsModel;
10var MaterialsModel = require("js/models/materials-model").MaterialsModel;
11 10
12//////////////////////////////////////////////////////////////////////// 11////////////////////////////////////////////////////////////////////////
13//Exporting as MaterialsPopup 12//Exporting as MaterialsPopup