From a4cb6ee9aeec762d2ca6ba1697488be6931aa541 Mon Sep 17 00:00:00 2001 From: rlx <0x0073@0x2620.org> Date: Thu, 27 Oct 2011 11:20:00 +0000 Subject: [PATCH] fix a bug related to disabling checkboxes --- source/Ox.UI/js/Form/Ox.Checkbox.js | 8 ++++++-- source/Ox/js/HTML.js | 5 +++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/source/Ox.UI/js/Form/Ox.Checkbox.js b/source/Ox.UI/js/Form/Ox.Checkbox.js index ebd4f511..b8a163c8 100644 --- a/source/Ox.UI/js/Form/Ox.Checkbox.js +++ b/source/Ox.UI/js/Form/Ox.Checkbox.js @@ -79,7 +79,9 @@ Ox.Checkbox = function(options, self) { type: 'image' }) .addClass('OxCheckbox') - .click(clickButton) + .bindEvent({ + click: clickButton + }) .appendTo(that); function clickButton() { @@ -102,7 +104,9 @@ Ox.Checkbox = function(options, self) { if (key == 'checked') { that.toggleChecked(); } 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') { self.$title.options({title: value}); } diff --git a/source/Ox/js/HTML.js b/source/Ox/js/HTML.js index 9d4b49d4..7b6e452e 100644 --- a/source/Ox/js/HTML.js +++ b/source/Ox/js/HTML.js @@ -39,8 +39,9 @@ Ox.parseHTML = (function() { var defaultTags = [ 'a', 'b', 'blockquote', 'br', 'cite', 'code', 'del', 'em', 'i', 'img', 'ins', - 'li', 'ol', 'p', 'q', 'rtl', 's', - 'strong', 'sub', 'sup', 'ul', '[]' + 'li', 'ol', 'p', 'q', 'rtl', + 's', 'strong', 'sub', 'sup', + 'table', 'tbody', 'td', 'th', 'tr', 'ul', '[]' ], parse = { a: {