From 6de7d6dcad88159f8880a8d6190e97a2ad8d8215 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Sun, 28 Dec 2014 19:35:20 +0100
Subject: [PATCH] Improved format of contenteditable.

---
 .../javascripts/app/controllers/layout_ref.js.coffee       | 7 +------
 .../app/views/layout_ref/communication_reply.jst.eco       | 2 +-
 app/assets/stylesheets/zammad.css.scss                     | 3 +++
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/app/controllers/layout_ref.js.coffee b/app/assets/javascripts/app/controllers/layout_ref.js.coffee
index e58ee45b5..6d9801083 100644
--- a/app/assets/javascripts/app/controllers/layout_ref.js.coffee
+++ b/app/assets/javascripts/app/controllers/layout_ref.js.coffee
@@ -116,11 +116,6 @@ class CommunicationOverview extends App.ControllerContent
     scrollHolder = pageHeader.scrollParent()
     scrollBody = scrollHolder.get(0).scrollHeight - scrollHolder.height()
 
-    if scrollBody > pageHeader.height()
-      skrollr.init
-        forceHeight: false
-        holder: scrollHolder.get(0)
-
   render: ->
     @html App.view('layout_ref/communication_overview')()
 
@@ -156,7 +151,7 @@ class LayoutRefCommunicationReply extends App.ControllerContent
     else if @content is 'content'
       @content = "some content la la la la"
     else
-      @content = "some\nmultiline content\n1\n2\n3"
+      @content = "<p>some</p><p>multiline content</p>1<p>2</p><p>3</p>"
 
     @render()
 
diff --git a/app/assets/javascripts/app/views/layout_ref/communication_reply.jst.eco b/app/assets/javascripts/app/views/layout_ref/communication_reply.jst.eco
index aa667e3d6..d9d5e6569 100644
--- a/app/assets/javascripts/app/views/layout_ref/communication_reply.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/communication_reply.jst.eco
@@ -11,7 +11,7 @@
       <div class="internal-border">
         <div class="text-bubble">
           <div class="bubble-arrow"></div>
-          <div class="js-textarea ticketEdit-body" contenteditable="true"><%= @content %></div>
+          <div class="js-textarea ticketEdit-body" contenteditable="true"><%- @content %></div>
           <!-- .text-bubble grows with textarea (and expanding clone) -->
           <div class="attachments"></div>
             <!--
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss
index d7109040c..77dd43671 100644
--- a/app/assets/stylesheets/zammad.css.scss
+++ b/app/assets/stylesheets/zammad.css.scss
@@ -150,6 +150,9 @@ small {
 [contenteditable] > .placeholder {
   color: #999;
 }
+[contenteditable] p {
+  margin: 0;
+}
 
 .close,
 .close:hover {