From 9f988f361f6dc876b325d6156aaf152592d0f022 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Allard?= <benoit.allard@greenbone.net>
Date: Tue, 28 Oct 2014 17:34:01 +0100
Subject: [PATCH] Fix lazyloading, and text-wrapping

---
 .../app/builders/log/logviewer/logviewer.directive.coffee    | 2 +-
 www/base/src/app/builders/log/logviewer/logviewer.less       | 4 ++--
 www/base/src/app/builders/log/logviewer/logviewer.tpl.jade   | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/www/base/src/app/builders/log/logviewer/logviewer.directive.coffee b/www/base/src/app/builders/log/logviewer/logviewer.directive.coffee
index 2a4e8f3c73d..5e48eade887 100644
--- a/www/base/src/app/builders/log/logviewer/logviewer.directive.coffee
+++ b/www/base/src/app/builders/log/logviewer/logviewer.directive.coffee
@@ -20,7 +20,7 @@ class Logviewer extends Directive
                 if num_lines > self.num_lines
                     for i in [self.num_lines..num_lines - 1]
                         self.lines.push
-                            content: ".\n"
+                            content: "."
                             class: "log_o"
                     self.num_lines = num_lines
                     if self.auto_scroll
diff --git a/www/base/src/app/builders/log/logviewer/logviewer.less b/www/base/src/app/builders/log/logviewer/logviewer.less
index 08705e8c0fd..ea476a12526 100644
--- a/www/base/src/app/builders/log/logviewer/logviewer.less
+++ b/www/base/src/app/builders/log/logviewer/logviewer.less
@@ -4,8 +4,8 @@
 pre.log {
     // It is much more difficult to do autoscroll if line wrap is enabled.
     // For now we just disable it. There is space for some smarter algorithm
-    samp {
-        white-space: nowrap;
+    .no-wrap {
+        white-space: pre;
     }
   overflow: auto;
 }
diff --git a/www/base/src/app/builders/log/logviewer/logviewer.tpl.jade b/www/base/src/app/builders/log/logviewer/logviewer.tpl.jade
index b79b02c5ddc..da22a2fa969 100644
--- a/www/base/src/app/builders/log/logviewer/logviewer.tpl.jade
+++ b/www/base/src/app/builders/log/logviewer/logviewer.tpl.jade
@@ -6,9 +6,8 @@
         i.fa.fa-search
   pre.row.log(ng-show="log.type!='h'")
     span(ng-if="log.type=='t'", ng-bind="content")
-    span(ng-repeat="line in lines | filter:searchText", class="{{line.class}}",  ng-if="log.type=='s'")
-        | {{line.content}}
-        br
+    span.no-wrap(ng-repeat="line in lines | filter:searchText", class="{{line.class}}",  ng-if="log.type=='s'")
+        | {{line.content + '\n'}}
   div.panel(ng-if="log.type=='h'", ng-class="log.name=='err.html' && 'panel-danger' || 'panel-default'")
     div.panel-heading
         h4.panel-title {{log.name}}