Merge pull request #11 from palourde/bugfix/multi-line-output

Respect line breaks of results output
sensu · Nov 30, 2017 · cd38721 · cd38721
2 parents 14a6e6b + dd70d34
commit cd38721
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 11 deletions.
diff --git a/css/bootstrap-uchiwa/bootstrap-uchiwa.css b/css/bootstrap-uchiwa/bootstrap-uchiwa.css
diff --git a/css/bootstrap-uchiwa/bootstrap-uchiwa.css.map b/css/bootstrap-uchiwa/bootstrap-uchiwa.css.map
diff --git a/css/uchiwa-dark/uchiwa-dark.css b/css/uchiwa-dark/uchiwa-dark.css
diff --git a/css/uchiwa-dark/uchiwa-dark.css.map b/css/uchiwa-dark/uchiwa-dark.css.map
diff --git a/css/uchiwa-default/_element-view.scss b/css/uchiwa-default/_element-view.scss
@@ -14,6 +14,7 @@
 
 .element-view .value {
   overflow-wrap: break-word;
+  white-space: pre-wrap;
 }
 
 .element-view .value img {

diff --git a/css/uchiwa-default/uchiwa-default.css b/css/uchiwa-default/uchiwa-default.css
diff --git a/css/uchiwa-default/uchiwa-default.css.map b/css/uchiwa-default/uchiwa-default.css.map
diff --git a/js/common.js b/js/common.js
@@ -83,7 +83,8 @@ function($filter, $q, $rootScope) {
     return isSelected;
   };
   this.isUrl = function(value) {
-    return /target="_blank"/.test(value);
+    var regexp = /(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/;
+    return regexp.test(value);
   };
   // openLink stops event propagation if an A tag is clicked
   this.openLink = function($event) {

diff --git a/js/filters.js b/js/filters.js
@@ -355,7 +355,7 @@ filterModule.filter('relativeTimestamp', function() {
   };
 });
 
-filterModule.filter('richOutput', ['$filter', '$sce', '$sanitize', '$interpolate', function($filter, $sce, $sanitize, $interpolate) {
+filterModule.filter('richOutput', ['$filter', 'Helpers', '$sce', '$sanitize', '$interpolate', function($filter, Helpers, $sce, $sanitize, $interpolate) {
   return function(text) {
     var output = '';
 
@@ -377,10 +377,11 @@ filterModule.filter('richOutput', ['$filter', '$sce', '$sanitize', '$interpolate
       var iframeSrc = $sanitize(text.replace(/^iframe:/, ''));
       var exp = $interpolate('<span class="iframe"><iframe width="100%" src="{{iframeSrc}}"></iframe></span>')({ 'iframeSrc': iframeSrc });
       output = $sce.trustAsHtml(exp);
-    }
-    else {
-      var linkified = $filter('linky')(text, '_blank');
+    } else if (Helpers.isUrl(text)) {
+      var linkified = $filter('linky')(text);
       output = $filter('imagey')(linkified);
+    } else {
+      return text;
     }
     return output;
   };