git.ithinksw.org
/
extjs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade to ExtJS 3.1.1 - Released 02/08/2010
[extjs.git]
/
docs
/
source
/
Item.html
diff --git
a/docs/source/Item.html
b/docs/source/Item.html
index
0f2f4eb
..
ed50c05
100644
(file)
--- a/
docs/source/Item.html
+++ b/
docs/source/Item.html
@@
-1,5
+1,6
@@
<html>
\r
<head>
\r
<html>
\r
<head>
\r
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
\r
<title>The source code</title>
\r
<link href="../resources/prettify/prettify.css" type="text/css" rel="stylesheet" />
\r
<script type="text/javascript" src="../resources/prettify/prettify.js"></script>
\r
<title>The source code</title>
\r
<link href="../resources/prettify/prettify.css" type="text/css" rel="stylesheet" />
\r
<script type="text/javascript" src="../resources/prettify/prettify.js"></script>
\r
@@
-16,13
+17,7
@@
* @param {Object} config Configuration options
\r
* @xtype menuitem
\r
*/
\r
* @param {Object} config Configuration options
\r
* @xtype menuitem
\r
*/
\r
-Ext.menu.Item = function(config){
\r
- Ext.menu.Item.superclass.constructor.call(this, config);
\r
- if(this.menu){
\r
- this.menu = Ext.menu.MenuMgr.get(this.menu);
\r
- }
\r
-};
\r
-Ext.extend(Ext.menu.Item, Ext.menu.BaseItem, {
\r
+Ext.menu.Item = Ext.extend(Ext.menu.BaseItem, {
\r
<div id="prop-Ext.menu.Item-menu"></div>/**
\r
* @property menu
\r
* @type Ext.menu.Menu
\r
<div id="prop-Ext.menu.Item-menu"></div>/**
\r
* @property menu
\r
* @type Ext.menu.Menu
\r
@@
-67,6
+62,14
@@
Ext.extend(Ext.menu.Item, Ext.menu.BaseItem, {
// private
\r
ctype: 'Ext.menu.Item',
\r
\r
// private
\r
ctype: 'Ext.menu.Item',
\r
\r
+ initComponent : function(){
\r
+ Ext.menu.Item.superclass.initComponent.call(this);
\r
+ if(this.menu){
\r
+ this.menu = Ext.menu.MenuMgr.get(this.menu);
\r
+ this.menu.ownerCt = this;
\r
+ }
\r
+ },
\r
+
\r
// private
\r
onRender : function(container, position){
\r
if (!this.itemTpl) {
\r
// private
\r
onRender : function(container, position){
\r
if (!this.itemTpl) {
\r
@@
-85,6
+88,9
@@
Ext.extend(Ext.menu.Item, Ext.menu.BaseItem, {
this.el = position ? this.itemTpl.insertBefore(position, a, true) : this.itemTpl.append(container, a, true);
\r
this.iconEl = this.el.child('img.x-menu-item-icon');
\r
this.textEl = this.el.child('.x-menu-item-text');
\r
this.el = position ? this.itemTpl.insertBefore(position, a, true) : this.itemTpl.append(container, a, true);
\r
this.iconEl = this.el.child('img.x-menu-item-icon');
\r
this.textEl = this.el.child('.x-menu-item-text');
\r
+ if(!this.href) { // if no link defined, prevent the default anchor event
\r
+ this.mon(this.el, 'click', Ext.emptyFn, null, { preventDefault: true });
\r
+ }
\r
Ext.menu.Item.superclass.onRender.call(this, container, position);
\r
},
\r
\r
Ext.menu.Item.superclass.onRender.call(this, container, position);
\r
},
\r
\r
@@
-123,10
+129,11
@@
Ext.extend(Ext.menu.Item, Ext.menu.BaseItem, {
this.iconEl.replaceClass(oldCls, this.iconCls);
\r
}
\r
},
\r
this.iconEl.replaceClass(oldCls, this.iconCls);
\r
}
\r
},
\r
-
\r
+
\r
//private
\r
beforeDestroy: function(){
\r
if (this.menu){
\r
//private
\r
beforeDestroy: function(){
\r
if (this.menu){
\r
+ delete this.menu.ownerCt;
\r
this.menu.destroy();
\r
}
\r
Ext.menu.Item.superclass.beforeDestroy.call(this);
\r
this.menu.destroy();
\r
}
\r
Ext.menu.Item.superclass.beforeDestroy.call(this);
\r