External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-14 06:29:25 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix pattern matching to still apply when unexpected chars do not exist

Browse Source
This commit is contained in:
gconsidine
2017-08-04 16:38:46 -04:00
parent 47f21582b8
commit 3fb6ddd949
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
awx/ui/client/src/job-results/parse-stdout.service.js
View File

@@ -27,20 +27,20 @@ export default ['$log', 'moment', 'i18n', function($log, moment, i18n){
// ansi classes // ansi classes
/* jshint ignore:start */ /* jshint ignore:start */
line = line.replace(/\[1;im/g, '<span class="JobResultsStdOut-cappedLine">'); line = line.replace(/(|)\[1;im/g, '<span class="JobResultsStdOut-cappedLine">');
line = line.replace(/\[0;30m/g, '<span class="ansi30">'); line = line.replace(/(|)\[0;30m/g, '<span class="ansi30">');
line = line.replace(/\[1;30m/g, '<span class="ansi1 ansi30">'); line = line.replace(/(|)\[1;30m/g, '<span class="ansi1 ansi30">');
line = line.replace(/\[[0,1];31m/g, '<span class="ansi1 ansi31">'); line = line.replace(/(|)\[[0,1];31m/g, '<span class="ansi1 ansi31">');
line = line.replace(/\[0;32m(=|)/g, '<span class="ansi32">'); line = line.replace(/(|)\[0;32m(=|)/g, '<span class="ansi32">');
line = line.replace(/\[0;32m1/g, '<span class="ansi36">'); line = line.replace(/(|)\[0;32m1/g, '<span class="ansi36">');
line = line.replace(/\[0;33m/g, '<span class="ansi33">'); line = line.replace(/(|)\[0;33m/g, '<span class="ansi33">');
line = line.replace(/\[0;34m/g, '<span class="ansi34">'); line = line.replace(/(|)\[0;34m/g, '<span class="ansi34">');
line = line.replace(/\[[0,1];35m/g, '<span class="ansi35">'); line = line.replace(/(|)\[[0,1];35m/g, '<span class="ansi35">');
line = line.replace(/\[0;36m/g, '<span class="ansi36">'); line = line.replace(/(|)\[0;36m/g, '<span class="ansi36">');
line = line.replace(/(<host.*?>)\s/g, '$1'); line = line.replace(/(<host.*?>)\s/g, '$1');
//end span //end span
line = line.replace(/\[0m/g, '</span>'); line = line.replace(/(|)\[0m/g, '</span>');
/* jshint ignore:end */ /* jshint ignore:end */
} else { } else {
// For the host event modal in the standard out tab, // For the host event modal in the standard out tab,
@@ -49,11 +49,11 @@ export default ['$log', 'moment', 'i18n', function($log, moment, i18n){
// ansi classes // ansi classes
/* jshint ignore:start */ /* jshint ignore:start */
line = line.replace(/\[[0,1];3[0-9]m(1|=|)/g, ''); line = line.replace(/(|)\[[0,1];3[0-9]m(1|=|)/g, '');
line = line.replace(/(<host.*?>)\s/g, '$1'); line = line.replace(/(<host.*?>)\s/g, '$1');
//end span //end span
line = line.replace(/\[0m/g, ''); line = line.replace(/(|)\[0m/g, '');
/* jshint ignore:end */ /* jshint ignore:end */
} }