Index: lib/requestNotifier.js |
=================================================================== |
--- a/lib/requestNotifier.js |
+++ b/lib/requestNotifier.js |
@@ -241,19 +241,12 @@ |
{ |
while (node) |
{ |
- let data = getEntry(nodeData, node); |
- if (typeof data != "undefined") |
+ let entry = getEntry(nodeData, node); |
+ if (typeof entry != "undefined" && |
+ (typeof type == "undefined" || entry.type == type) && |
+ (typeof location == "undefined" || entry.location == location)) |
{ |
- // Look for matching entry |
- for (let k in data) |
- { |
- let entry = data[k]; |
- if ((typeof type == "undefined" || entry.type == type) && |
- (typeof location == "undefined" || entry.location == location)) |
- { |
- return [node, entry]; |
- } |
- } |
+ return [node, entry]; |
} |
// If we don't have any match on this node then maybe its parent will do |
@@ -365,14 +358,6 @@ |
*/ |
attachToNode: function(/**Node*/ node) |
{ |
- let existingData = getEntry(nodeData, node); |
- if (typeof existingData == "undefined") |
- { |
- existingData = {}; |
- setEntry(nodeData, node, existingData); |
- } |
- |
- // Add this request to the node data |
- existingData[this.type + " " + this.location] = this; |
+ setEntry(nodeData, node, this); |
Wladimir Palant
2014/08/14 20:44:57
The the list of blockable items is broken now beca
saroyanm
2014/08/17 14:25:21
Oops, Thanks for that.
|
} |
}; |