mirror of
https://github.com/Jermolene/TiddlyWiki5
synced 2024-09-27 14:48:19 +00:00
Refactor filter recursion detection to avoid an unneeded wrapper function
This commit is contained in:
parent
11e0c66a4c
commit
25312b3e32
@ -340,22 +340,17 @@ exports.compileFilter = function(filterString) {
|
|||||||
widget = $tw.rootWidget;
|
widget = $tw.rootWidget;
|
||||||
}
|
}
|
||||||
var results = new $tw.utils.LinkedList();
|
var results = new $tw.utils.LinkedList();
|
||||||
|
self.filterRecursionCount = (self.filterRecursionCount || 0) + 1;
|
||||||
|
if(self.filterRecursionCount < 300) {
|
||||||
$tw.utils.each(operationFunctions,function(operationFunction) {
|
$tw.utils.each(operationFunctions,function(operationFunction) {
|
||||||
operationFunction(results,source,widget);
|
operationFunction(results,source,widget);
|
||||||
});
|
});
|
||||||
return results.toArray();
|
|
||||||
});
|
|
||||||
var fnGuarded = function(source,widget) {
|
|
||||||
var results;
|
|
||||||
self.filterRecursionCount = (self.filterRecursionCount || 0) + 1;
|
|
||||||
if(self.filterRecursionCount < 300) {
|
|
||||||
results = fnMeasured(source,widget);
|
|
||||||
} else {
|
} else {
|
||||||
results = ["/**-- Excessive filter recursion --**/"];
|
results = ["/**-- Excessive filter recursion --**/"];
|
||||||
}
|
}
|
||||||
self.filterRecursionCount = self.filterRecursionCount - 1;
|
self.filterRecursionCount = self.filterRecursionCount - 1;
|
||||||
return results;
|
return results.toArray();
|
||||||
};
|
});
|
||||||
if(this.filterCacheCount >= 2000) {
|
if(this.filterCacheCount >= 2000) {
|
||||||
// To prevent memory leak, we maintain an upper limit for cache size.
|
// To prevent memory leak, we maintain an upper limit for cache size.
|
||||||
// Reset if exceeded. This should give us 95% of the benefit
|
// Reset if exceeded. This should give us 95% of the benefit
|
||||||
@ -363,9 +358,9 @@ exports.compileFilter = function(filterString) {
|
|||||||
this.filterCache = Object.create(null);
|
this.filterCache = Object.create(null);
|
||||||
this.filterCacheCount = 0;
|
this.filterCacheCount = 0;
|
||||||
}
|
}
|
||||||
this.filterCache[filterString] = fnGuarded;
|
this.filterCache[filterString] = fnMeasured;
|
||||||
this.filterCacheCount++;
|
this.filterCacheCount++;
|
||||||
return fnGuarded;
|
return fnMeasured;
|
||||||
};
|
};
|
||||||
|
|
||||||
})();
|
})();
|
||||||
|
Loading…
Reference in New Issue
Block a user