diff options
author | Valerio Virgillito | 2012-05-16 00:54:30 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-05-16 00:54:30 -0700 |
commit | 6dfe2e62b1d7a71daf097aac3a31213d564e6122 (patch) | |
tree | c40c07be0bfcdd9001723b65bf4cc3b0358da9fe /js/panels | |
parent | 9464de58d5bb8b467829926b9d01c0760ec4d790 (diff) | |
download | ninja-6dfe2e62b1d7a71daf097aac3a31213d564e6122.tar.gz |
Removing the old checkbox components. Created a new LabelCheckbox
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/panels')
-rwxr-xr-x | js/panels/properties.reel/properties.css | 8 | ||||
-rwxr-xr-x | js/panels/properties.reel/sections/custom.reel/custom.js | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/js/panels/properties.reel/properties.css b/js/panels/properties.reel/properties.css index 0928da3a..756ecc5c 100755 --- a/js/panels/properties.reel/properties.css +++ b/js/panels/properties.reel/properties.css | |||
@@ -256,17 +256,17 @@ padding-right:6px; | |||
256 | content: "•"; | 256 | content: "•"; |
257 | } | 257 | } |
258 | 258 | ||
259 | .propertiesPanel input.nj-skinned label { | 259 | .propertiesPanel .checkbox-label { |
260 | position: absolute; | 260 | position: absolute; |
261 | top: 0; | 261 | top: 4px; |
262 | left: 15px; | 262 | padding-left: 5px; |
263 | /*left: 15px;*/ | ||
263 | font-size: 10px; | 264 | font-size: 10px; |
264 | width:55px; | 265 | width:55px; |
265 | text-align: left; | 266 | text-align: left; |
266 | font-weight: normal; | 267 | font-weight: normal; |
267 | color:#FFF; | 268 | color:#FFF; |
268 | } | 269 | } |
269 | |||
270 | .propertiesPanel input[type='radio'].nj-skinned { | 270 | .propertiesPanel input[type='radio'].nj-skinned { |
271 | text-indent: 0px; | 271 | text-indent: 0px; |
272 | line-height: 5px; | 272 | line-height: 5px; |
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.js b/js/panels/properties.reel/sections/custom.reel/custom.js index 876fe110..3ab32888 100755 --- a/js/panels/properties.reel/sections/custom.reel/custom.js +++ b/js/panels/properties.reel/sections/custom.reel/custom.js | |||
@@ -19,7 +19,7 @@ var HT = require("js/components/hottext.reel").HotText; | |||
19 | var Dropdown = require("js/components/combobox.reel").Combobox; | 19 | var Dropdown = require("js/components/combobox.reel").Combobox; |
20 | var TextField = require("js/components/textfield.reel").TextField; | 20 | var TextField = require("js/components/textfield.reel").TextField; |
21 | var FileInput = require("js/components/ui/file-input.reel").FileInput; | 21 | var FileInput = require("js/components/ui/file-input.reel").FileInput; |
22 | var Checkbox = require("js/components/checkbox.reel").Checkbox; | 22 | var LabelCheckbox = require("js/components/ui/label-checkbox.reel").LabelCheckbox; |
23 | var ColorChip = require("js/components/ui/color-chip.reel").ColorChip; | 23 | var ColorChip = require("js/components/ui/color-chip.reel").ColorChip; |
24 | var Button = require("montage/ui/button.reel").Button; | 24 | var Button = require("montage/ui/button.reel").Button; |
25 | 25 | ||
@@ -77,7 +77,7 @@ exports.CustomSection = Montage.create(Component, { | |||
77 | this.rows.push(tmpRow); | 77 | this.rows.push(tmpRow); |
78 | 78 | ||
79 | } else if(this._fields[i].length === 3) { | 79 | } else if(this._fields[i].length === 3) { |
80 | 80 | ||
81 | } | 81 | } |
82 | 82 | ||
83 | } | 83 | } |
@@ -103,7 +103,7 @@ exports.CustomSection = Montage.create(Component, { | |||
103 | handleChange: { | 103 | handleChange: { |
104 | value:function(event) { | 104 | value:function(event) { |
105 | if(event._event.wasSetByCode) return; | 105 | if(event._event.wasSetByCode) return; |
106 | 106 | ||
107 | var obj = event.currentTarget; | 107 | var obj = event.currentTarget; |
108 | this._dispatchPropEvent({"type": "change", "id": obj.id, "prop": obj.prop, "value": obj.value, "control": obj}); | 108 | this._dispatchPropEvent({"type": "change", "id": obj.id, "prop": obj.prop, "value": obj.value, "control": obj}); |
109 | } | 109 | } |
@@ -349,7 +349,7 @@ exports.CustomSection = Montage.create(Component, { | |||
349 | value: function(aField) { | 349 | value: function(aField) { |
350 | 350 | ||
351 | // Generate Textfield | 351 | // Generate Textfield |
352 | var obj = Checkbox.create(); | 352 | var obj = LabelCheckbox.create(); |
353 | 353 | ||
354 | // Set Values for TextField | 354 | // Set Values for TextField |
355 | if (aField.id) obj.id = aField.id; | 355 | if (aField.id) obj.id = aField.id; |