aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials
diff options
context:
space:
mode:
authorhwc4872012-07-09 16:08:02 -0700
committerhwc4872012-07-09 16:08:02 -0700
commit5085d0f67df89a21715308956004164597a6ba79 (patch)
tree2c896163143a66331205a39b0a3b1b45d51bf12a /js/panels/Materials
parent51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
downloadninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts: js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/panels/Materials')
-rwxr-xr-xjs/panels/Materials/MaterialsPanel.js4
-rw-r--r--js/panels/Materials/materials-data.json5
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.css18
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.html47
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.js131
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.css48
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.html46
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.js1148
8 files changed, 777 insertions, 670 deletions
diff --git a/js/panels/Materials/MaterialsPanel.js b/js/panels/Materials/MaterialsPanel.js
index 9d7f447a..4291f39b 100755
--- a/js/panels/Materials/MaterialsPanel.js
+++ b/js/panels/Materials/MaterialsPanel.js
@@ -29,8 +29,8 @@ POSSIBILITY OF SUCH DAMAGE.
29</copyright> */ 29</copyright> */
30 30
31var Montage = require("montage/core/core").Montage, 31var Montage = require("montage/core/core").Montage,
32 PanelBase = require("js/panels/PanelBase").PanelBase, 32 PanelBase = require("js/panels/PanelBase").PanelBase,
33 MaterialsLibraryPanel = require("js/panels/Materials/materials-library-panel.reel").MaterialsLibraryPanel; 33 MaterialsLibraryPanel = require("js/panels/Materials/materials-library-panel.reel").MaterialsLibraryPanel;
34 34
35exports.MaterialsPanel = Montage.create(PanelBase, { 35exports.MaterialsPanel = Montage.create(PanelBase, {
36 id : {value : "materialsPanel", writable:true, enumerable:true, configurable:true}, 36 id : {value : "materialsPanel", writable:true, enumerable:true, configurable:true},
diff --git a/js/panels/Materials/materials-data.json b/js/panels/Materials/materials-data.json
index a5d8997b..fde82d3d 100644
--- a/js/panels/Materials/materials-data.json
+++ b/js/panels/Materials/materials-data.json
@@ -101,6 +101,11 @@
101 "id" : "Z-Invert" 101 "id" : "Z-Invert"
102 } 102 }
103 ] 103 ]
104 },
105 {
106 "label": "Custom Materials",
107 "children": [
108 ]
104 } 109 }
105 ] 110 ]
106} \ No newline at end of file 111} \ No newline at end of file
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css
index d73134ae..39294779 100755
--- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css
+++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css
@@ -39,6 +39,12 @@ POSSIBILITY OF SUCH DAMAGE.
39 margin: 4px 0 4px 0; 39 margin: 4px 0 4px 0;
40} 40}
41 41
42.materials_library_panel .ml_tree_holder {
43 height: 200px;
44 min-height: 200px;
45 max-height: 200px;
46 overflow-y: scroll;
47}
42 48
43.ml_buttons { 49.ml_buttons {
44 clear:both; 50 clear:both;
@@ -54,9 +60,19 @@ POSSIBILITY OF SUCH DAMAGE.
54 cursor: pointer; 60 cursor: pointer;
55 margin: 0 1px; 61 margin: 0 1px;
56 float: left; 62 float: left;
63 width: 40px;
64}
65
66.ml_buttons .ml_duplicate_btn {
57 width: 60px; 67 width: 60px;
58} 68}
59 69
60.ml_buttons .nj-skinned:last-child { 70.ml_buttons .ml_delete_btn {
71 width: 50px;
61 float: right; 72 float: right;
62} 73}
74
75.ml_buttons .nj-skinned:hover,
76.ml_buttons .nj-skinned:active {
77 color: white;
78} \ No newline at end of file
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
index f77d3186..307f2c5a 100755
--- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
+++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
@@ -29,16 +29,16 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29POSSIBILITY OF SUCH DAMAGE. 29POSSIBILITY OF SUCH DAMAGE.
30</copyright> --> 30</copyright> -->
31<html lang="en"> 31<html lang="en">
32 <head> 32 <head>
33 <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 33 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
34 <link rel="stylesheet" type="text/css" href="materials-library-panel.css"> 34 <link rel="stylesheet" type="text/css" href="materials-library-panel.css">
35 <script type="text/montage-serialization"> 35 <script type="text/montage-serialization">
36 { 36 {
37 "addButton": { 37 "duplicateButton": {
38 "prototype": "montage/ui/button.reel", 38 "prototype": "montage/ui/button.reel",
39 "properties": { 39 "properties": {
40 "element": {"#": "ml_add_btn"}, 40 "element": {"#": "ml_duplicate_btn"},
41 "enabled": false 41 "enabled": true
42 }, 42 },
43 "listeners": [ 43 "listeners": [
44 { 44 {
@@ -47,11 +47,10 @@ POSSIBILITY OF SUCH DAMAGE.
47 } 47 }
48 ] 48 ]
49 }, 49 },
50 "copyButton": { 50 "editButton": {
51 "prototype": "montage/ui/button.reel", 51 "prototype": "montage/ui/button.reel",
52 "properties": { 52 "properties": {
53 "element": {"#": "ml_copy_btn"}, 53 "element": {"#": "ml_edit_btn"}
54 "enabled": false
55 }, 54 },
56 "listeners": [ 55 "listeners": [
57 { 56 {
@@ -64,7 +63,7 @@ POSSIBILITY OF SUCH DAMAGE.
64 "prototype": "montage/ui/button.reel", 63 "prototype": "montage/ui/button.reel",
65 "properties": { 64 "properties": {
66 "element": {"#": "ml_delete_btn"}, 65 "element": {"#": "ml_delete_btn"},
67 "enabled": false 66 "enabled": false
68 }, 67 },
69 "listeners": [ 68 "listeners": [
70 { 69 {
@@ -106,26 +105,28 @@ POSSIBILITY OF SUCH DAMAGE.
106 "prototype": "js/panels/Materials/materials-library-panel.reel[MaterialsLibraryPanels]", 105 "prototype": "js/panels/Materials/materials-library-panel.reel[MaterialsLibraryPanels]",
107 "properties": { 106 "properties": {
108 "element": {"#": "materials_library_panel"}, 107 "element": {"#": "materials_library_panel"},
109 "_materialInfo": {"@": "materialInfo"} 108 "_materialInfo": {"@": "materialInfo"},
109 "materialsController": {"@": "materialsController"},
110 "deleteButton": {"@": "deleteButton"}
110 } 111 }
111 } 112 }
112 } 113 }
113 </script> 114 </script>
114
115 </head>
116 <body>
117 115
118 <div data-montage-id="materials_library_panel" class="materials_library_panel"> 116 </head>
119 <section data-montage-id="ml_tree_holder" class="animationsLibrary"> 117 <body>
118
119 <div data-montage-id="materials_library_panel" class="materials_library_panel">
120 <section data-montage-id="ml_tree_holder" class="ml_tree_holder">
120 <div data-montage-id="materials_library_tree"></div> 121 <div data-montage-id="materials_library_tree"></div>
121 </section> 122 </section>
122 <hr /> 123 <hr />
123 <div data-montage-id="ml_buttons" class="ml_buttons"> 124 <div data-montage-id="ml_buttons" class="ml_buttons">
124 <button data-montage-id="ml_add_btn" class="nj-skinned">Add</button> 125 <button data-montage-id="ml_duplicate_btn" class="nj-skinned ml_duplicate_btn">Duplicate</button>
125 <button data-montage-id="ml_copy_btn" class="nj-skinned">Copy</button> 126 <button data-montage-id="ml_edit_btn" class="nj-skinned ml_edit_btn">Edit</button>
126 <button data-montage-id="ml_delete_btn" class="nj-skinned">Delete</button> 127 <button data-montage-id="ml_delete_btn" class="nj-skinned ml_delete_btn">Delete</button>
127 </div> 128 </div>
128 </div> 129 </div>
129 130
130 </body> 131 </body>
131</html> 132</html>
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
i