Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branches 'interface' and 'interface' of github.com:martini/zammad into interface

Browse source 
Conflicts:
	app/assets/javascripts/app/controllers/layout_ref.js.coffee
This commit is contained in:
Martin Edenhofer 2014-09-30 16:20:19 +02:00
commit 83f5b6cabe
2 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/assets/javascripts/app/controllers/layout_ref.js.coffee
View file

@ -19,10 +19,6 @@ class Content extends App.ControllerContent
super super
@render() @render()
@textareaHeight =
open: 148
closed: 20
@dragEventCounter = 0 @dragEventCounter = 0
@attachments = [] @attachments = []
@ -151,6 +147,8 @@ class LayoutRefCommunicationReply extends App.ControllerContent
open: 148 open: 148
closed: 20 closed: 20
@open_textarea(null, true) if @content
@dragEventCounter = 0 @dragEventCounter = 0
@attachments = [] @attachments = []
@ -171,8 +169,13 @@ class LayoutRefCommunicationReply extends App.ControllerContent
else else
@remove_textarea_catcher() @remove_textarea_catcher()
open_textarea: => open_textarea: (event, withoutAnimation) =>
if !@textareaCatcher and !@textarea.text() and !@attachments.length if !@ticketEdit.hasClass('is-open')
duration = 300
if withoutAnimation
duration = 0
@ticketEdit.addClass('is-open') @ticketEdit.addClass('is-open')
@textarea.velocity @textarea.velocity
@ -180,7 +183,7 @@ class LayoutRefCommunicationReply extends App.ControllerContent
minHeight: "#{ @textareaHeight.open - 38 }px" minHeight: "#{ @textareaHeight.open - 38 }px"
marginBottom: 38 marginBottom: 38
options: options:
duration: 300 duration: duration
easing: 'easeOutQuad' easing: 'easeOutQuad'
complete: => @add_textarea_catcher() complete: => @add_textarea_catcher()
@ -203,14 +206,14 @@ class LayoutRefCommunicationReply extends App.ControllerContent
properties: properties:
translateX: -@attachmentInputHolder.position().left + "px" translateX: -@attachmentInputHolder.position().left + "px"
options: options:
duration: 300 duration: duration
easing: 'easeOutQuad' easing: 'easeOutQuad'
@attachmentHint.velocity @attachmentHint.velocity
properties: properties:
opacity: 0 opacity: 0
options: options:
duration: 300 duration: duration
add_textarea_catcher: -> add_textarea_catcher: ->
@textareaCatcher = new App.clickCatcher @textareaCatcher = new App.clickCatcher

8
app/assets/stylesheets/zzz.css.erb
View file

@ -2508,6 +2508,7 @@ footer {
padding: 5px; padding: 5px;
border-radius: 8px; border-radius: 8px;
margin: -5px; margin: -5px;
overflow: hidden;
} }
.is-internal .internal-border { .is-internal .internal-border {
@ -2584,7 +2585,8 @@ footer {
box-shadow: none; box-shadow: none;
} }
.ticket-article-item .attachments:not(:empty) { .ticket-article-item .attachments {
border-top: 1px solid hsl(0,0%,93%);
white-space: normal; white-space: normal;
margin: 0 -20px; margin: 0 -20px;
padding: 26px 20px 7px 72px; padding: 26px 20px 7px 72px;
@ -2871,10 +2873,10 @@ footer {
color: #b3b3b3; color: #b3b3b3;
} }
.attachments:not(:empty) { .ticket-edit .attachments:not(:empty) {
padding: 9px 5px; padding: 9px 5px;
border-top: 1px solid hsl(0,0%,93%); border-top: 1px solid hsl(0,0%,93%);
margin-bottom: 50px; margin: 0 -20px 50px;
} }
.attachment { .attachment {