aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-09 14:35:44 -0700
committerValerio Virgillito2012-07-09 14:35:44 -0700
commit84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/panels/Materials
parentc0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
downloadninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts: js/components/gradientpicker.reel/gradientpicker.js js/components/tools-properties/text-properties.reel/text-properties.js js/document/views/base.js js/document/views/design.js js/helper-classes/3D/StageLine.js js/helper-classes/3D/draw-utils.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/line.js js/lib/geom/rectangle.js js/lib/geom/shape-primitive.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/flag-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/water-material.js js/panels/Materials/materials-library-panel.reel/materials-library-panel.html js/panels/Materials/materials-library-panel.reel/materials-library-panel.js js/panels/Materials/materials-popup.reel/materials-popup.html js/panels/Materials/materials-popup.reel/materials-popup.js js/tools/LineTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/panels/Materials')
-rwxr-xr-xjs/panels/Materials/MaterialsPanel.js4
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.html26
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.js22
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.css6
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.html20
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.js724
6 files changed, 401 insertions, 401 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-library-panel.reel/materials-library-panel.html b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
index e9a2d20d..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,9 +29,9 @@ 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 "duplicateButton": { 37 "duplicateButton": {
@@ -39,7 +39,7 @@ POSSIBILITY OF SUCH DAMAGE.
39 "properties": { 39 "properties": {
40 "element": {"#": "ml_duplicate_btn"}, 40 "element": {"#": "ml_duplicate_btn"},
41 "enabled": true 41 "enabled": true
42 }, 42 },
43 "listeners": [ 43 "listeners": [
44 { 44 {
45 "type": "action", 45 "type": "action",
@@ -63,7 +63,7 @@ POSSIBILITY OF SUCH DAMAGE.
63 "prototype": "montage/ui/button.reel", 63 "prototype": "montage/ui/button.reel",
64 "properties": { 64 "properties": {
65 "element": {"#": "ml_delete_btn"}, 65 "element": {"#": "ml_delete_btn"},
66 "enabled": false 66 "enabled": false
67 }, 67 },
68 "listeners": [ 68 "listeners": [
69 { 69 {
@@ -110,13 +110,13 @@ POSSIBILITY OF SUCH DAMAGE.
110 "deleteButton": {"@": "deleteButton"} 110 "deleteButton": {"@": "deleteButton"}
111 } 111 }
112 } 112 }
113 } 113 }
114 </script> 114 </script>
115 115
116 </head> 116 </head>
117 <body> 117 <body>
118 118
119 <div data-montage-id="materials_library_panel" class="materials_library_panel"> 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 <section data-montage-id="ml_tree_holder" class="ml_tree_holder">
121 <div data-montage-id="materials_library_tree"></div> 121 <div data-montage-id="materials_library_tree"></div>
122 </section> 122 </section>
@@ -126,7 +126,7 @@ POSSIBILITY OF SUCH DAMAGE.
126 <button data-montage-id="ml_edit_btn" class="nj-skinned ml_edit_btn">Edit</button> 126 <button data-montage-id="ml_edit_btn" class="nj-skinned ml_edit_btn">Edit</button>
127 <button data-montage-id="ml_delete_btn" class="nj-skinned ml_delete_btn">Delete</button> 127 <button data-montage-id="ml_delete_btn" class="nj-skinned ml_delete_btn">Delete</button>
128 </div> 128 </div>
129 </div> 129 </div>
130 130
131 </body> 131 </body>
132</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
index d6df8229..873184dc 100755
--- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
+++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
@@ -62,8 +62,8 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
62 }, 62 },
63 63
64 _hasFocus: { 64 _hasFocus: {
65 enumerable: false, 65 enumerable: false,
66 value: false 66 value: false
67 }, 67 },
68 68
69 didCreate: { 69 didCreate: {
@@ -128,12 +128,12 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
128 enumerable:true, 128 enumerable:true,
129 serializable: true 129 serializable: true
130 }, 130 },
131 131
132 _showMaterialPopup: { 132 _showMaterialPopup: {
133 enumerable: false, 133 enumerable: false,
134 value: function (materialObj) { 134 value: function (materialObj) {
135 135
136 if(!this._materialPopup) 136 if(!this._materialPopup)
137 { 137 {
138 this._materialPopup = Popup.create(); 138 this._materialPopup = Popup.create();
139 this._materialInfo.materialsLibraryRef = this; 139 this._materialInfo.materialsLibraryRef = this;
@@ -146,18 +146,18 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
146 this._materialPopup.show(); 146 this._materialPopup.show();
147 147
148 this._materialInfo.loadMaterials(materialObj.materialId, materialObj.useSelection, materialObj.whichMaterial); 148 this._materialInfo.loadMaterials(materialObj.materialId, materialObj.useSelection, materialObj.whichMaterial);
149 } 149 }
150 }, 150 },
151 151
152 handleHideMaterialPopup: { 152 handleHideMaterialPopup: {
153 enumerable: false, 153 enumerable: false,
154 value: function (event) { 154 value: function (event) {
155 if(this._materialPopup){ 155 if(this._materialPopup){
156// console.log("hiding material popup"); 156// console.log("hiding material popup");
157 this._materialInfo.destroy(); 157 this._materialInfo.destroy();
158 this._materialPopup.hide(); 158 this._materialPopup.hide();
159 } 159 }
160 } 160 }
161 }, 161 },
162 162
163 duplicateMaterial: { 163 duplicateMaterial: {
@@ -169,7 +169,7 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
169 var matCopy = mat.dup(); 169 var matCopy = mat.dup();
170 if(!matCopyName) { 170 if(!matCopyName) {
171 matCopyName = this.materialId + "_" + this.customMaterialsCounter++; 171 matCopyName = this.materialId + "_" + this.customMaterialsCounter++;
172 } 172 }
173 matCopy.setName(matCopyName); 173 matCopy.setName(matCopyName);
174 MaterialsModel.addMaterial(matCopy); 174 MaterialsModel.addMaterial(matCopy);
175 175
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.css b/js/panels/Materials/materials-popup.reel/materials-popup.css
index d53cb795..03ea13cd 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.css
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.css
@@ -130,8 +130,8 @@ POSSIBILITY OF SUCH DAMAGE.
130 130
131.mp_properties_list > .mp_property > .colortoolbar 131.mp_properties_list > .mp_property > .colortoolbar
132{ 132{
133 width: 27px !important; 133 width: 27px !important;
134 height: 27px !important; 134 height: 27px !important;
135 overflow:hidden !important; 135 overflow:hidden !important;
136 margin