Browse Source

Merge pull request #126 from bloonix/master

Replace newlines with <br/>.
Rashid Khan 12 years ago
parent
commit
ce869dbb09
1 changed files with 2 additions and 1 deletions
  1. 2 1
      panels/table/module.js

+ 2 - 1
panels/table/module.js

@@ -274,9 +274,10 @@ angular.module('kibana.table', [])
         replace(/&/g, '&amp;').
         replace(/&/g, '&amp;').
         replace(/</g, '&lt;').
         replace(/</g, '&lt;').
         replace(/>/g, '&gt;').
         replace(/>/g, '&gt;').
+        replace(/\r?\n/g, '<br/>').
         replace(/@start-highlight@/g, '<code class="highlight">').
         replace(/@start-highlight@/g, '<code class="highlight">').
         replace(/@end-highlight@/g, '</code>')
         replace(/@end-highlight@/g, '</code>')
     }
     }
     return '';
     return '';
   }
   }
-});
+});