Merge branch 'refs/heads/master' into CSSPanelUpdates

author: Eric Guzman 2012-02-27 11:13:35 -0800
committer: Eric Guzman 2012-02-27 11:13:35 -0800
commit: 1a6604a50f6cfbbf0cd6f45ab94b63a001d02162 (patch)
tree: bbfc75d1be1ff98d22042dbbed4ca93b4a845e0c /js/components/ui/property-control.reel
parent: 9e8cd4448a6d0f809a55c3bdea8b45ed75339794 (diff)
parent: 8125c8c6c9431067840d81c46624b6a2dd5eb4a7 (diff)
download: ninja-1a6604a50f6cfbbf0cd6f45ab94b63a001d02162.tar.gz
2 files changed, 17 insertions, 16 deletions
diff --git a/js/components/ui/property-control.reel/property-control.html b/js/components/ui/property-control.reel/property-control.html
index 2e7c7b53..43e8e67f 100755
--- a/js/components/ui/property-control.reel/property-control.html
+++ b/js/components/ui/property-control.reel/property-control.html
@@ -11,14 +11,14 @@
    <script type="text/montage-serialization">
    {
        "substitution1": {
-            "module": "montage/ui/substitution",
+            "module": "montage/ui/substitution.reel",
            "name": "Substitution",
            "properties": {
                "element": {"#": "propController"}
            }
        },
        "owner": {
-            "module": "js/components/ui/property-control",
+            "module": "js/components/ui/property-control.reel",
            "name": "PropertyControl",
            "properties": {
                "element": {"#": "propControl"},
@@ -30,7 +30,7 @@
    </script>
 </head>
 <body>
-    <div id="propControl">
+    <div id="propControl" class="propControl">
        <div id="propLabel" class="prop-label"></div>
        <div id="propController" class="prop-controller">
            <div id="subDummy"></div>
diff --git a/js/components/ui/property-control.reel/property-control.js b/js/components/ui/property-control.reel/property-control.js
index 586d2e9a..58b1be9f 100755
--- a/js/components/ui/property-control.reel/property-control.js
+++ b/js/components/ui/property-control.reel/property-control.js
@@ -6,16 +6,16 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 var Montage = require("montage/core/core").Montage,
    Component = require("montage/ui/component").Component,
-    HotText = require("js/components/hottext").HotText,
+    HotText = require("js/components/hottext.reel").HotText,
-    HotTextUnit = require("js/components/hottextunit").HotTextUnit,
+    HotTextUnit = require("js/components/hottextunit.reel").HotTextUnit,
-    Slider = require("js/components/slider").Slider,
+    Slider = require("js/components/slider.reel").Slider,
-    Button = require("js/components/button").Button,
+    Button = require("js/components/button.reel").Button,
-    Checkbox = require("js/components/checkbox").Checkbox,
+    Checkbox = require("js/components/checkbox.reel").Checkbox,
-    Combobox = require("js/components/combobox").Combobox,
+    Combobox = require("js/components/combobox.reel").Combobox,
-    TextField = require("js/components/TextField").TextField,
+    TextField = require("js/components/TextField.reel").TextField,
-    ColorChip = require("js/components/ui/color-chip").ColorChip,
+    ColorChip = require("js/components/ui/color-chip.reel").ColorChip,
-    FileInput = require("js/components/ui/file-input").FileInput,
+    FileInput = require("js/components/ui/file-input.reel").FileInput,
-    InputGroup = require("js/components/ui/input-group").InputGroup;
+    InputGroup = require("js/components/ui/input-group.reel").InputGroup;
 var PropertyControl = exports.PropertyControl = Montage.create(Component, {
@@ -134,7 +134,7 @@ var PropertyControl = exports.PropertyControl = Montage.create(Component, {
            {
                this._control[n] = defaults[n];
            }
+            this._labelField.innerHTML = this._label;
            this._control.needsDraw = true;
        }
    },
@@ -170,8 +170,6 @@ var PropertyControl = exports.PropertyControl = Montage.create(Component, {
    prepareForDraw: {
        value: function() {
-            this._labelField.innerHTML = this._label;
-            
            switch(this._controlType)
            {
                case "HotText":
@@ -199,6 +197,9 @@ var PropertyControl = exports.PropertyControl = Montage.create(Component, {
                    break;
                case "ColorChip":
                    this._control = ColorChip.create();
+                    this._control.chip = true;
+                    this._control.hasIcon = false;
+                    this._control.mode = "chip";
                    this._control.addEventListener("change", this, false);
                    this._prop = "color";
                    break;
author	Eric Guzman	2012-02-27 11:13:35 -0800
committer	Eric Guzman	2012-02-27 11:13:35 -0800
commit	1a6604a50f6cfbbf0cd6f45ab94b63a001d02162 (patch)
tree	bbfc75d1be1ff98d22042dbbed4ca93b4a845e0c /js/components/ui/property-control.reel
parent	9e8cd4448a6d0f809a55c3bdea8b45ed75339794 (diff)
parent	8125c8c6c9431067840d81c46624b6a2dd5eb4a7 (diff)
download	ninja-1a6604a50f6cfbbf0cd6f45ab94b63a001d02162.tar.gz

diff --git a/js/components/ui/property-control.reel/property-control.html b/js/components/ui/property-control.reel/property-control.html index 2e7c7b53..43e8e67f 100755 --- a/js/components/ui/property-control.reel/property-control.html +++ b/js/components/ui/property-control.reel/property-control.html
@@ -11,14 +11,14 @@
11	<script type="text/montage-serialization">	11	<script type="text/montage-serialization">
12	{	12	{
13	"substitution1": {	13	"substitution1": {
14	"module": "montage/ui/substitution",	14	"module": "montage/ui/substitution.reel",
15	"name": "Substitution",	15	"name": "Substitution",
16	"properties": {	16	"properties": {
17	"element": {"#": "propController"}	17	"element": {"#": "propController"}
18	}	18	}
19	},	19	},
20	"owner": {	20	"owner": {
21	"module": "js/components/ui/property-control",	21	"module": "js/components/ui/property-control.reel",
22	"name": "PropertyControl",	22	"name": "PropertyControl",
23	"properties": {	23	"properties": {
24	"element": {"#": "propControl"},	24	"element": {"#": "propControl"},
@@ -30,7 +30,7 @@
30	</script>	30	</script>
31	</head>	31	</head>
32	<body>	32	<body>
33	<div id="propControl">	33	<div id="propControl" class="propControl">
34	<div id="propLabel" class="prop-label"></div>	34	<div id="propLabel" class="prop-label"></div>
35	<div id="propController" class="prop-controller">	35	<div id="propController" class="prop-controller">
36	<div id="subDummy"></div>	36	<div id="subDummy"></div>


diff --git a/js/components/ui/property-control.reel/property-control.js b/js/components/ui/property-control.reel/property-control.js index 586d2e9a..58b1be9f 100755 --- a/js/components/ui/property-control.reel/property-control.js +++ b/js/components/ui/property-control.reel/property-control.js
@@ -6,16 +6,16 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
6		6
7	var Montage = require("montage/core/core").Montage,	7	var Montage = require("montage/core/core").Montage,
8	Component = require("montage/ui/component").Component,	8	Component = require("montage/ui/component").Component,
9	HotText = require("js/components/hottext").HotText,	9	HotText = require("js/components/hottext.reel").HotText,
10	HotTextUnit = require("js/components/hottextunit").HotTextUnit,	10	HotTextUnit = require("js/components/hottextunit.reel").HotTextUnit,
11	Slider = require("js/components/slider").Slider,	11	Slider = require("js/components/slider.reel").Slider,
12	Button = require("js/components/button").Button,	12	Button = require("js/components/button.reel").Button,
13	Checkbox = require("js/components/checkbox").Checkbox,	13	Checkbox = require("js/components/checkbox.reel").Checkbox,
14	Combobox = require("js/components/combobox").Combobox,	14	Combobox = require("js/components/combobox.reel").Combobox,
15	TextField = require("js/components/TextField").TextField,	15	TextField = require("js/components/TextField.reel").TextField,
16	ColorChip = require("js/components/ui/color-chip").ColorChip,	16	ColorChip = require("js/components/ui/color-chip.reel").ColorChip,
17	FileInput = require("js/components/ui/file-input").FileInput,	17	FileInput = require("js/components/ui/file-input.reel").FileInput,
18	InputGroup = require("js/components/ui/input-group").InputGroup;	18	InputGroup = require("js/components/ui/input-group.reel").InputGroup;
19		19
20	var PropertyControl = exports.PropertyControl = Montage.create(Component, {	20	var PropertyControl = exports.PropertyControl = Montage.create(Component, {
21		21
@@ -134,7 +134,7 @@ var PropertyControl = exports.PropertyControl = Montage.create(Component, {
134	{	134	{
135	this._control[n] = defaults[n];	135	this._control[n] = defaults[n];
136	}	136	}
137		137	this._labelField.innerHTML = this._label;
138	this._control.needsDraw = true;	138	this._control.needsDraw = true;
139	}	139	}
140	},	140	},
@@ -170,8 +170,6 @@ var PropertyControl = exports.PropertyControl = Montage.create(Component, {
170		170
171	prepareForDraw: {	171	prepareForDraw: {
172	value: function() {	172	value: function() {
173	this._labelField.innerHTML = this._label;
174
175	switch(this._controlType)	173	switch(this._controlType)
176	{	174	{
177	case "HotText":	175	case "HotText":
@@ -199,6 +197,9 @@ var PropertyControl = exports.PropertyControl = Montage.create(Component, {
199	break;	197	break;
200	case "ColorChip":	198	case "ColorChip":
201	this._control = ColorChip.create();	199	this._control = ColorChip.create();
		200	this._control.chip = true;
		201	this._control.hasIcon = false;
		202	this._control.mode = "chip";
202	this._control.addEventListener("change", this, false);	203	this._control.addEventListener("change", this, false);
203	this._prop = "color";	204	this._prop = "color";
204	break;	205	break;