aboutsummaryrefslogtreecommitdiff
path: root/js/components
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-23 00:34:37 -0800
committerValerio Virgillito2012-02-23 00:34:37 -0800
commit3675cac3993430490d9eef18157314d53ffa1a6a (patch)
treefb225a6d8fc3c983c96b1507483d628909dc8c1e /js/components
parent2afef244a3f8124f8a049e504e9782c05904ce23 (diff)
parent3730bbc7cc5d5f07b3d788885475a8f9810b480e (diff)
downloadninja-3675cac3993430490d9eef18157314d53ffa1a6a.tar.gz
Merge pull request #60 from mqg734/WebGLMaterials
Integrating WebGL and canvas-2d drawing fixes. Fixed Materials Editor Popup to work with latest Montage framework. Also adding back WebGL materials.
Diffstat (limited to 'js/components')
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.css16
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.html2
-rwxr-xr-xjs/components/ui/color-chip.reel/color-chip.js20
-rwxr-xr-xjs/components/ui/file-input.reel/file-input.html6
-rwxr-xr-xjs/components/ui/file-input.reel/file-input.js2
-rwxr-xr-xjs/components/ui/input-group.reel/input-group.css2
-rwxr-xr-xjs/components/ui/input-group.reel/input-group.html10
-rwxr-xr-xjs/components/ui/property-control.reel/property-control.html6
-rwxr-xr-xjs/components/ui/property-control.reel/property-control.js27
9 files changed, 51 insertions, 40 deletions
diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.css b/js/components/tools-properties/rect-properties.reel/rect-properties.css
index f50a9873..74509555 100755
--- a/js/components/tools-properties/rect-properties.reel/rect-properties.css
+++ b/js/components/tools-properties/rect-properties.reel/rect-properties.css
@@ -4,7 +4,7 @@
4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. 4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5 </copyright> */ 5 </copyright> */
6 6
7.button { 7.rectProperties .button {
8 border:none; 8 border:none;
9 cursor:default; 9 cursor:default;
10 text-align:center; 10 text-align:center;
@@ -12,28 +12,30 @@
12 opacity:0.8; 12 opacity:0.8;
13 display:table-cell; 13 display:table-cell;
14 vertical-align:middle; 14 vertical-align:middle;
15 width:100%;
16 height:100%;
17 background-color:#333333; 15 background-color:#333333;
18 color:white; 16 color:white;
19} 17}
20 18
21.button:hover 19.rectProperties .subToolButton {
20 float:left;
21}
22
23.rectProperties .button:hover
22{ 24{
23 opacity:1; 25 opacity:1;
24} 26}
25 27
26.button:active 28.rectProperties .button:active
27{ 29{
28 outline:solid 1px black; 30 outline:solid 1px black;
29} 31}
30 32
31.button.on 33.rectProperties .button.on
32{ 34{
33 background-color: #333333; 35 background-color: #333333;
34} 36}
35 37
36.button.off 38.rectProperties .button.off
37{ 39{
38 background-color: #cccccc; 40 background-color: #cccccc;
39 color:black; 41 color:black;
diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.html b/js/components/tools-properties/rect-properties.reel/rect-properties.html
index e5c52466..214ff1d5 100755
--- a/js/components/tools-properties/rect-properties.reel/rect-properties.html
+++ b/js/components/tools-properties/rect-properties.reel/rect-properties.html
@@ -68,7 +68,7 @@
68 </head> 68 </head>
69 69
70 <body> 70 <body>
71 <div id="rectProperties"> 71 <div id="rectProperties" class="rectProperties">
72 <button id="lockButton" class="unselectable subToolButton button LockToolUp" style=" margin-left:20px"></button> 72 <button id="lockButton" class="unselectable subToolButton button LockToolUp" style=" margin-left:20px"></button>
73 <div id="TLRadiusLabel" class="unselectable subToolButton cornerRadius topLeft"></div> 73 <div id="TLRadiusLabel" class="unselectable subToolButton cornerRadius topLeft"></div>
74 <div id="TLRadiusControl" class="label"></div> 74 <div id="TLRadiusControl" class="label"></div>
diff --git a/js/components/ui/color-chip.reel/color-chip.js b/js/components/ui/color-chip.reel/color-chip.js
index e51bdd8a..ed1ac27a 100755
--- a/js/components/ui/color-chip.reel/color-chip.js
+++ b/js/components/ui/color-chip.reel/color-chip.js
@@ -29,12 +29,20 @@ var ColorChip = exports.ColorChip = Montage.create(Component, {
29 value: 20 29 value: 20
30 }, 30 },
31 31
32 initialColor: { 32 color: {
33 value: false 33 value: {r:0, g:0, b:0, a:1, css:'rgb(0,0,0)', mode:'rgb'}
34 }, 34 },
35 35
36 changeDelegate: { 36 changeDelegate: {
37 value: null 37 value: function(event) {
38 this.color = event._event.color;
39
40 var evt = document.createEvent("CustomEvent");
41 evt.initEvent("change", true, true);
42 evt.type = "change";
43
44 this.dispatchEvent(evt);
45 }
38 }, 46 },
39 47
40 prepareForDraw: { 48 prepareForDraw: {
@@ -60,10 +68,10 @@ var ColorChip = exports.ColorChip = Montage.create(Component, {
60 value: function(evt) { 68 value: function(evt) {
61 if(this.chip) { 69 if(this.chip) {
62 // This is a single chip - Not related to the color panel -- Set the initial color if found 70 // This is a single chip - Not related to the color panel -- Set the initial color if found
63 var mode = "rgb", r = 0, g = 0, b = 0, a = 1, css = "rgb(255,0,0)"; 71 var mode = "rgb", r = 0, g = 0, b = 0, a = 1, css = "rgb(0,0,0)";
64 72
65 if(this.initialColor) { 73 if(this.color) {
66 var colorObj = this.application.ninja.colorController.getColorObjFromCss(this.initialColor); 74 var colorObj = this.application.ninja.colorController.getColorObjFromCss(this.color.css);
67 mode = colorObj.mode; 75 mode = colorObj.mode;
68 r = colorObj.value.r; 76 r = colorObj.value.r;
69 g = colorObj.value.g; 77 g = colorObj.value.g;
diff --git a/js/components/ui/file-input.reel/file-input.html b/js/components/ui/file-input.reel/file-input.html
index 5cdd8f9e..2a8546a5 100755
--- a/js/components/ui/file-input.reel/file-input.html
+++ b/js/components/ui/file-input.reel/file-input.html
@@ -11,7 +11,7 @@
11 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
12 { 12 {
13 "owner": { 13 "owner": {
14 "module": "js/components/ui/file-input", 14 "module": "js/components/ui/file-input.reel",
15 "name": "FileInput", 15 "name": "FileInput",
16 "properties": { 16 "properties": {
17 "element": {"#": "fileInput"}, 17 "element": {"#": "fileInput"},
@@ -23,8 +23,8 @@
23 </script> 23 </script>
24</head> 24</head>
25<body> 25<body>
26 <div id="fileInput"> 26 <div id="fileInput" class="fileInput">
27 <input id="fileInputTextField" class="file-path" type="text" /> 27 <input id="fileInputTextField" class="file-path nj-skinned" type="text" />
28 <input id="fileInputControl" class="browse-button" type="file" /> 28 <input id="fileInputControl" class="browse-button" type="file" />
29 </div> 29 </div>
30</body> 30</body>
diff --git a/js/components/ui/file-input.reel/file-input.js b/js/components/ui/file-input.reel/file-input.js
index 2ea38162..b57f7c21 100755
--- a/js/components/ui/file-input.reel/file-input.js
+++ b/js/components/ui/file-input.reel/file-input.js
@@ -5,7 +5,7 @@ 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,
8Component = require("montage/ui/component").Component; 8 Component = require("montage/ui/component").Component;
9 9
10var FileInput = exports.FileInput = Montage.create(Component, { 10var FileInput = exports.FileInput = Montage.create(Component, {
11 11
diff --git a/js/components/ui/input-group.reel/input-group.css b/js/components/ui/input-group.reel/input-group.css
index 8e2267eb..0b7cd1ef 100755
--- a/js/components/ui/input-group.reel/input-group.css
+++ b/js/components/ui/input-group.reel/input-group.css
@@ -23,7 +23,7 @@
23 23
24.propControl .inputRow div .hottext, 24.propControl .inputRow div .hottext,
25.propControl .inputRow div .hottextInput, 25.propControl .inputRow div .hottextInput,
26.prop-controller .textfield 26.prop-controller .nj-skinned
27{ 27{
28 border: 1px solid black; 28 border: 1px solid black;
29 width: 30px !important; 29 width: 30px !important;
diff --git a/js/components/ui/input-group.reel/input-group.html b/js/components/ui/input-group.reel/input-group.html
index c99e29d6..0050b8cb 100755
--- a/js/components/ui/input-group.reel/input-group.html
+++ b/js/components/ui/input-group.reel/input-group.html
@@ -11,7 +11,7 @@
11 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
12 { 12 {
13 "eventDelegator": { 13 "eventDelegator": {
14 "module": "montage/event/action-event-listener", 14 "module": "montage/core/event/action-event-listener",
15 "name": "ActionEventListener", 15 "name": "ActionEventListener",
16 "properties": { 16 "properties": {
17 "handler": {"@": "owner"}, 17 "handler": {"@": "owner"},
@@ -19,7 +19,7 @@
19 } 19 }
20 }, 20 },
21 "propControl1": { 21 "propControl1": {
22 "module": "js/components/ui/property-control", 22 "module": "js/components/ui/property-control.reel",
23 "name": "PropertyControl", 23 "name": "PropertyControl",
24 "properties": { 24 "propertie