diff --git a/front/src/css/timeline.css b/front/src/css/timeline.css index 53d22e9..2621d27 100644 --- a/front/src/css/timeline.css +++ b/front/src/css/timeline.css @@ -173,6 +173,7 @@ input.textFilter { } .table > div > .index { color: #bbb; + word-break: normal; } .table > div > .type { white-space: nowrap; diff --git a/front/src/js/controllers/timelineCtrl.js b/front/src/js/controllers/timelineCtrl.js index 6ea6a0c..f1dc3b3 100644 --- a/front/src/js/controllers/timelineCtrl.js +++ b/front/src/js/controllers/timelineCtrl.js @@ -89,19 +89,25 @@ timelineCtrl.controller('TimelineCtrl', ['$scope', '$rootScope', '$routeParams', var out = []; var splited = str.split(' / '); splited.forEach(function(trace) { - var result = /^(\S*)\s?\(?(https?:\/\/\S+):(\d+)\)?$/g.exec(trace); - if (result && result[2].length > 0) { - var filePath = result[2]; - var chunks = filePath.split('/'); - var fileName = chunks[chunks.length - 1]; + var fnName = null, fileAndLine; - out.push({ - fnName: result[1], - fileName: fileName, - filePath: filePath, - line: result[3] - }); + var withFnResult = /^([^\s\(]+) \((.+:\d+)\)$/.exec(trace); + if (withFnResult === null) { + fileAndLine = trace; + } else { + fnName = withFnResult[1]; + fileAndLine = withFnResult[2]; } + + var fileAndLineSplit = /^(.*):(\d+)$/.exec(fileAndLine); + var filePath = fileAndLineSplit[1]; + var line = fileAndLineSplit[2]; + + out.push({ + fnName: fnName, + filePath: filePath, + line: line + }); }); return out; } diff --git a/front/src/less/timeline.less b/front/src/less/timeline.less index 1f189fc..4c4b20d 100644 --- a/front/src/less/timeline.less +++ b/front/src/less/timeline.less @@ -191,6 +191,7 @@ input.textFilter { .table > div > .index { color: #bbb; + word-break: normal; } .table > div > .type { diff --git a/front/src/views/timeline.html b/front/src/views/timeline.html index 33bbedd..9eee05b 100644 --- a/front/src/views/timeline.html +++ b/front/src/views/timeline.html @@ -130,7 +130,7 @@