diff --git a/Makefile b/Makefile index ea3de83..23aff84 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ build/jshint.xml: build test-ci: build/jshint.xml @echo TRAVIS_JOB_ID $(TRAVIS_JOB_ID) @NODE_ENV=test ./node_modules/karma/bin/karma start karma.conf.ci.js --single-run && \ - cat ./coverage/Chrome*/lcov.info | ./node_modules/coveralls/bin/coveralls.js --verbose + cat ./coverage/Firefox*/lcov.info | ./node_modules/coveralls/bin/coveralls.js --verbose clean: rm -fr build coverage dist *.log diff --git a/spec/stack-generator-spec.js b/spec/stack-generator-spec.js index 42063a7..9507b7f 100644 --- a/spec/stack-generator-spec.js +++ b/spec/stack-generator-spec.js @@ -71,7 +71,7 @@ describe('StackGenerator', function () { bar(); }; var bar = function bar() { - stackFrames = StackGenerator.backtrace(); + stackFrames = StackGenerator.backtrace({maxStackSize: 25}); }; foo(); diff --git a/stack-generator.js b/stack-generator.js index a2ee506..bcab1eb 100644 --- a/stack-generator.js +++ b/stack-generator.js @@ -21,7 +21,7 @@ var curr = arguments.callee; while (curr && stack.length < maxStackSize) { var args = [].slice.call(curr['arguments']); - if (/function(?:\s+([\w$]+))?\s*\(/.test(curr.toString())) { + if (/function(?:\s+([\w$]+))+\s*\(/.test(curr.toString())) { stack.push(new StackFrame(RegExp.$1 || undefined, args)); } else { stack.push(new StackFrame(undefined, args));