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.
author: Valerio Virgillito 2012-02-23 00:34:37 -0800
committer: Valerio Virgillito 2012-02-23 00:34:37 -0800
commit: 3675cac3993430490d9eef18157314d53ffa1a6a (patch)
tree: fb225a6d8fc3c983c96b1507483d628909dc8c1e /js/components/ui/input-group.reel
parent: 2afef244a3f8124f8a049e504e9782c05904ce23 (diff)
parent: 3730bbc7cc5d5f07b3d788885475a8f9810b480e (diff)
download: ninja-3675cac3993430490d9eef18157314d53ffa1a6a.tar.gz
2 files changed, 6 insertions, 6 deletions
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 @@
 .propControl .inputRow div .hottext,
 .propControl .inputRow div .hottextInput,
-.prop-controller .textfield
+.prop-controller .nj-skinned
 {
    border: 1px solid black;
    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 @@
    <script type="text/montage-serialization">
    {
        "eventDelegator": {
-                "module": "montage/event/action-event-listener",
+                "module": "montage/core/event/action-event-listener",
                "name": "ActionEventListener",
                "properties": {
                    "handler": {"@": "owner"},
@@ -19,7 +19,7 @@
                }
            },
        "propControl1": {
-            "module": "js/components/ui/property-control",
+            "module": "js/components/ui/property-control.reel",
            "name": "PropertyControl",
            "properties": {
                "element": {"#": "inputPair"}
@@ -44,7 +44,7 @@
                            ]
        },
        "propList": {
-            "module": "montage/ui/repetition",
+            "module": "montage/ui/repetition.reel",
            "name": "Repetition",
            "properties": {
                "element": {"#": "inputList"}
@@ -58,7 +58,7 @@
            }
        },
        "owner": {
-            "module": "js/components/ui/input-group",
+            "module": "js/components/ui/input-group.reel",
            "name": "InputGroup",
            "properties": {
                "element": {"#": "inputRow"},
@@ -69,7 +69,7 @@
    </script>
 </head>
 <body>
-    <div id="inputRow" style="-webkit-user-select: none;">
+    <div id="inputRow" class="inputRow" style="-webkit-user-select: none;">
        <div id="inputList">
            <div id="inputPair"></div>
        </div>
author	Valerio Virgillito	2012-02-23 00:34:37 -0800
committer	Valerio Virgillito	2012-02-23 00:34:37 -0800
commit	3675cac3993430490d9eef18157314d53ffa1a6a (patch)
tree	fb225a6d8fc3c983c96b1507483d628909dc8c1e /js/components/ui/input-group.reel
parent	2afef244a3f8124f8a049e504e9782c05904ce23 (diff)
parent	3730bbc7cc5d5f07b3d788885475a8f9810b480e (diff)
download	ninja-3675cac3993430490d9eef18157314d53ffa1a6a.tar.gz

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	"properties": {
25	"element": {"#": "inputPair"}	25	"element": {"#": "inputPair"}
@@ -44,7 +44,7 @@
44	]	44	]
45	},	45	},
46	"propList": {	46	"propList": {
47	"module": "montage/ui/repetition",	47	"module": "montage/ui/repetition.reel",
48	"name": "Repetition",	48	"name": "Repetition",
49	"properties": {	49	"properties": {
50	"element": {"#": "inputList"}	50	"element": {"#": "inputList"}
@@ -58,7 +58,7 @@
58	}	58	}
59	},	59	},
60	"owner": {	60	"owner": {
61	"module": "js/components/ui/input-group",	61	"module": "js/components/ui/input-group.reel",
62	"name": "InputGroup",	62	"name": "InputGroup",
63	"properties": {	63	"properties": {
64	"element": {"#": "inputRow"},	64	"element": {"#": "inputRow"},
@@ -69,7 +69,7 @@
69	</script>	69	</script>
70	</head>	70	</head>
71	<body>	71	<body>
72	<div id="inputRow" style="-webkit-user-select: none;">	72	<div id="inputRow" class="inputRow" style="-webkit-user-select: none;">
73	<div id="inputList">	73	<div id="inputList">
74	<div id="inputPair"></div>	74	<div id="inputPair"></div>
75	</div>	75	</div>