summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources/shared
diff options
context:
space:
mode:
authorfeldstein@chromium.org <feldstein@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-30 00:43:56 +0000
committerfeldstein@chromium.org <feldstein@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-30 00:43:56 +0000
commitced110c761f0a07d5dfa6cca07a890b66f0bd689 (patch)
tree937d15fbfffd887ff553768d350749e09019e8af /chrome/browser/resources/shared
parent785710ca66b4af40df15eda06a3aa46b93651a25 (diff)
downloadchromium_src-ced110c761f0a07d5dfa6cca07a890b66f0bd689.zip
chromium_src-ced110c761f0a07d5dfa6cca07a890b66f0bd689.tar.gz
chromium_src-ced110c761f0a07d5dfa6cca07a890b66f0bd689.tar.bz2
Change MenuItems to use divs and add disabled property
Stops using buttons for menu items so that it doesn't conflict with the button.css file. Added a BOOL_ATTR disabled property so the attribute is set on the element. It was originally not being set and not being styled as disabled. BUG=NONE TEST=NONE Review URL: http://codereview.chromium.org/2863031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51201 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources/shared')
-rw-r--r--chrome/browser/resources/shared/js/cr/ui/menu_item.js10
1 files changed, 8 insertions, 2 deletions
diff --git a/chrome/browser/resources/shared/js/cr/ui/menu_item.js b/chrome/browser/resources/shared/js/cr/ui/menu_item.js
index 5c66f17..d570f78 100644
--- a/chrome/browser/resources/shared/js/cr/ui/menu_item.js
+++ b/chrome/browser/resources/shared/js/cr/ui/menu_item.js
@@ -9,9 +9,9 @@ cr.define('cr.ui', function() {
* Creates a new menu item element.
* @param {Object=} opt_propertyBag Optional properties.
* @constructor
- * @extends {HTMLButtonElement}
+ * @extends {HTMLDivElement}
*/
- var MenuItem = cr.ui.define('button');
+ var MenuItem = cr.ui.define('div');
/**
* Creates a new menu separator element.
@@ -129,6 +129,12 @@ cr.define('cr.ui', function() {
};
/**
+ * Whether the menu item is disabled or not.
+ * @type {boolean}
+ */
+ cr.defineProperty(MenuItem, 'disabled', cr.PropertyKind.BOOL_ATTR);
+
+ /**
* Whether the menu item is hidden or not.
* @type {boolean}
*/