Improved format of contenteditable.

This commit is contained in:
Martin Edenhofer 2014-12-28 19:35:20 +01:00
parent 9f97c3af34
commit 6de7d6dcad
3 changed files with 5 additions and 7 deletions

View file

@ -116,11 +116,6 @@ class CommunicationOverview extends App.ControllerContent
scrollHolder = pageHeader.scrollParent() scrollHolder = pageHeader.scrollParent()
scrollBody = scrollHolder.get(0).scrollHeight - scrollHolder.height() scrollBody = scrollHolder.get(0).scrollHeight - scrollHolder.height()
if scrollBody > pageHeader.height()
skrollr.init
forceHeight: false
holder: scrollHolder.get(0)
render: -> render: ->
@html App.view('layout_ref/communication_overview')() @html App.view('layout_ref/communication_overview')()
@ -156,7 +151,7 @@ class LayoutRefCommunicationReply extends App.ControllerContent
else if @content is 'content' else if @content is 'content'
@content = "some content la la la la" @content = "some content la la la la"
else else
@content = "some\nmultiline content\n1\n2\n3" @content = "<p>some</p><p>multiline content</p>1<p>2</p><p>3</p>"
@render() @render()

View file

@ -11,7 +11,7 @@
<div class="internal-border"> <div class="internal-border">
<div class="text-bubble"> <div class="text-bubble">
<div class="bubble-arrow"></div> <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) --> <!-- .text-bubble grows with textarea (and expanding clone) -->
<div class="attachments"></div> <div class="attachments"></div>
<!-- <!--

View file

@ -150,6 +150,9 @@ small {
[contenteditable] > .placeholder { [contenteditable] > .placeholder {
color: #999; color: #999;
} }
[contenteditable] p {
margin: 0;
}
.close, .close,
.close:hover { .close:hover {