0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

fix a bug related to disabling checkboxes

Browse source
This commit is contained in:
rlx 2011-10-27 11:20:00 +00:00
parent 1eb93125e6
commit a4cb6ee9ae
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/Ox.UI/js/Form/Ox.Checkbox.js
View file

@ -79,7 +79,9 @@ Ox.Checkbox = function(options, self) {
type: 'image' type: 'image'
}) })
.addClass('OxCheckbox') .addClass('OxCheckbox')
.click(clickButton) .bindEvent({
click: clickButton
})
.appendTo(that); .appendTo(that);
function clickButton() { function clickButton() {
@ -102,7 +104,9 @@ Ox.Checkbox = function(options, self) {
if (key == 'checked') { if (key == 'checked') {
that.toggleChecked(); that.toggleChecked();
} else if (key == 'disabled') { } else if (key == 'disabled') {
that.attr({disabled: value}) that.attr({disabled: value});
self.$button.options({disabled: value});
self.$title && self.$title.options({disabled: value});
} else if (key == 'title') { } else if (key == 'title') {
self.$title.options({title: value}); self.$title.options({title: value});
} }

5
source/Ox/js/HTML.js
View file

@ -39,8 +39,9 @@ Ox.parseHTML = (function() {
var defaultTags = [ var defaultTags = [
'a', 'b', 'blockquote', 'br', 'cite', 'code', 'a', 'b', 'blockquote', 'br', 'cite', 'code',
'del', 'em', 'i', 'img', 'ins', 'del', 'em', 'i', 'img', 'ins',
'li', 'ol', 'p', 'q', 'rtl', 's', 'li', 'ol', 'p', 'q', 'rtl',
'strong', 'sub', 'sup', 'ul', '[]' 's', 'strong', 'sub', 'sup',
'table', 'tbody', 'td', 'th', 'tr', 'ul', '[]'
], ],
parse = { parse = {
a: { a: {