[primefaces] r12169 committed - Add targetFilter option to context menu

92 views
Skip to first unread message

prime...@googlecode.com

unread,
Dec 16, 2014, 8:36:56 AM12/16/14
to primeface...@googlegroups.com
Revision: 12169
Author: cagatay...@gmail.com
Date: Tue Dec 16 13:36:43 2014 UTC
Log: Add targetFilter option to context menu
https://code.google.com/p/primefaces/source/detail?r=12169

Modified:

/primefaces/trunk/src/main/java/org/primefaces/component/contextmenu/ContextMenuRenderer.java

/primefaces/trunk/src/main/resources/META-INF/resources/primefaces/menu/menu.js
/primefaces/trunk/src/main/resources-maven-jsf/ui/contextMenu.xml

=======================================
---
/primefaces/trunk/src/main/java/org/primefaces/component/contextmenu/ContextMenuRenderer.java
Tue Sep 23 09:55:40 2014 UTC
+++
/primefaces/trunk/src/main/java/org/primefaces/component/contextmenu/ContextMenuRenderer.java
Tue Dec 16 13:36:43 2014 UTC
@@ -51,7 +51,8 @@
wb.attr("nodeType", menu.getNodeType(), null)
.attr("event", menu.getEvent(), null)
.attr("selectionMode", menu.getSelectionMode(), "multiple")
- .callback("beforeShow", "function(event)",
menu.getBeforeShow());
+ .callback("beforeShow", "function(event)",
menu.getBeforeShow())
+ .attr("targetFilter", menu.getTargetFilter(), null);

wb.finish();
}
=======================================
---
/primefaces/trunk/src/main/resources/META-INF/resources/primefaces/menu/menu.js
Wed Oct 29 21:21:01 2014 UTC
+++
/primefaces/trunk/src/main/resources/META-INF/resources/primefaces/menu/menu.js
Tue Dec 16 13:36:43 2014 UTC
@@ -994,8 +994,6 @@
widget.onRowRightClick(e, this,
$this.cfg.selectionMode);

$this.show(e);
-
- e.preventDefault();
}
else if(widget.cfg.editMode === 'cell') {
var target = $(e.target),
@@ -1089,7 +1087,11 @@
});
},

- show: function(e) {
+ show: function(e) {
+ if(this.cfg.targetFilter && $(e.target).is(':not(' +
this.cfg.targetFilter + ')')) {
+ return;
+ }
+
//hide other contextmenus if any
$(document.body).children('.ui-contextmenu:visible').hide();

@@ -1108,7 +1110,10 @@
}

if(this.cfg.beforeShow) {
- this.cfg.beforeShow.call(this, e);
+ var retVal = this.cfg.beforeShow.call(this, e);
+ if(retVal === false) {
+ return;
+ }
}

this.jq.css({
=======================================
--- /primefaces/trunk/src/main/resources-maven-jsf/ui/contextMenu.xml Tue
Sep 23 09:55:40 2014 UTC
+++ /primefaces/trunk/src/main/resources-maven-jsf/ui/contextMenu.xml Tue
Dec 16 13:36:43 2014 UTC
@@ -70,6 +70,12 @@
<defaultValue>multiple</defaultValue>
<description>Defines the selection behavior. Valid values
are "single" and "multiple" (default).</description>
</attribute>
+ <attribute>
+ <name>targetFilter</name>
+ <required>false</required>
+ <type>java.lang.String</type>
+ <description>Selector to filter the elements to attach the
menu. Default is null.</description>
+ </attribute>
</attributes>
<resources>
<resource>
Reply all
Reply to author
Forward
0 new messages