Allow matchSelector to be used even if selector attribute isn't used
This commit is contained in:
parent
a893791f97
commit
b4dcf9a338
|
@ -57,11 +57,11 @@ EventWidget.prototype.render = function(parent,nextSibling) {
|
||||||
if(selectedNode.nodeType === 3) {
|
if(selectedNode.nodeType === 3) {
|
||||||
selectedNode = selectedNode.parentNode;
|
selectedNode = selectedNode.parentNode;
|
||||||
}
|
}
|
||||||
|
// Check that the selected node matches any matchSelector
|
||||||
|
if(matchSelector && !$tw.utils.domMatchesSelector(selectedNode,matchSelector)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
if(selector) {
|
if(selector) {
|
||||||
// Check that the selected node matches any matchSelector
|
|
||||||
if(matchSelector && !$tw.utils.domMatchesSelector(selectedNode,matchSelector)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
// Search ancestors for a node that matches the selector
|
// Search ancestors for a node that matches the selector
|
||||||
while(!$tw.utils.domMatchesSelector(selectedNode,selector) && selectedNode !== domNode) {
|
while(!$tw.utils.domMatchesSelector(selectedNode,selector) && selectedNode !== domNode) {
|
||||||
selectedNode = selectedNode.parentNode;
|
selectedNode = selectedNode.parentNode;
|
||||||
|
|
Loading…
Reference in New Issue