nicolargo/glances
1
1
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2025-01-02 06:27:55 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1580 from notFloran/webui-amp-nl2br

Browse Source 
[WEBUI] AMP plugins and \n
This commit is contained in:
Nicolas Hennion 2020-01-15 07:36:38 +01:00 committed by GitHub
commit b55d4925b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 47 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glances/outputs/static/js/components/plugin-amps/view.html
View File

@ -3,7 +3,7 @@
<div class="table-row" ng-repeat="process in vm.processes">
<div class="table-cell text-left" ng-class="vm.getDescriptionDecoration(process)">{{ process.name }}</div>
<div class="table-cell text-left">{{ process.count }}</div>
<div class="table-cell text-left process-result">{{ process.result }}</div>
<div class="table-cell text-left process-result" ng-bind-html="process.result|nl2br"></div>
</div>
</div>
</section>

23
glances/outputs/static/js/filters.js
View File

@ -113,6 +113,26 @@ function timedeltaFilter($filter) {
}
}
function nl2brFilter($sce) {
function escapeHTML(html) {
var div = document.createElement('div');
div.innerText = html;
return div.innerHTML;
}
return function (input) {
if (typeof input === 'undefined') {
return input;
}
var sanitizedInput = escapeHTML(input);
var html = sanitizedInput.replace(/\n/g, '<br>');
return $sce.trustAsHtml(html);
};
}
export default angular.module("glancesApp")
.filter("min_size", minSizeFilter)
.filter("exclamation", exclamationFilter)
@ -120,4 +140,5 @@ export default angular.module("glancesApp")
.filter("bits", bitsFilter)
.filter("leftPad", leftPadFilter)
.filter("timemillis", timemillisFilter)
.filter("timedelta", timedeltaFilter);
.filter("timedelta", timedeltaFilter)
.filter("nl2br", nl2brFilter);

25
glances/outputs/static/public/glances.js vendored
View File

@ -57695,7 +57695,7 @@ function GlancesPluginAmpsController($scope, GlancesStats, favicoService) {
/***/ (function(module, exports) {
var path = '/Users/floranbrutel/dev/glances/glances/outputs/static/js/components/plugin-amps/view.html';
var html = "<section id=\"amps\" class=\"plugin\">\n <div class=\"table\">\n <div class=\"table-row\" ng-repeat=\"process in vm.processes\">\n <div class=\"table-cell text-left\" ng-class=\"vm.getDescriptionDecoration(process)\">{{ process.name }}</div>\n <div class=\"table-cell text-left\">{{ process.count }}</div>\n <div class=\"table-cell text-left process-result\">{{ process.result }}</div>\n </div>\n </div>\n</section>\n";
var html = "<section id=\"amps\" class=\"plugin\">\n <div class=\"table\">\n <div class=\"table-row\" ng-repeat=\"process in vm.processes\">\n <div class=\"table-cell text-left\" ng-class=\"vm.getDescriptionDecoration(process)\">{{ process.name }}</div>\n <div class=\"table-cell text-left\">{{ process.count }}</div>\n <div class=\"table-cell text-left process-result\" ng-bind-html=\"process.result|nl2br\"></div>\n </div>\n </div>\n</section>\n";
window.angular.module('ng').run(['$templateCache', function(c) { c.put(path, html) }]);
module.exports = path;
@ -60080,6 +60080,26 @@ function timedeltaFilter($filter) {
}
}
function nl2brFilter($sce) {
function escapeHTML(html) {
var div = document.createElement('div');
div.innerText = html;
return div.innerHTML;
}
return function (input) {
if (typeof input === 'undefined') {
return input;
}
var sanitizedInput = escapeHTML(input);
var html = sanitizedInput.replace(/\n/g, '<br>');
return $sce.trustAsHtml(html);
};
}
/* unused harmony default export */ var _unused_webpack_default_export = (__WEBPACK_IMPORTED_MODULE_0_angular___default.a.module("glancesApp")
.filter("min_size", minSizeFilter)
.filter("exclamation", exclamationFilter)
@ -60087,7 +60107,8 @@ function timedeltaFilter($filter) {
.filter("bits", bitsFilter)
.filter("leftPad", leftPadFilter)
.filter("timemillis", timemillisFilter)
.filter("timedelta", timedeltaFilter));
.filter("timedelta", timedeltaFilter)
.filter("nl2br", nl2brFilter));
/***/ }),

2
glances/outputs/static/public/glances.map.js vendored
View File

File diff suppressed because one or more lines are too long