jgaunt/CyberChef
2
0
Fork 0
mirror of https://github.com/gchq/CyberChef synced 2025-12-23 03:33:24 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into feature_xpath

Browse Source 
# Conflicts:
#	Gruntfile.js
#	src/js/.jshintrc
This commit is contained in:
Mike Schwörer
2016-12-16 22:15:53 +01:00
parent 5c92e49d5d af4644c9eb
commit 4c36123fd7
52 changed files with 1938 additions and 1692 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/operations/Extract.js
View File

@@ -25,7 +25,7 @@ var Extract = {
total = 0,
match;
while (!!(match = search_regex.exec(input))) {
while ((match = search_regex.exec(input))) {
if (remove_regex && remove_regex.test(match[0]))
continue;
total++;