|
@@ -117,7 +117,7 @@ var OffendersHelpers = function() {
|
|
|
|
|
|
for (var i=0 ; i<traceArray.length ; i++) {
|
|
|
// Handle the new PhantomJS 2.x syntax
|
|
|
- parts = /^(([\w$]+)@)?([^ ]+):(\d+):(\d+)$/.exec(traceArray[i]);
|
|
|
+ parts = /^\s*at( (\w+))? \(?([^ ]+):(\d+):(\d+)\)?$$/.exec(traceArray[i]);
|
|
|
|
|
|
if (parts) {
|
|
|
obj = {
|
|
@@ -132,25 +132,6 @@ var OffendersHelpers = function() {
|
|
|
|
|
|
results.push(obj);
|
|
|
|
|
|
- } else {
|
|
|
- // Old syntax
|
|
|
- parts = /^(([\w$]+) )?\(?([^ ]+):(\d+)\)?$/.exec(traceArray[i]);
|
|
|
-
|
|
|
- if (parts) {
|
|
|
- obj = {
|
|
|
- file: parts[3],
|
|
|
- line: parseInt(parts[4], 10)
|
|
|
- };
|
|
|
-
|
|
|
- if (parts[2]) {
|
|
|
- obj.functionName = parts[2];
|
|
|
- }
|
|
|
-
|
|
|
- results.push(obj);
|
|
|
-
|
|
|
- } else {
|
|
|
- return null;
|
|
|
- }
|
|
|
}
|
|
|
}
|
|
|
return results;
|