X-Git-Url: http://git.ithinksw.org/extjs.git/blobdiff_plain/6746dc89c47ed01b165cc1152533605f97eb8e8d..HEAD:/src/menu/ColorPicker.js
diff --git a/src/menu/ColorPicker.js b/src/menu/ColorPicker.js
index 1aa0cb04..41699a7a 100644
--- a/src/menu/ColorPicker.js
+++ b/src/menu/ColorPicker.js
@@ -13,26 +13,24 @@ If you are unsure which license is appropriate for your use, please contact the
*/
/**
- * @class Ext.menu.ColorPicker
- * @extends Ext.menu.Menu
- *
A menu containing a {@link Ext.picker.Color} Component.
- * Notes:
- * - Although not listed here, the constructor for this class
- * accepts all of the configuration options of {@link Ext.picker.Color}.
- * - If subclassing ColorMenu, any configuration options for the ColorPicker must be
- * applied to the initialConfig property of the ColorMenu.
- * Applying {@link Ext.picker.Color ColorPicker} configuration settings to
- * this will not affect the ColorPicker's configuration.
- *
+ * A menu containing a Ext.picker.Color Component.
*
- * {@img Ext.menu.ColorPicker/Ext.menu.ColorPicker.png Ext.menu.ColorPicker component}
+ * Notes:
*
- * __Example Usage__
+ * - Although not listed here, the **constructor** for this class accepts all of the
+ * configuration options of {@link Ext.picker.Color}.
+ * - If subclassing ColorMenu, any configuration options for the ColorPicker must be
+ * applied to the **initialConfig** property of the ColorMenu. Applying
+ * {@link Ext.picker.Color ColorPicker} configuration settings to `this` will **not**
+ * affect the ColorPicker's configuration.
*
+ * Example:
+ *
+ * @example
* var colorPicker = Ext.create('Ext.menu.ColorPicker', {
* value: '000000'
* });
- *
+ *
* Ext.create('Ext.menu.Menu', {
* width: 100,
* height: 90,
@@ -48,8 +46,6 @@ If you are unsure which license is appropriate for your use, please contact the
* text: 'regular item'
* }]
* });
- *
- * @author Nicolas Ferrero
*/
Ext.define('Ext.menu.ColorPicker', {
extend: 'Ext.menu.Menu',
@@ -62,13 +58,13 @@ If you are unsure which license is appropriate for your use, please contact the
/**
* @cfg {Boolean} hideOnClick
- * False to continue showing the menu after a date is selected, defaults to true.
+ * False to continue showing the menu after a date is selected.
*/
hideOnClick : true,
/**
* @cfg {String} pickerId
- * An id to assign to the underlying color picker. Defaults to null.
+ * An id to assign to the underlying color picker.
*/
pickerId : null,
@@ -78,9 +74,8 @@ If you are unsure which license is appropriate for your use, please contact the
*/
/**
+ * @property {Ext.picker.Color} picker
* The {@link Ext.picker.Color} instance for this ColorMenu
- * @property picker
- * @type ColorPicker
*/
/**
@@ -94,8 +89,11 @@ If you are unsure which license is appropriate for your use, please contact the
*/
initComponent : function(){
- var me = this;
+ var me = this,
+ cfg = Ext.apply({}, me.initialConfig);
+ // Ensure we don't get duplicate listeners
+ delete cfg.listeners;
Ext.apply(me, {
plain: true,
showSeparator: false,
@@ -103,7 +101,7 @@ If you are unsure which license is appropriate for your use, please contact the
cls: Ext.baseCSSPrefix + 'menu-color-item',
id: me.pickerId,
xtype: 'colorpicker'
- }, me.initialConfig)
+ }, cfg)
});
me.callParent(arguments);
@@ -112,9 +110,7 @@ If you are unsure which license is appropriate for your use, please contact the
/**
* @event select
- * Fires when a date is selected from the {@link #picker Ext.picker.Color}
- * @param {Ext.picker.Color} picker The {@link #picker Ext.picker.Color}
- * @param {String} color The 6-digit color hex code (without the # symbol)
+ * @alias Ext.picker.Color#select
*/
me.relayEvents(me.picker, ['select']);