[richfaces-svn-commits] JBoss Rich Faces SVN: r21938 - branches/4.0.0.CR1/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces.
Author: pyaschenko
Date: 2011-02-25 12:11:41 -0500 (Fri, 25 Feb 2011)
New Revision: 21938
Modified:
branches/4.0.0.CR1/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuGroup.js
branches/4.0.0.CR1/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuItem.js
Log:
https://jira.jboss.org/browse/RF-10623
Modified:
branches/4.0.0.CR1/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuGroup.js
===================================================================
---
branches/4.0.0.CR1/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuGroup.js 2011-02-25
15:07:34 UTC (rev 21937)
+++
branches/4.0.0.CR1/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuGroup.js 2011-02-25
17:11:41 UTC (rev 21938)
@@ -221,12 +221,12 @@
});
}
- this.__addUserEventHandler("beforecollapse");
+ /*this.__addUserEventHandler("beforecollapse");
this.__addUserEventHandler("collapse");
this.__addUserEventHandler("beforeexpand");
this.__addUserEventHandler("expand");
this.__addUserEventHandler("beforeswitch");
- this.__addUserEventHandler("switch");
+ this.__addUserEventHandler("switch");*/
}
},
@@ -403,11 +403,6 @@
__isMyEvent: function (event) {
return this.id == event.target.id;
},
-
- __fireEvent: function(eventName) {
- var data = {id: this.id};
- return rf.Event.fireById(this.id, eventName, data);
- },
destroy: function () {
rf.Event.unbindById(this.id, "."+this.namespace);
Modified:
branches/4.0.0.CR1/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuItem.js
===================================================================
---
branches/4.0.0.CR1/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuItem.js 2011-02-25
15:07:34 UTC (rev 21937)
+++
branches/4.0.0.CR1/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuItem.js 2011-02-25
17:11:41 UTC (rev 21938)
@@ -203,7 +203,7 @@
* @return {void} TODO ...
*/
select: function () {
- var continueProcess = this.__fireBeforeSelect();
+ var continueProcess = this.__fireEvent("beforeSelect");
if (!continueProcess) {
return false;
}
@@ -300,13 +300,7 @@
__unselect: function () {
this.__header().removeClass(this.selectionClass);
},
-
- __fireBeforeSelect : function () {
- return rf.Event.fireById(this.id, "beforeselect", {
- item: this
- });
- },
-
+
__fireSelect : function () {
return rf.Event.fireById(this.id, "select", {
item: this
@@ -318,6 +312,10 @@
item: this
});
},
+
+ __fireEvent : function (eventType, event) {
+ return this.invokeEvent(eventType, rf.getDomElement(this.id), event, {id:
this.id, item: this});
+ },
/**
* @private