Skip to content

Commit

Permalink
Merge pull request #153 from google/120-handle-whitespace
Browse files Browse the repository at this point in the history
Preserve newlines etc in event info and comments
  • Loading branch information
berggren committed Dec 5, 2015
2 parents 776d8fe + ff6c12e commit de0c1bf
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions timesketch/ui/static/components/explore/explore-event.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</span>
<i ng-if="::event._source.tag" ng-repeat="tag in ::event._source.tag" class="label label-primary">{{::tag}}</i>

<span ng-class="{true: 'message-hidden'}[event.hidden]">[{{ event._source.timestamp_desc }}] {{ event._source.message|limitTo:500 }}</span>
<span ng-class="{true: 'message-hidden'}[event.hidden]">[{{ event._source.timestamp_desc }}] <span style=white-space:pre-wrap;">{{ event._source.message|limitTo:500 }}</span></span>

<div style="width:20px;height:20px;cursor: pointer;" class="pull-right tooltips"><span>Details</span><i ng-class="{true: 'fa fa-minus-square-o', false: 'fa fa-plus-square-o'}[showDetails]" style="color:#999;"></i></div>

Expand All @@ -54,15 +54,15 @@
<table class="table table-bordered table-hover">
<tr ng-repeat="(key, value) in eventdetail">
<td width="150px">{{ key }}</td>
<td>{{::value}}</td>
<td><span style=white-space:pre-wrap;">{{::value}}</span></td>
</tr>
</table>
</div>
<div class="col-md-4">
<div ng-repeat="comment in comments">
<div class="comment-bubble">
<div class="comment-name">{{::comment.user.username}}</div>
<div class="comment-body">{{::comment.comment}}</div>
<div class="comment-body"><span style=white-space:pre-wrap;">{{::comment.comment}}</span></div>
<div class="comment-timestamp"><i class="fa fa-clock-o"></i> {{::comment.created_at}}</div>
</div>
</div>
Expand Down

0 comments on commit de0c1bf

Please sign in to comment.