From f4341f5c4bf9ec91b4001fe33193101de12ac8e6 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Mon, 12 Jan 2015 12:06:07 +0100 Subject: [PATCH 01/75] Added dropped test. --- test/unit/email_process_test.rb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/test/unit/email_process_test.rb b/test/unit/email_process_test.rb index 9bead59fb..4cd6a3072 100644 --- a/test/unit/email_process_test.rb +++ b/test/unit/email_process_test.rb @@ -2050,6 +2050,28 @@ Some Text', }, }, }, + { + :data => 'From: Some Body +To: Bob +Cc: any@example.com +Subject: some subject + +Some Text', + :trusted => false, + :success => true, + :result => { + 0 => { + :group => group2.name, + :priority => '2 normal', + :title => 'some subject', + }, + 1 => { + :sender => 'Customer', + :type => 'email', + :internal => true, + }, + }, + }, ] process(files) PostmasterFilter.destroy_all From b08fe508880005c6a7c66f009df4c07b24a7dde1 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 12 Jan 2015 14:32:24 +0100 Subject: [PATCH 02/75] fix inconsistent colours --- app/assets/stylesheets/zammad.css.scss | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index b4bc6b83e..a049c4fcf 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -18,7 +18,7 @@ p { } .u-highlight { - color: hsl(194,90%,45%); + color: #0F94D6; } a { @@ -752,6 +752,16 @@ textarea, border-color: #ececec; } +.pagination > .active > a, +.pagination > .active > span, +.pagination > .active > a:hover, +.pagination > .active > span:hover, +.pagination > .active > a:focus, +.pagination > .active > span:focus { + background: #0F94D6; + border-color: #0F94D6; +} + .pagination-counter { margin-right: 19px; line-height: 28px; @@ -1826,6 +1836,11 @@ footer { padding: 10px 20px; } +.tableOverview-edit { + @extend .u-clickable; + @extend .u-highlighted; +} + .bulkAction { background: white; z-index: 1; From 7b62f6cce1a25d2297fba0103c2a47f30928cebf Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 12 Jan 2015 15:05:17 +0100 Subject: [PATCH 03/75] fix article actions order order after meta-data (test: click on article) --- .../views/ticket_zoom/article_view.jst.eco | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco index b14ab148a..96fbba45b 100644 --- a/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco +++ b/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco @@ -59,17 +59,6 @@ <% end %> - <% if article.actions: %> -
-
- <% for action in article.actions: %> - - <%- @T( action.name ) %> - - <% end %> -
-
- <% end %> @@ -90,6 +79,18 @@ + <% if article.actions: %> +
+
+ <% for action in article.actions: %> + + <%- @T( action.name ) %> + + <% end %> +
+
+ <% end %> + <% end %> \ No newline at end of file From ee6e89e3e9d71b73e92350b3c33186c61db78642 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 12 Jan 2015 15:34:09 +0100 Subject: [PATCH 04/75] fix light phone cutoff --- public/assets/images/sprite.svg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/assets/images/sprite.svg b/public/assets/images/sprite.svg index 42f527c95..992dec70f 100644 --- a/public/assets/images/sprite.svg +++ b/public/assets/images/sprite.svg @@ -1,6 +1,6 @@ - - + + Slice 2 Created with Sketch. From cb13722b7de40870823575e85607aa7b10d7204a Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 12 Jan 2015 15:34:28 +0100 Subject: [PATCH 05/75] fix deformed avatar bug in FF --- .../layout_ref/communication_overview.jst.eco | 18 +-- .../views/ticket_zoom/article_view.jst.eco | 6 +- .../app/views/ticket_zoom/edit.jst.eco | 127 +++++++++--------- app/assets/stylesheets/zammad.css.scss | 52 +++---- 4 files changed, 103 insertions(+), 100 deletions(-) diff --git a/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco b/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco index 3016ce3c7..dd73a13a9 100644 --- a/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco @@ -44,7 +44,7 @@
-
+
@@ -55,7 +55,7 @@
-
+
NB
Welcome! @@ -98,7 +98,7 @@ The Zammad
-
+
@@ -109,8 +109,8 @@ The Zammad
-
- +
+
Hallp HP, du kannst dich nur einmal einloggen. Was machst du genau?
@@ -136,7 +136,7 @@ The Zammad
-
+
@@ -147,7 +147,7 @@ The Zammad
-
+
NB
Ich wollte mir die Lyrics von Maria herunterladen, aber ich schaff es einfach nicht, da raufzukommen. Schick mir bitte mein Passwort. @@ -182,7 +182,7 @@ Grüße, Peter
-
+
@@ -193,7 +193,7 @@ Grüße, Peter
-
+
Lieber HP,
diff --git a/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco index 96fbba45b..362003e9e 100644 --- a/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco +++ b/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco @@ -1,5 +1,5 @@ <% for article in @articles: %> -
+
@@ -33,14 +33,14 @@
-
+
<% if article.sender.name isnt 'Agent': %> <% position = 'left' %> <% else: %> <% position = 'right' %> <% end %> <%- article.created_by.avatar("40", position) %> -
+
diff --git a/app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco index 5d2f7a260..4eef2a887 100644 --- a/app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco +++ b/app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco @@ -2,87 +2,84 @@ -
-
- <%- App.User.fullLocal( @S('id') ).avatar("40", 'right', 'zIndex-5') %> -
-
-
-
-
-
- <% for atricleType in @articleTypes: %> -
-
-
- <% end %> -
-
+
+ <%- App.User.fullLocal( @S('id') ).avatar("40", 'right', 'zIndex-5') %> +
+
+
-
-
"> -
-
-
"> -
+
+
+ <% for atricleType in @articleTypes: %> +
+
+
+ <% end %>
-
+
+
"> +
+
+
"> +
+
+
+
+
-
+
-
-
- -
-
+
+
+
-
-
- -
-
+
+
+
+
+
+
+
-
-
-
<%- @article.body %>
- -
-
-
- <%- @T('Antwort eingeben oder') %> - - <%- @T('Dateien wählen..') %> - - -
-
-
-
- <%- @T(' Uploading ') %> (0%) ... -
-
-
<%- @T('Cancel Upload') %> -
+
+
+
<%- @article.body %>
+ +
+
+
+ <%- @T('Antwort eingeben oder') %> + + <%- @T('Dateien wählen..') %> + + +
+
+
+
+ <%- @T(' Uploading ') %> (0%) ... +
+
+
<%- @T('Cancel Upload') %>
-
+
-
-
- <%- @T('Drop Files here') %> -
+
+
+
+ <%- @T('Drop Files here') %>
-
\ No newline at end of file diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index a049c4fcf..3abc78dd9 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -2970,6 +2970,13 @@ footer { margin-top: 55px; } +.ticket-article, +.ticket-edit { + max-width: 800px; + margin: 0 auto; + padding: 0 21px; +} + .ticket-title { max-width: 800px; padding: 0 81px; @@ -2990,24 +2997,20 @@ footer { display: block; } -.bubble-grid { - max-width: 800px; - margin: 0 auto; - padding: 0 21px; -} - - .bubble-gap { - margin-left: 15px !important; - } - - .customer.ticket-article-item .bubble-gap { - margin-left: 0 !important; - margin-right: 15px !important; - } - .ticket-article-item { padding-bottom: 33px; position: relative; + + .avatar { + position: absolute; + right: 0; + top: 5px; + } + + &.agent .avatar { + right: auto; + left: 0; + } } /* @@ -3019,20 +3022,16 @@ footer { overflow: hidden; position: relative; height: 100%; + margin: 0 55px; } .article-content { position: relative; - margin-right: 55px; + padding: 0 55px; } - .customer.ticket-article-item .article-content { - margin-right: 0; - margin-left: 55px; - } .article-content-meta { - padding: 0 55px; position: absolute; width: 100%; } @@ -3054,7 +3053,7 @@ footer { } .article-meta-key { - width: 13%; + width: 20%; text-transform: uppercase; } @@ -3094,6 +3093,7 @@ footer { box-shadow: 0 0 1px rgba(0,0,0,.06) inset; position: relative; overflow-wrap: break-word; + word-wrap: break-word; } /* email css reset */ @@ -3211,6 +3211,10 @@ footer { vertical-align: top; } +.article-add { + position: relative; +} + .ticket-edit { margin-top: auto; margin-bottom: 36px; @@ -3230,7 +3234,9 @@ footer { } .editControls { - position: relative; + position: absolute; + left: 0; + top: 5px; } .editControls-item { From 8d3da7c77d7905d29a09aafdb2ef115c0d14da63 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 12 Jan 2015 16:25:39 +0100 Subject: [PATCH 06/75] fix extend typo --- app/assets/stylesheets/zammad.css.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 3abc78dd9..ccb71dbb5 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -1838,7 +1838,7 @@ footer { .tableOverview-edit { @extend .u-clickable; - @extend .u-highlighted; + @extend .u-highlight; } .bulkAction { From c67048131cd3f4391daedbd0cda6be0207af3bad Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 12 Jan 2015 16:38:08 +0100 Subject: [PATCH 07/75] add favicon --- public/favicon.ico | Bin 0 -> 32988 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/public/favicon.ico b/public/favicon.ico index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..cd31b71bfa442980691e9a91c8a1e9b0da6fe6b4 100644 GIT binary patch literal 32988 zcmeHP30PCd7M`foqPA{WTeSj}x1n{V!&JIne1J2Q9Y z%$Y%mg1Vq7QxNzjXgK&Y5JDyw9Ve*4L@Awq}eBh(ARRq?wZbj=Z=;gANR zAqF@SuD|pQ=oxsL0a_}4>*>%}C&Vln_oH(ayXjo~#Q+ZO_Ua(lM2aa;55BYD%8P*u zPxE9vQuFPrat|C#1P;WOsTk9f|`E*Uwc*X6P!ai*oe+mh7%5mBXxq7s@P+} z!9!jh9xw&^gKbo8aj`_fXC7aPOgFpSQr&4NB;GfC5)c`)+| z>q@(jF_C_OH`5~M_6XYX)b35oiz!eSwlviqG`XO2<&UUb#R*b>n$EXv-;NATA4d=6 z9i)ZwONgU}@{(y6GJ~n-v%F~MdCt@ed^=ij#`qCuGv5J82?tu+gC-B;o}R2ogLG@m z67ZXCi?)f9(M1@>N2)PnV|W`2qb17kcAiyOf+kAC z(WHWT2nBR*bHGgqKo8;#rHAreXu*6@J?!fG5t)nWNj1&mAofwU!MuW6G+Bl_&5)FL zvlsiL33&sW5TiZ3qEOHCCR0QC$EYEh_v>*HmW}BN70u#+8uu7?nJrNe4phzt_^^?l zMUxBu17O?rKXgz)oFVj)4z$qBFpJPk`A1iC@!GTs{CSoVkAimISiNs7Y-D^buhUFf zWgQ1#gp6-$(zv-TfvD!HcFt$$9odb(F#qCbhWmQjcK)A4x zK8ElUXktM-`iEi)Q;6rYgmShTb3^|}A;z;Zn&yC(qQt{vYm{cuHHB~aSA|e!6ox^c z7>6c^g@F6fQ+(J+($Hk-YBWB(P5z+_nEwLKrA(nBy&>Mlo>?M{m+|BZi};#q<7>6} zo$wmm=iFo5{q!Sj;8%swZx8D^`kqpJ=X#7HJv{ayCy*_R@=xLi97;>r@0t<0cEg>Z z$xHH18BLX(e2vtH2{I>SDFp5Ri@(-oEJ(&uI)N31jBS@3BPkICqi42in9| zcOm`+>d5ew9Bja1IWKtEqo}+g-iFUs9wqo;USyN5LKKOM(yw8`jqA$P$hgP1!{feu zQ4BCLa1W*kJF^6G3Bl-=BbT#;wRcz|WhmhEfbYA)U4U(v*|=X*G9(;FHi`b|@n)~@ zgnc}VlnrsKpQrs?)Fk$X+(@&p;x%hz*P1H3CGS+BOK%36)!#F@z~(#{d#qua4>JLtXcTiM%=;gyOb&2W*1qu1n0|41NaXR z{Azd3e=weO^h~|F;ILn!Gk$(%G&cCXLdD_I6~#ASCYF|z73YJj)!5bktv`+N;lIAe z?|4a6JbdYuuQUFI=X2}o&)Q`r*mX{!bxY)WiD@XYekfm!o%rmNy>ROJ&oC!sIbLxz zylUsKe4X&$Oo^+*Zg{8?yM0oGUFONIzeFr8Dk{Mb?bpPgc)T;_hAdNYKzPVaI9%4S zk8AANDo|R7-+cFd%mnsi2>%EQ;&%>u{OMa0RMioQziBAZ*nTG!>_6bwuN97 z(SEN)U$j>fe^TJMI{YQ+$At|sYd#-{NvntbO|Odj*#B+=N$nRsLh(Lmye59m>EU(w zi}`;(^ZU#0Tu~VLmDj^>xvTss{I2r~@pM||hwYgI7z>Eh9NhY2Kpp-v{+VaCe_{4D zX1{$E*VSW1;xAhBPuo}bfyB3>X8r~E+pYc}&L4TG@v~3%sKbB%ZeW3CeOKQ<5JlwY z#|41J6GA=rS5ANPKxHApzs0^m+kf&Ou(Qr#_ci9Me%WN~mI-oFchv9z9276=&ZtOZcR5wq8HXu}Uz&*FHh~TdfTrAbZ zP43~_r}j5ZTw!FKblGSSyR4r{5>~su@3J4;SqaX&%quKaV^{m8X2~~=26KXuc}9=c z!l!FK%VwbNfZch+VpO=v5n)ZYele;99?}_KqPvH-BJ9UN_~xl;5`w=n=VE0;{FS*8 zsxeLP0i3~oO_G-PGvW9f8FTX091wq?X^O!4W632ocH+++cjqE`*L@_9*;abhmA0tc zMtk(_1_vb7y>lPzPL+s@F(DorX zEp&OkvHt^MgrZV#ky>B8s4k!r{T$qB(34#R9a#*TEa9R_VgZERLlY&XoyX_p%%37= z@19#!^|op96;cQK3`st#iesJErnW4keKnFw-W6wD zT2+U?LKyL|I4`7C)X-<~f;_he6@8!*O_`M-!_498(&6HpK z#RT7t-V#Uf!?$0hEzgef{-CSF0&nJGi5e^My_t@+;I96<$M%QlW3S89V<6GZT|w}# z=S4*^I=qeD9){i9o^JMM)VMvFjui))j)7h*rzI?wQ|~BW)C1yo6FG$|+^&s!k zCmrS6K1)vcwqJO<+Lx-nJJbFb=;LO2t(#TX-v%(yYp@;=rHP%~i`hR-dsdzuA>7-= z&eW6Tc);7uk$HgWFdk%XZ2n1!_eZB1VvqMjx1SNeBS0rIQoMILX#HQq8j!mt_BdZu z4Rzs%qeqcJM*-SWIbpuHS`&MM4~hf#O4!>&{hpWLi{u19=)fzW4Xk4@P^Xr1*^$x_ zeINAo51)Md@YvsxaYvH>d1Q_I9hpI!FM_qN5~%-6pC_-5mNx1rGJ?9E4Y>b^@%cyZ z)6sCWMBcc4$Pns$V4@$I(~|TZJPifD`;42%(2JSFbZ~O?;_DgEGoWXntr;LnP!n)d zz_sgh0>FL{L~OGQ_VEmb{jtvAo41t^)El@r*>7i=B98_+>`|L=Qnwcl_WsFbun*Fu zE%rfDlkp_je`M0MYRUneRKd6LHBZ4~TT_k!p`30OA^fEv z!xgakSI|N-AJIejS@f%tWZ3)hSW^b|y?Kl>7}lj0BeEvbikEq4#$eic{`VH=_;*x$ zFv10x&aP^7&%yg=D#|;3B(CfIMs1h9IvZ^6ljKU3ZGD0Qn_jQQ z#$nYZ19z0i*?uF49xV_k)P2O?|* z<*abe!IPe4cO77dI>&;Y*}4O)xL*6qKk^0}Px-birnwwwix2bu z--ym5{Md(#g@uYKmysz9=?MLXp_a7U& zEgy@IHYa~=aY4^F3%)}IH+Y$sDAqkoU3R4~;+|_LcVM3b_x~LG-MvD!-NuF)1=4=T zw?=8px3Tvt#~_1^i_v^oSN{=gPyP#bCQ~;pMP^WbSxWH2?fIO28S3)0Z(U{>8Qf% zy4Ll~V5&3T_1d?1WAw7kO~WS$weYmV%%an!Vgp2N})L*G)|M9LcuWDPc&B5A6ttT8H^FErqlUL`x>*0 zI)9jV7+K3&d`6Im^NjAW7UZ>O=S<~}ulv_XxrcZU@*=n(r`CSI=ewLCP!Il#tnyVh zZw;|&d-is5{0P=ub5!e%EXV4T2dt|~vrffV3d3h=OZzdmyj59|DY z9bwuni}5vJlYXcq)7SlZ^46C2pqu?@Zkoilvv z$yy`oBk0Tk(G!q^O~?kTw$u~A9DEo!3!MdTW<>K0+y~}U8^E0!br;WSW^$dQ!`^7e zQJHe_m@Gv)Jsqzd!NKHAiB`D&ng7B$6TL=dDld*LhPgnR;vUQgkHVQGHqTRtNtEz) z%kx=d>7iNnmZ6!mslhxdon7;@B~Ky$K#cLIbmHVOqcZWAgAbSYZb?~VE(?0XyzV1< zShhR31bPTB-}0&iQQ_W6u zy{BFiSIy4Cn3f5A!Jg&uq>LzxUz=M}iKt~E$gE;9=ogy3=h(jlkMk;496wNm@qQV` zOS0q-hQuqX``^IWIJQ>V^YFvssVj4;XMQEbA1=+iG1^JI^3ea-O`ju#F@?;(+=YrC zSVCophg5NR56p-5it$wbLp*?aY~{fT{+BU2g25?q+U;1ZD7;WxmK~`q7sleKYY8G` zi;bT7eIWlmLi{%D;cfIAminUE{L={kaC|j>@30iJlM*p5499XwB*sM%*fydX(^pjN zd}jVyUPK*2J=m~MPIT4~#|3SwE#QaOJ}$U|u`CSxags2_8{=(@ii?AuV{8Wh=3ldd z-@v@^&mM!#bycn83VtBHflV(|;{h&J_{c&zX4*=B)FNuV*NiD}cF(!dh%GGW~ROY(3Z6qam9d zklXrCQO?)4NFMsjEG4et;;Q_}twg>qqjM&r4@5qcF@ivc>C)3yvIZhu-?4oaO%d+17|V;U3$U#5bBBzLIq&o~OWFR~7$Nx$X}!S4%<9OVWmgZez7qL+ zOuCnR!BH+RO?K3pP)meE47(nlEQbYNZi^4@bNgm-#L<4AXP-kjEoe}y%$Z64YWty_ zGl<6h1C^x(qFYu0Oy4;mfshc4ebi54|0p$?IWO&{2L*u%Q7Ry!yivU@5@ zKmcm#-t(vOdJzGnf|8GA0#sz

R~tW8@l90&e4K1bhf}bTWoryB%jKy zRh>6UPpPfyyR|3~O_Sqal~iy;qigf~ES9CbF-?2|=Jqg- zYy4~_&>@a;7vUY?uO(-=Y`c~A-t>Ku8C?!PP;T)R5Iq5$GjUn@iw`ed7fd7$=(;ZX zo!B0DHY8rPk4c(w4V$w{ly0_?(YoXTbEg$aXKap@-U;9kUB#9&cWY*BF2lQL%g!~G zp6sgveTUWlEoj88Ki>B#&pwj^^797H&HB#CP8PwKE2|tfEcK(N@_;=$<6*DPrSCsC ztSQe9;=x{=1!zQ$vB8*}y<;bccA5@NJ&vqI&m3 Date: Mon, 12 Jan 2015 23:13:50 +0100 Subject: [PATCH 08/75] moved mark as seen to ruby function --- .../widget/online_notification.js.coffee | 18 +++++++++++----- .../online_notifications_controller.rb | 8 +++++++ app/models/online_notification.rb | 21 ++++++++----------- config/routes/online_notification.rb | 5 +++-- 4 files changed, 33 insertions(+), 19 deletions(-) diff --git a/app/assets/javascripts/app/controllers/widget/online_notification.js.coffee b/app/assets/javascripts/app/controllers/widget/online_notification.js.coffee index f3a0689eb..a998599f5 100644 --- a/app/assets/javascripts/app/controllers/widget/online_notification.js.coffee +++ b/app/assets/javascripts/app/controllers/widget/online_notification.js.coffee @@ -43,10 +43,18 @@ class App.OnlineNotificationWidget extends App.Controller else @el.find('.logo').append('

' + count.toString() + '
') - markAllAsSeen: (items) => - for item in items - if !item.seen - App.OnlineNotification.seen( 'Ticket', item.id ) + markAllAsSeen: () => + @ajax( + id: 'markAllAsSeen' + type: 'POST' + url: @apiPath + '/online_notifications/markAllAsSeen' + data: JSON.stringify( '' ) + processData: true + success: (data, status, xhr) => + if data.result is 'ok' + else + fail: => + ) stop: => @counterUpdate(0) @@ -81,7 +89,7 @@ class App.OnlineNotificationWidget extends App.Controller # show frontend times $('#markAllAsSeen').bind('click', (e) => e.preventDefault() - @markAllAsSeen(items) + @markAllAsSeen() ); @frontendTimeUpdate() ).on('hide.bs.popover', => diff --git a/app/controllers/online_notifications_controller.rb b/app/controllers/online_notifications_controller.rb index 20a60efb1..4ee59f38c 100644 --- a/app/controllers/online_notifications_controller.rb +++ b/app/controllers/online_notifications_controller.rb @@ -88,4 +88,12 @@ curl http://localhost/api/v1/online_notifications -v -u #{login}:#{password} -H model_update_render(OnlineNotification, params) end + def markAllAsSeen + notifications = OnlineNotification.list(current_user,100) + notifications.each do |notification| + OnlineNotification.seen({:id => notification['id']}) + end + render :json => {data:'all cool'} + end + end diff --git a/app/models/online_notification.rb b/app/models/online_notification.rb index dadbf5588..0b4112d31 100644 --- a/app/models/online_notification.rb +++ b/app/models/online_notification.rb @@ -47,23 +47,20 @@ add a new online notification for this user =begin -add a new online notification for this user +mark online notification as seen - OnlineNotification.add( - :type => 'Assigned to you', - :object => 'Ticket', - :o_id => ticket.id, - :seen => 1, - :created_by_id => 1, - :user_id => 2, + OnlineNotification.seen( + :id => 2, + :user => UserObject, #optional, if passed all + #notfications for the given user are marked as seen ) =end def self.seen(data) - notification = OnlineNotification.find(data[:id]) - notification.seen = true - notification.save + notification = OnlineNotification.find(data[:id]) + notification.seen = true + notification.save end =begin @@ -86,7 +83,7 @@ remove whole online notifications of an object return all online notifications of an user - notifications = OnlineNotification.list( user ) + notifications = OnlineNotification.list( user, limit ) =end diff --git a/config/routes/online_notification.rb b/config/routes/online_notification.rb index 5ecfe3303..66ec56527 100644 --- a/config/routes/online_notification.rb +++ b/config/routes/online_notification.rb @@ -2,7 +2,8 @@ Zammad::Application.routes.draw do api_path = Rails.configuration.api_path # groups - match api_path + '/online_notifications', :to => 'online_notifications#index', :via => :get - match api_path + '/online_notifications/:id', :to => 'online_notifications#update', :via => :put + match api_path + '/online_notifications', :to => 'online_notifications#index', :via => :get + match api_path + '/online_notifications/:id', :to => 'online_notifications#update', :via => :put + match api_path + '/online_notifications/markAllAsSeen', :to => 'online_notifications#markAllAsSeen', :via => :post end \ No newline at end of file From 1fdc9858161cc9c4446afa6175e48eaf3c58a8ec Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Mon, 12 Jan 2015 23:15:39 +0100 Subject: [PATCH 09/75] Added signature support to new and zoom ticket. --- .../controllers/agent_ticket_create.js.coffee | 87 ++++++++++++------ .../app/controllers/ticket_zoom.js.coffee | 44 ++++++---- .../app/lib/app_post/utils.js.coffee | 24 +++++ app/controllers/tickets_controller.rb | 17 ---- public/assets/tests/html-utils.js | 88 +++++++++++++++++++ 5 files changed, 200 insertions(+), 60 deletions(-) diff --git a/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee b/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee index 62262e123..03b5ff425 100644 --- a/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee +++ b/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee @@ -3,10 +3,10 @@ class App.TicketCreate extends App.Controller '.tabsSidebar' : 'sidebar' events: - 'click .type-tabs .tab': 'changeFormType' - 'submit form': 'submit' - 'click .submit': 'submit' - 'click .cancel': 'cancel' + 'click .type-tabs .tab': 'changeFormType' + 'submit form': 'submit' + 'click .submit': 'submit' + 'click .cancel': 'cancel' constructor: (params) -> super @@ -87,6 +87,9 @@ class App.TicketCreate extends App.Controller # update form @el.find('[name="formSenderType"]').val(type) + # force changing signature + @el.find('[name="group_id"]').trigger('change') + meta: => text = '' if @articleAttributes @@ -167,10 +170,10 @@ class App.TicketCreate extends App.Controller a = App.TicketArticle.find( params.article_id ) # reset owner - t.owner_id = 0 - t.customer_id_autocompletion = a.from - t.subject = a.subject || t.title - t.body = a.body + t.owner_id = 0 + t.customer_id_completion = a.from + t.subject = a.subject || t.title + t.body = a.body # render page @render( options: t ) @@ -191,10 +194,10 @@ class App.TicketCreate extends App.Controller @form_id = App.ControllerForm.formId() @html App.view('agent_ticket_create')( - head: 'New Ticket' - agent: @isRole('Agent') - admin: @isRole('Admin') - form_id: @form_id + head: 'New Ticket' + agent: @isRole('Agent') + admin: @isRole('Admin') + form_id: @form_id ) formChanges = (params, attribute, attributes, classname, form, ui) => @@ -220,6 +223,35 @@ class App.TicketCreate extends App.Controller # replace new option list form.find('[name="' + fieldNameToChange + '"]').closest('.form-group').replaceWith( newElement ) + signatureChanges = (params, attribute, attributes, classname, form, ui) => + if attribute && attribute.name is 'group_id' + signature = undefined + if params['group_id'] + group = App.Group.find( params['group_id'] ) + if group && group.signature_id + signature = App.Signature.find( group.signature_id ) + + # check if signature need to be added + type = @$('[name="formSenderType"]').val() + + if signature isnt undefined && signature.body && type is 'email-out' + signatureFinished = App.Utils.text2html( + App.Utils.replaceTags( signature.body, { user: App.Session.get() } ) + ) + + # get current body + body = @$('[data-name="body"]').html() || '' + if App.Utils.signatureCheck( body, signatureFinished ) + if !App.Utils.lastLineEmpty(body) + body = body + '
' + body = body + "
#{signatureFinished}
" + + @$('[data-name="body"]').html(body) + + # remove old signature + else + @$('[data-name="body"]').find("[data-signature=true]").remove() + new App.ControllerForm( el: @el.find('.ticket-form-top') form_id: @form_id @@ -228,7 +260,8 @@ class App.TicketCreate extends App.Controller events: 'change [name=customer_id]': @localUserInfo handlers: [ - formChanges + formChanges, + signatureChanges, ] filter: @form_meta.filter autofocus: true @@ -236,21 +269,22 @@ class App.TicketCreate extends App.Controller ) new App.ControllerForm( - el: @el.find('.article-form-top') - form_id: @form_id - model: App.TicketArticle - screen: 'create_top' - params: params + el: @el.find('.article-form-top') + form_id: @form_id + model: App.TicketArticle + screen: 'create_top' + params: params ) new App.ControllerForm( - el: @el.find('.ticket-form-middle') - form_id: @form_id - model: App.Ticket - screen: 'create_middle' + el: @el.find('.ticket-form-middle') + form_id: @form_id + model: App.Ticket + screen: 'create_middle' events: 'change [name=customer_id]': @localUserInfo handlers: [ - formChanges + formChanges, + signatureChanges, ] filter: @form_meta.filter params: params @@ -264,7 +298,8 @@ class App.TicketCreate extends App.Controller events: 'change [name=customer_id]': @localUserInfo handlers: [ - formChanges + formChanges, + signatureChanges, ] filter: @form_meta.filter params: params @@ -330,7 +365,7 @@ class App.TicketCreate extends App.Controller if sender.name is 'Customer' params['article'] = { to: (group && group.name) || '' - from: params.customer_id_autocompletion + from: params.customer_id_completion cc: params.cc subject: params.subject body: params.body @@ -342,7 +377,7 @@ class App.TicketCreate extends App.Controller else params['article'] = { from: (group && group.name) || '' - to: params.customer_id_autocompletion + to: params.customer_id_completion cc: params.cc subject: params.subject body: params.body diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee index 85f897f11..8fd4bb0f4 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee @@ -18,10 +18,9 @@ class App.TicketZoom extends App.Controller @navupdate '#' - @form_meta = undefined - @ticket_id = params.ticket_id - @article_id = params.article_id - @signature = undefined + @form_meta = undefined + @ticket_id = params.ticket_id + @article_id = params.article_id @key = 'ticket::' + @ticket_id cache = App.Store.get( @key ) @@ -137,9 +136,6 @@ class App.TicketZoom extends App.Controller # get edit form attributes @form_meta = data.form_meta - # get signature - @signature = data.signature - # load assets App.Collection.loadAssets( data.assets ) @@ -860,14 +856,15 @@ class Edit extends App.Controller if data.ticket.id is @ticket.id #@setArticleType(data.type.name) - # preselect article type - @setArticleType( 'email' ) @open_textarea(null, true) for key, value of data.article if key is 'body' @$('[data-name="' + key + '"]').html(value) else @$('[name="' + key + '"]').val(value) + + # preselect article type + @setArticleType( 'email' ) ) isIE10: -> @@ -905,7 +902,7 @@ class Edit extends App.Controller @$('[data-name="body"]').ce({ mode: 'richtext' multiline: true - maxlength: 2500 + maxlength: 5000 }) html5Upload.initialize( @@ -1075,10 +1072,29 @@ class Edit extends App.Controller # show/hide attributes for articleType in @articleTypes if articleType.name is type - @$(".form-group").addClass('hide') + @$('.form-group').addClass('hide') for name in articleType.attributes @$("[name=#{name}]").closest('.form-group').removeClass('hide') + # check if signature need to be added + body = @$('[data-name="body"]').html() || '' + signature = undefined + if @ticket.group.signature_id + signature = App.Signature.find( @ticket.group.signature_id ) + if signature && signature.body && @type is 'email' + signatureFinished = App.Utils.text2html( + App.Utils.replaceTags( signature.body, { user: App.Session.get(), ticket: @ticket } ) + ) + if App.Utils.signatureCheck( body, signatureFinished ) + if !App.Utils.lastLineEmpty(body) + body = body + '
' + body = body + "
#{signatureFinished}
" + @$('[data-name="body"]').html(body) + + # remove old signature + else + @$('[data-name="body"]').find("[data-signature=true]").remove() + detect_empty_textarea: => if !@textarea.text().trim() @add_textarea_catcher() @@ -1488,12 +1504,6 @@ class ArticleView extends App.Controller # get current body body = @ui.el.find('[data-name="body"]').html() || '' - # check if signature need to be added - if @ui.signature && @ui.signature.body && type.name is 'email' - signature = App.Utils.text2html( @ui.signature.body ) - if App.Utils.signatureCheck( body, signature ) - body = body + signature - # check if quote need to be added selectedText = App.ClipBoard.getSelected() if selectedText diff --git a/app/assets/javascripts/app/lib/app_post/utils.js.coffee b/app/assets/javascripts/app/lib/app_post/utils.js.coffee index 5f576a74f..6690bf4e7 100644 --- a/app/assets/javascripts/app/lib/app_post/utils.js.coffee +++ b/app/assets/javascripts/app/lib/app_post/utils.js.coffee @@ -166,3 +166,27 @@ class App.Utils else true + # textReplaced = App.Utils.replaceTags( template, { user: { firstname: 'Bob', lastname: 'Smith' } } ) + @replaceTags: (template, objects) -> + template = template.replace( /#\{\s{0,2}(.+?)\s{0,2}\}/g, ( index, key ) -> + levels = key.split(/\./) + dataRef = objects + for level in levels + if dataRef[level] + dataRef = dataRef[level] + if typeof dataRef is 'function' + value = dataRef() + else if typeof dataRef is 'string' + value = dataRef + else + value = '' + #console.log( "tag replacement #{key}, #{value} env: ", objects) + value + ) + + # true|false = App.Utils.lastLineEmpty( message ) + @lastLineEmpty: (message) -> + messageCleanup = message.replace(/>\s+<').replace(/(\n|\r|\t)/g, '').trim() + return true if messageCleanup.match(/<(br|\s+?|\/)>$/im) + return true if messageCleanup.match(/<\/div>$/im) + false diff --git a/app/controllers/tickets_controller.rb b/app/controllers/tickets_controller.rb index 696181dbd..b8fc5b27b 100644 --- a/app/controllers/tickets_controller.rb +++ b/app/controllers/tickets_controller.rb @@ -228,22 +228,6 @@ class TicketsController < ApplicationController ticket = Ticket.find( params[:id] ) return if !ticket_permission( ticket ) - # get signature - signature = {} - if ticket.group.signature - signature = ticket.group.signature.attributes - - # replace tags - signature['body'] = NotificationFactory.build( - :locale => current_user.preferences[:locale], - :string => signature['body'], - :objects => { - :ticket => ticket, - :user => current_user, - } - ) - end - # get attributes to update attributes_to_change = Ticket::ScreenOptions.attributes_to_change( :user => current_user, :ticket => ticket ) @@ -292,7 +276,6 @@ class TicketsController < ApplicationController render :json => { :ticket_id => ticket.id, :ticket_article_ids => article_ids, - :signature => signature, :assets => assets, :links => link_list, :tags => tags, diff --git a/public/assets/tests/html-utils.js b/public/assets/tests/html-utils.js index 392e7febb..fff291fe2 100644 --- a/public/assets/tests/html-utils.js +++ b/public/assets/tests/html-utils.js @@ -439,4 +439,92 @@ test( "check signature", function() { }); +// replace tags +test( "check replace tags", function() { + + var message = "
#{user.firstname} #{user.lastname}
" + var result = '
Bob Smith
' + var data = { + user: { + firstname: 'Bob', + lastname: 'Smith', + }, + } + var verify = App.Utils.replaceTags( message, data ) + equal( verify, result ) + + message = "
#{user.firstname} #{user.lastname}
" + result = '
Bob Smith
' + data = { + user: { + firstname: function() { return 'Bob' }, + lastname: function() { return 'Smith' }, + }, + } + verify = App.Utils.replaceTags( message, data ) + equal( verify, result ) + + message = "
#{user.firstname} #{user.lastname}
" + result = '
Bob
' + data = { + user: { + firstname: 'Bob', + }, + } + verify = App.Utils.replaceTags( message, data ) + equal( verify, result ) + +}); + +// check if last line is a empty line +test( "check if last line is a empty line", function() { + + var message = "123" + var result = false + var verify = App.Utils.lastLineEmpty( message ) + equal( verify, result, message ) + + message = "
123
" + result = false + verify = App.Utils.lastLineEmpty( message ) + equal( verify, result, message ) + + message = "

123

" + result = false + verify = App.Utils.lastLineEmpty( message ) + equal( verify, result, message ) + + message = "
" + result = true + verify = App.Utils.lastLineEmpty( message ) + equal( verify, result, message ) + + message = "
" + result = true + verify = App.Utils.lastLineEmpty( message ) + equal( verify, result, message ) + + message = "
" + result = true + verify = App.Utils.lastLineEmpty( message ) + equal( verify, result, message ) + + message = "
\n \n\t" + result = true + verify = App.Utils.lastLineEmpty( message ) + equal( verify, result, message ) + + message = "
\n \n\t" + result = true + verify = App.Utils.lastLineEmpty( message ) + equal( verify, result, message ) + + message = "
\n
\n \n\t" + result = true + verify = App.Utils.lastLineEmpty( message ) + equal( verify, result, message ) + + +}); + } \ No newline at end of file From 83b4360c368d71f3ead08fdffe8c8422f34dfc28 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 13 Jan 2015 02:19:45 +0100 Subject: [PATCH 10/75] add a delay to article meta toggle to allow double click select its 150ms - maybe we need more. plz test. but the fewer delay we need the better cause it'll feel snappier. --- .../app/controllers/ticket_zoom.js.coffee | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee index 8fd4bb0f4..c4e523d1c 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee @@ -1262,7 +1262,7 @@ class ArticleView extends App.Controller 'click .show_toogle': 'show_toogle' 'click [data-type=reply]': 'reply' 'click [data-type=replyAll]': 'replyAll' - 'click .text-bubble': 'toggle_meta' + 'click .text-bubble': 'toggle_meta_with_delay' 'click .text-bubble a': 'stopPropagation' constructor: -> @@ -1327,7 +1327,17 @@ class ArticleView extends App.Controller stopPropagation: (e) -> e.stopPropagation() - toggle_meta: (e) -> + toggle_meta_with_delay: (e) => + # allow double click select + # by adding a delay to the toggle + + if @lastClick and +new Date - @lastClick < 150 + clearTimeout(@toggleMetaTimeout) + else + @toggleMetaTimeout = setTimeout(@toggle_meta, 150, e) + @lastClick = +new Date + + toggle_meta: (e) => e.preventDefault() animSpeed = 300 From 8237c57effa1b008970796c0b91c7eb4b8168c2b Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 13 Jan 2015 02:20:46 +0100 Subject: [PATCH 11/75] round big smiley icon edges --- public/assets/images/sprite.svg | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/public/assets/images/sprite.svg b/public/assets/images/sprite.svg index 992dec70f..654d819c3 100644 --- a/public/assets/images/sprite.svg +++ b/public/assets/images/sprite.svg @@ -48,11 +48,11 @@ - - - - - + + + + + From 4a9a2d8d1038addfa6a508df67b63689a1716d38 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Tue, 13 Jan 2015 08:26:45 +0100 Subject: [PATCH 12/75] Improved replacing signature. --- .../app/controllers/agent_ticket_create.js.coffee | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee b/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee index 03b5ff425..5347ddd79 100644 --- a/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee +++ b/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee @@ -242,6 +242,15 @@ class App.TicketCreate extends App.Controller # get current body body = @$('[data-name="body"]').html() || '' if App.Utils.signatureCheck( body, signatureFinished ) + + # if signature has changed, replace it + signature_id = @$('[data-signature=true]').data('signature-id') + if signature_id && signature_id.toString() isnt signature.id.toString() + + # remove old signature + @$('[data-signature="true"]').remove() + body = @$('[data-name="body"]').html() || '' + if !App.Utils.lastLineEmpty(body) body = body + '
' body = body + "
#{signatureFinished}
" @@ -250,7 +259,7 @@ class App.TicketCreate extends App.Controller # remove old signature else - @$('[data-name="body"]').find("[data-signature=true]").remove() + @$('[data-name="body"]').find('[data-signature=true]').remove() new App.ControllerForm( el: @el.find('.ticket-form-top') From 71d8af7a5260c9b062c348a7aed7ebce173502a8 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Tue, 13 Jan 2015 15:53:15 +0100 Subject: [PATCH 13/75] Moved from Marshal to JSON session files. --- app/controllers/long_polling_controller.rb | 2 +- lib/sessions.rb | 27 ++++++++++++++++++---- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/app/controllers/long_polling_controller.rb b/app/controllers/long_polling_controller.rb index 5512175e8..fa5a99b6b 100644 --- a/app/controllers/long_polling_controller.rb +++ b/app/controllers/long_polling_controller.rb @@ -59,7 +59,7 @@ class LongPollingController < ApplicationController user_id = session[:user_id] user = {} if user_id - user = User.find( user_id ) + user = User.find( user_id ).attributes end log 'notice', "send auth login (user_id #{user_id})", client_id Sessions.create( client_id, user, { :type => 'ajax' } ) diff --git a/lib/sessions.rb b/lib/sessions.rb index 7d299ee7e..0962312d9 100644 --- a/lib/sessions.rb +++ b/lib/sessions.rb @@ -37,7 +37,7 @@ returns :user => session, :meta => meta, } - file.write Marshal.dump(data) + file.write data.to_json } # send update to browser @@ -195,7 +195,7 @@ returns path = @path + '/' + client_id.to_s data[:meta][:last_ping] = Time.new.to_i.to_s File.open( path + '/session', 'wb' ) { |file| - file.write Marshal.dump(data) + file.write data.to_json } true end @@ -234,7 +234,11 @@ returns file.flock( File::LOCK_EX ) all = file.read file.flock( File::LOCK_UN ) - data = Marshal.load( all ) + dataJSON = JSON.parse( all ) + if dataJSON + data = self.symbolize_keys(dataJSON) + data[:user] = dataJSON['user'] # for compat. reasons + end } rescue Exception => e puts e.inspect @@ -567,4 +571,19 @@ returns puts "/LOOP #{client_id} - #{try_count}" end -end + def self.symbolize_keys(hash) + hash.inject({}){|result, (key, value)| + new_key = case key + when String then key.to_sym + else key + end + new_value = case value + when Hash then symbolize_keys(value) + else value + end + result[new_key] = new_value + result + } + end + +end \ No newline at end of file From f38149e82338a55a3127556f231d0e40034e7b9d Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Tue, 13 Jan 2015 17:03:58 +0100 Subject: [PATCH 14/75] Improved comments. --- script/websocket-server.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/script/websocket-server.rb b/script/websocket-server.rb index 7d784c31d..749261950 100755 --- a/script/websocket-server.rb +++ b/script/websocket-server.rb @@ -295,7 +295,7 @@ EventMachine.run { idle_time_in_min = 4 - # web sockets + # close unused web socket sessions @clients.each { |client_id, client| if ( client[:last_ping] + ( 60 * idle_time_in_min ) ) < Time.now log 'notice', "closing idle websocket connection", client_id @@ -312,10 +312,10 @@ EventMachine.run { end } - # close unused sessions + # close unused ajax long polling sessions clients = Sessions.destory_idle_sessions(idle_time_in_min) clients.each { |client_id| - log 'notice', "closing idle connection", client_id + log 'notice', "closing idle long polling connection", client_id } end @@ -327,4 +327,4 @@ EventMachine.run { # puts "#{Time.now}:#{ level }:client(#{ client_id }) #{ data }" end -} +} \ No newline at end of file From c5622e54323a2fa89bfe03579c32a335852e41f5 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Tue, 13 Jan 2015 17:04:54 +0100 Subject: [PATCH 15/75] Removed not needed rule. --- app/assets/stylesheets/zammad.css.scss | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index ccb71dbb5..992376e41 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -2041,10 +2041,6 @@ footer { text-decoration: none; } - .task .modified.priority.icon { - margin-right: 8px; - } - .task.active { background: #389ed9; } @@ -2106,7 +2102,7 @@ footer { .level-3 .modified.priority.icon:after { background-color: #faab00; border-color: #faab00; - } + } .task .closeTask { position: absolute; From a06faaebfbb8100c51f64af7ad8e661ac9e927cf Mon Sep 17 00:00:00 2001 From: Johannes Nickel Date: Tue, 13 Jan 2015 22:10:57 +0100 Subject: [PATCH 16/75] updated json response --- app/controllers/online_notifications_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/online_notifications_controller.rb b/app/controllers/online_notifications_controller.rb index 4ee59f38c..bb8ffac35 100644 --- a/app/controllers/online_notifications_controller.rb +++ b/app/controllers/online_notifications_controller.rb @@ -93,7 +93,7 @@ curl http://localhost/api/v1/online_notifications -v -u #{login}:#{password} -H notifications.each do |notification| OnlineNotification.seen({:id => notification['id']}) end - render :json => {data:'all cool'} + render :json => {data:'ok'} end end From 0e299ccf5b348b60a0fd7548ffd9b25ec5450d7c Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Tue, 13 Jan 2015 22:55:20 +0100 Subject: [PATCH 17/75] Improved error handling of 404 or 401 tickets. --- .../app/controllers/ticket_zoom.js.coffee | 34 +++++++++++++------ .../app/lib/app_post/ajax.js.coffee | 15 ++++---- 2 files changed, 31 insertions(+), 18 deletions(-) diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee index c4e523d1c..69b7c70cb 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee @@ -44,14 +44,15 @@ class App.TicketZoom extends App.Controller meta: => meta = - url: @url() - id: @ticket_id - iconClass: "priority" + url: @url() + id: @ticket_id + iconClass: 'priority' + head: @taskTitle if @ticket - @ticket = App.Ticket.fullLocal( @ticket.id ) + @ticket = App.Ticket.fullLocal( @ticket.id ) meta.head = @ticket.title meta.title = '#' + @ticket.number + ' - ' + @ticket.title - meta.class = "level-#{@ticket.level()}" + meta.class = "level-#{@ticket.level()}" meta url: => @@ -66,6 +67,7 @@ class App.TicketZoom extends App.Controller @positionPageHeaderStop() changed: => + return false if !@ticket formCurrent = @formParam( @el.find('.edit') ) ticket = App.Ticket.find(@ticket_id).attributes() modelDiff = @getDiff( ticket, formCurrent ) @@ -114,11 +116,23 @@ class App.TicketZoom extends App.Controller # do not close window if request is aborted return if status is 'abort' - # do not close window on network error but if object is not found - return if status is 'error' && error isnt 'Not Found' - - # remove task - App.TaskManager.remove( @task_key ) + # show error message + if xhr.status is 401 || error is 'Unauthorized' + @taskTitle = '» ' + App.i18n.translateInline('Unauthorized') + ' «' + @html App.view('generic/error/unauthorized')() + else if xhr.status is 404 || error is 'Not Found' + @taskTitle = '» ' + App.i18n.translateInline('Not Found') + ' «' + @html App.view('generic/error/not_found')() + else + @taskTitle = '» ' + App.i18n.translateInline('Error') + ' «' + status = xhr.status + detail = xhr.responseText + if !status && !detail + detail = 'General communication error, maybe internet is not available!' + @html App.view('generic/error/generic')( + status: status + detail: detail + ) ) diff --git a/app/assets/javascripts/app/lib/app_post/ajax.js.coffee b/app/assets/javascripts/app/lib/app_post/ajax.js.coffee index 337139af8..095bda739 100644 --- a/app/assets/javascripts/app/lib/app_post/ajax.js.coffee +++ b/app/assets/javascripts/app/lib/app_post/ajax.js.coffee @@ -62,16 +62,15 @@ class _ajaxSingleton # do not show aborded requests return if status is 0 - # do not show any error message on wrong login - return if status is 401 && !settings.url.match('login') - - # do not show any error message with code 200 + # 200, all is fine return if status is 200 - # show human readable message - if status is 401 - status = 'Access denied.' - detail = '' + # do not show any error message with code 401/404 (handled by controllers) + return if status is 401 + return if status is 404 + + # do not show any error message with code 502 + return if status is 502 # show error message new App.ErrorModal( From 8a885f22abe5f01cdf9431e14a6a344c7e474279 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Tue, 13 Jan 2015 23:06:13 +0100 Subject: [PATCH 18/75] Improved error handling of 404 or 401 tickets. --- .../javascripts/app/views/generic/error/generic.jst.eco | 5 +++++ .../javascripts/app/views/generic/error/not_found.jst.eco | 4 ++++ .../javascripts/app/views/generic/error/unauthorized.jst.eco | 4 ++++ 3 files changed, 13 insertions(+) create mode 100644 app/assets/javascripts/app/views/generic/error/generic.jst.eco create mode 100644 app/assets/javascripts/app/views/generic/error/not_found.jst.eco create mode 100644 app/assets/javascripts/app/views/generic/error/unauthorized.jst.eco diff --git a/app/assets/javascripts/app/views/generic/error/generic.jst.eco b/app/assets/javascripts/app/views/generic/error/generic.jst.eco new file mode 100644 index 000000000..2726085f4 --- /dev/null +++ b/app/assets/javascripts/app/views/generic/error/generic.jst.eco @@ -0,0 +1,5 @@ +
+

<%- @T('Error') %>

+

<%- @T('Status Code') %>: <%= @status %>

+

<%= @detail %>

+
\ No newline at end of file diff --git a/app/assets/javascripts/app/views/generic/error/not_found.jst.eco b/app/assets/javascripts/app/views/generic/error/not_found.jst.eco new file mode 100644 index 000000000..8c2fb0c44 --- /dev/null +++ b/app/assets/javascripts/app/views/generic/error/not_found.jst.eco @@ -0,0 +1,4 @@ +
+

<%- @T('Not Found') %>

+

<%- @T('Sorry, unable to find this ressource.') %>

+
\ No newline at end of file diff --git a/app/assets/javascripts/app/views/generic/error/unauthorized.jst.eco b/app/assets/javascripts/app/views/generic/error/unauthorized.jst.eco new file mode 100644 index 000000000..d24fcb524 --- /dev/null +++ b/app/assets/javascripts/app/views/generic/error/unauthorized.jst.eco @@ -0,0 +1,4 @@ +
+

<%- @T('Unauthorized') %>

+

<%- @T('Sorry, you are not allowed to access this ressource.') %>

+
\ No newline at end of file From 884616088bb8a983eda29d822a9efd2157fdcaac Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Wed, 14 Jan 2015 08:49:47 +0100 Subject: [PATCH 19/75] Update current task title after ticket loading failed. --- app/assets/javascripts/app/controllers/ticket_zoom.js.coffee | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee index 69b7c70cb..e2c3ebe82 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee @@ -133,6 +133,9 @@ class App.TicketZoom extends App.Controller status: status detail: detail ) + + # update current task title + App.Event.trigger 'task:render' ) From dd048bc02efbeb36779e19b7a0530f90c8ed5368 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Wed, 14 Jan 2015 22:00:37 +0100 Subject: [PATCH 20/75] add button type btn--action --- app/assets/stylesheets/zammad.css.scss | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 992376e41..e3df67ffc 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -277,6 +277,11 @@ span[data-tooltip]:hover:before { box-shadow: none; } + &.btn--action { + padding: 7px 11px 5px; + @extend label; + } + &.btn--primary { color: white; background: #419ed7; @@ -781,7 +786,7 @@ textarea, } .page-header-title h1 { - margin-top: 13px; + margin-top: 9px; } .page-header-meta { From 2f58fa9b7f27dddaa81ae0be8c367d8dd9d3de91 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Wed, 14 Jan 2015 22:15:50 +0100 Subject: [PATCH 21/75] make popover titles h3 --- app/assets/javascripts/app/lib/bootstrap/popover.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/app/lib/bootstrap/popover.js b/app/assets/javascripts/app/lib/bootstrap/popover.js index db272bdee..a498e2fee 100644 --- a/app/assets/javascripts/app/lib/bootstrap/popover.js +++ b/app/assets/javascripts/app/lib/bootstrap/popover.js @@ -25,7 +25,7 @@ placement: 'right', trigger: 'click', content: '', - template: '' + template: '' }) From 45d7d582217aa7c2628bc520914829834a5042e1 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Wed, 14 Jan 2015 22:20:40 +0100 Subject: [PATCH 22/75] rename popover company to organisation --- app/assets/stylesheets/zammad.css.scss | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index e3df67ffc..8d00cefc4 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -2614,7 +2614,11 @@ footer { background: white; } - .popover .person .company { + .popover .priority.icon { + margin-right: 8px; + } + + .popover .person .organisation { color: #a1a4a7; } @@ -2622,8 +2626,8 @@ footer { margin: 8px 0; } - .popover .person .company:before { content: '('; } - .popover .person .company:after { content: ')'; } + .popover .person .organisation:before { content: '('; } + .popover .person .organisation:after { content: ')'; } .popover .column h3 { margin: 8px 0 1px; From a3d2f3a7686b6af660b460ddf5f6bfa933187386 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Wed, 14 Jan 2015 22:23:30 +0100 Subject: [PATCH 23/75] remove popover priority spacing --- app/assets/stylesheets/zammad.css.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 8d00cefc4..07261ab13 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -2614,10 +2614,6 @@ footer { background: white; } - .popover .priority.icon { - margin-right: 8px; - } - .popover .person .organisation { color: #a1a4a7; } From 1a67de73cfc7a11eaef9bb5ffabb2fc9cb5cc06f Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Wed, 14 Jan 2015 22:59:56 +0100 Subject: [PATCH 24/75] enhance popover behaviour faster show/hide, no hide when hovering over the popover --- .../_application_controller.js.coffee | 12 ++++++---- .../app/lib/bootstrap/popover-enhance.js | 23 +++++++++++++++++++ app/assets/javascripts/application.js | 1 + 3 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 app/assets/javascripts/app/lib/bootstrap/popover-enhance.js diff --git a/app/assets/javascripts/app/controllers/_application_controller.js.coffee b/app/assets/javascripts/app/controllers/_application_controller.js.coffee index e8599a747..245fb52ed 100644 --- a/app/assets/javascripts/app/controllers/_application_controller.js.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller.js.coffee @@ -233,7 +233,8 @@ class App.Controller extends Spine.Controller trigger: 'hover' container: 'body' html: true - delay: { show: 400, hide: 800 } + animation: false + delay: 100 placement: position title: -> ticket_id = $(@).data('id') @@ -270,7 +271,8 @@ class App.Controller extends Spine.Controller trigger: 'hover' container: 'body' html: true - delay: { show: 400, hide: 800 } + animation: false + delay: 100 placement: "auto #{position}" title: -> user_id = $(@).data('id') @@ -326,7 +328,8 @@ class App.Controller extends Spine.Controller trigger: 'hover' container: 'body' html: true - delay: { show: 400, hide: 800 } + animation: false + delay: 100 placement: "auto #{position}" title: -> organization_id = $(@).data('id') @@ -379,7 +382,8 @@ class App.Controller extends Spine.Controller trigger: 'hover' container: 'body' html: true - delay: { show: 500, hide: 5200 } + animation: false + delay: 100 placement: "auto #{data.position}" title: -> $(@).find('[title="*"]').val() diff --git a/app/assets/javascripts/app/lib/bootstrap/popover-enhance.js b/app/assets/javascripts/app/lib/bootstrap/popover-enhance.js new file mode 100644 index 000000000..aa751027c --- /dev/null +++ b/app/assets/javascripts/app/lib/bootstrap/popover-enhance.js @@ -0,0 +1,23 @@ +/* from here http://jsfiddle.net/WojtekKruszewski/Zf3m7/22/ */ + +var originalLeave = $.fn.popover.Constructor.prototype.leave; +$.fn.popover.Constructor.prototype.leave = function(obj){ + var self = obj instanceof this.constructor ? + obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type) + var container, timeout; + + originalLeave.call(this, obj); + + if(obj.currentTarget) { + container = $('body .popover'); + timeout = self.timeout; + container.one('mouseenter', function(){ + //We entered the actual popover – call off the dogs + clearTimeout(timeout); + //Let's monitor popover content instead + container.one('mouseleave', function(){ + $.fn.popover.Constructor.prototype.leave.call(self, self); + }); + }) + } +}; \ No newline at end of file diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index d2ba680d8..a286bf89f 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -25,6 +25,7 @@ //= require ./app/lib/bootstrap/dropdown.js //= require ./app/lib/bootstrap/tooltip.js //= require ./app/lib/bootstrap/popover.js +//= require ./app/lib/bootstrap/popover-enhance.js //= require ./app/lib/bootstrap/modal.js //= require ./app/lib/bootstrap/tab.js //= require ./app/lib/bootstrap/transition.js From b4ccb3531d93ee23724014d316cdfb9cd13af7f8 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Wed, 14 Jan 2015 23:00:51 +0100 Subject: [PATCH 25/75] rename organisation -> organization because we settled on american english --- .../app/controllers/layout_ref.js.coffee | 32 +++++++-------- .../app/controllers/navigation.js.coffee | 4 +- .../app/controllers/ticket_customer.js.coffee | 2 +- .../app/controllers/ticket_zoom.js.coffee | 2 +- ...user_organization_autocompletion.js.coffee | 40 +++++++++---------- .../app/models/organization.js.coffee | 2 +- .../user_search/item_organization.jst.eco | 4 +- .../item_organization_members.jst.eco | 2 +- .../app/views/layout_ref/content.jst.eco | 26 ++++++------ .../layout_ref/organization_profile.jst.eco | 2 +- .../app/views/layout_ref/user_profile.jst.eco | 6 +-- .../app/views/organization_profile.jst.eco | 2 +- .../app/views/user_profile.jst.eco | 2 +- app/assets/stylesheets/zammad.css.scss | 18 ++++----- .../20140831000001_create_object_manager.rb | 2 +- 15 files changed, 73 insertions(+), 73 deletions(-) diff --git a/app/assets/javascripts/app/controllers/layout_ref.js.coffee b/app/assets/javascripts/app/controllers/layout_ref.js.coffee index acbd2d8f2..61aadbc29 100644 --- a/app/assets/javascripts/app/controllers/layout_ref.js.coffee +++ b/app/assets/javascripts/app/controllers/layout_ref.js.coffee @@ -11,9 +11,9 @@ App.Config.set( 'layout_ref', Index, 'Routes' ) class Content extends App.ControllerContent events: - 'hide.bs.dropdown .js-recipientDropdown': 'hideOrganisationMembers' - 'click .js-organisation': 'showOrganisationMembers' - 'click .js-back': 'hideOrganisationMembers' + 'hide.bs.dropdown .js-recipientDropdown': 'hideOrganizationMembers' + 'click .js-organization': 'showOrganizationMembers' + 'click .js-back': 'hideOrganizationMembers' constructor: -> super @@ -46,21 +46,21 @@ class Content extends App.ControllerContent render: -> @html App.view('layout_ref/content')() - showOrganisationMembers: (e) => + showOrganizationMembers: (e) => e.stopPropagation() listEntry = $(e.currentTarget) - organisationId = listEntry.data('organisation-id') + organizationId = listEntry.data('organization-id') @recipientList = @$('.recipientList') - @organisationList = @$("##{ organisationId }") + @organizationList = @$("##{ organizationId }") - # move organisation-list to the right and slide it in + # move organization-list to the right and slide it in - $.Velocity.hook(@organisationList, 'translateX', '100%') - @organisationList.removeClass('hide') + $.Velocity.hook(@organizationList, 'translateX', '100%') + @organizationList.removeClass('hide') - @organisationList.velocity + @organizationList.velocity properties: translateX: 0 options: @@ -73,12 +73,12 @@ class Content extends App.ControllerContent translateX: '-100%' options: speed: 300 - complete: => @recipientList.height(@organisationList.height()) + complete: => @recipientList.height(@organizationList.height()) - hideOrganisationMembers: (e) => + hideOrganizationMembers: (e) => e && e.stopPropagation() - return if !@organisationList + return if !@organizationList # fade list back in @@ -92,13 +92,13 @@ class Content extends App.ControllerContent @recipientList.height('') - # slide out organisation-list and hide it - @organisationList.velocity + # slide out organization-list and hide it + @organizationList.velocity properties: translateX: '100%' options: speed: 300 - complete: => @organisationList.addClass('hide') + complete: => @organizationList.addClass('hide') App.Config.set( 'layout_ref/content', Content, 'Routes' ) diff --git a/app/assets/javascripts/app/controllers/navigation.js.coffee b/app/assets/javascripts/app/controllers/navigation.js.coffee index f0af2b19c..0d888dce8 100644 --- a/app/assets/javascripts/app/controllers/navigation.js.coffee +++ b/app/assets/javascripts/app/controllers/navigation.js.coffee @@ -173,9 +173,9 @@ class App.Navigation extends App.Controller data = display: "#{organization.displayName()}" id: organization.id - class: "organisation organization-popover" + class: "organization organization-popover" url: organization.uiUrl() - iconClass: "organisation" + iconClass: "organization" area.result.push data @renderResult(result) diff --git a/app/assets/javascripts/app/controllers/ticket_customer.js.coffee b/app/assets/javascripts/app/controllers/ticket_customer.js.coffee index 45ae81ecb..1856adb2b 100644 --- a/app/assets/javascripts/app/controllers/ticket_customer.js.coffee +++ b/app/assets/javascripts/app/controllers/ticket_customer.js.coffee @@ -8,7 +8,7 @@ class App.TicketCustomer extends App.ControllerModal @button = true configure_attributes = [ - { name: 'customer_id', display: 'Customer', tag: 'user_autocompletion', null: false, placeholder: 'Enter Person or Organisation/Company', minLengt: 2, disableCreateUser: true }, + { name: 'customer_id', display: 'Customer', tag: 'user_autocompletion', null: false, placeholder: 'Enter Person or Organization/Company', minLengt: 2, disableCreateUser: true }, ] controller = new App.ControllerForm( diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee index e2c3ebe82..cf9d64a5b 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee @@ -907,7 +907,7 @@ class Edit extends App.Controller @setArticleType(@type) configure_attributes = [ - { name: 'customer_id', display: 'Recipients', tag: 'user_autocompletion', null: false, placeholder: 'Enter Person or Organisation/Company', minLengt: 2, disableCreateUser: false }, + { name: 'customer_id', display: 'Recipients', tag: 'user_autocompletion', null: false, placeholder: 'Enter Person or Organization/Company', minLengt: 2, disableCreateUser: false }, ] controller = new App.ControllerForm( diff --git a/app/assets/javascripts/app/lib/app_post/user_organization_autocompletion.js.coffee b/app/assets/javascripts/app/lib/app_post/user_organization_autocompletion.js.coffee index 2a2f0fcc5..a5c9a98b7 100644 --- a/app/assets/javascripts/app/lib/app_post/user_organization_autocompletion.js.coffee +++ b/app/assets/javascripts/app/lib/app_post/user_organization_autocompletion.js.coffee @@ -1,9 +1,9 @@ class App.UserOrganizationAutocompletion extends App.Controller className: 'dropdown js-recipientDropdown zIndex-2' events: - 'hide.bs.dropdown .js-recipientDropdown': 'hideOrganisationMembers' - 'click .js-organisation': 'showOrganisationMembers' - 'click .js-back': 'hideOrganisationMembers' + 'hide.bs.dropdown .js-recipientDropdown': 'hideOrganizationMembers' + 'click .js-organization': 'showOrganizationMembers' + 'click .js-back': 'hideOrganizationMembers' 'click .js-user': 'selectUser' 'click .js-user-new': 'newUser' 'focus input': 'open' @@ -148,9 +148,9 @@ class App.UserOrganizationAutocompletion extends App.Controller e.preventDefault() userId = @$('.recipientList').find('li.is-active').data('user-id') if !userId - organisationId = @$('.recipientList').find('li.is-active').data('organisation-id') - if organisationId - @showOrganisationMembers(undefined, @$('.recipientList').find('li.is-active')) + organizationId = @$('.recipientList').find('li.is-active').data('organization-id') + if organizationId + @showOrganizationMembers(undefined, @$('.recipientList').find('li.is-active')) return if userId is 'new' @newUser() @@ -217,24 +217,24 @@ class App.UserOrganizationAutocompletion extends App.Controller emptyResultList: => @$('.recipientList').empty() - @$('.recipientList-organisationMembers').remove() + @$('.recipientList-organizationMembers').remove() - showOrganisationMembers: (e,listEntry) => + showOrganizationMembers: (e,listEntry) => if e e.stopPropagation() listEntry = $(e.currentTarget) - organisationId = listEntry.data('organisation-id') + organizationId = listEntry.data('organization-id') @recipientList = @$('.recipientList') - @organisationList = @$("##{ organisationId }") + @organizationList = @$("##{ organizationId }") - # move organisation-list to the right and slide it in + # move organization-list to the right and slide it in - $.Velocity.hook(@organisationList, 'translateX', '100%') - @organisationList.removeClass('hide') + $.Velocity.hook(@organizationList, 'translateX', '100%') + @organizationList.removeClass('hide') - @organisationList.velocity + @organizationList.velocity properties: translateX: 0 options: @@ -246,12 +246,12 @@ class App.UserOrganizationAutocompletion extends App.Controller translateX: '-100%' options: speed: 300 - complete: => @recipientList.height(@organisationList.height()) + complete: => @recipientList.height(@organizationList.height()) - hideOrganisationMembers: (e) => + hideOrganizationMembers: (e) => e && e.stopPropagation() - return if !@organisationList + return if !@organizationList # fade list back in @recipientList.velocity @@ -264,13 +264,13 @@ class App.UserOrganizationAutocompletion extends App.Controller @recipientList.height('') - # slide out organisation-list and hide it - @organisationList.velocity + # slide out organization-list and hide it + @organizationList.velocity properties: translateX: '100%' options: speed: 300 - complete: => @organisationList.addClass('hide') + complete: => @organizationList.addClass('hide') newUser: (e) => if e diff --git a/app/assets/javascripts/app/models/organization.js.coffee b/app/assets/javascripts/app/models/organization.js.coffee index 64316e141..9b6761673 100644 --- a/app/assets/javascripts/app/models/organization.js.coffee +++ b/app/assets/javascripts/app/models/organization.js.coffee @@ -18,7 +18,7 @@ class App.Organization extends App.Model '#organization/profile/' + @id icon: (user) -> - "organisation icon" + "organization icon" @_fillUp: (data) -> diff --git a/app/assets/javascripts/app/views/generic/user_search/item_organization.jst.eco b/app/assets/javascripts/app/views/generic/user_search/item_organization.jst.eco index be1c06804..ff30cedfd 100644 --- a/app/assets/javascripts/app/views/generic/user_search/item_organization.jst.eco +++ b/app/assets/javascripts/app/views/generic/user_search/item_organization.jst.eco @@ -1,6 +1,6 @@ -
  • +
  • -
    +
    <%= @organization.displayName() %> diff --git a/app/assets/javascripts/app/views/generic/user_search/item_organization_members.jst.eco b/app/assets/javascripts/app/views/generic/user_search/item_organization_members.jst.eco index c3bf75a00..baa55e3a7 100644 --- a/app/assets/javascripts/app/views/generic/user_search/item_organization_members.jst.eco +++ b/app/assets/javascripts/app/views/generic/user_search/item_organization_members.jst.eco @@ -1,4 +1,4 @@ -
      +
      • diff --git a/app/assets/javascripts/app/views/layout_ref/content.jst.eco b/app/assets/javascripts/app/views/layout_ref/content.jst.eco index b534259fd..321da5435 100644 --- a/app/assets/javascripts/app/views/layout_ref/content.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/content.jst.eco @@ -80,24 +80,24 @@
        - +
        -
      • +
      • -
        +
        Bernecker + Rainer Industrie-Elektronik Ges.m.b.H. @@ -161,9 +161,9 @@
        -
      • +
      • -
        +
        Bertsch Ecopower GmbH @@ -178,7 +178,7 @@
        <%- @T('Create new Customer') %>
        -
        +
      • @@ -222,7 +222,7 @@ Katharina Nussman - Albrecht & Bertschler GmbG
        -
        +
      • diff --git a/app/assets/javascripts/app/views/layout_ref/organization_profile.jst.eco b/app/assets/javascripts/app/views/layout_ref/organization_profile.jst.eco index 8b0a8d1da..a621ad4f5 100644 --- a/app/assets/javascripts/app/views/layout_ref/organization_profile.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/organization_profile.jst.eco @@ -16,7 +16,7 @@
    -
    +

    Steuerbüro C. Kaik

    • diff --git a/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco b/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco index ac595cdc2..62d3f770d 100644 --- a/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco @@ -26,7 +26,7 @@ doreen.kubiak@gmail.com
    - + Steuerbüro C. Kaik
    @@ -56,10 +56,10 @@
    - +
    Tickets von Doreen Kubiak
    -
    Tickets von Steuerbüro C. Kaik
    +
    Tickets von Steuerbüro C. Kaik
    diff --git a/app/assets/javascripts/app/views/organization_profile.jst.eco b/app/assets/javascripts/app/views/organization_profile.jst.eco index df887d366..730a6f911 100644 --- a/app/assets/javascripts/app/views/organization_profile.jst.eco +++ b/app/assets/javascripts/app/views/organization_profile.jst.eco @@ -4,7 +4,7 @@
    -
    +

    <%= @organization.displayName() %>

    diff --git a/app/assets/javascripts/app/views/user_profile.jst.eco b/app/assets/javascripts/app/views/user_profile.jst.eco index f2098d183..c4d2e08b3 100644 --- a/app/assets/javascripts/app/views/user_profile.jst.eco +++ b/app/assets/javascripts/app/views/user_profile.jst.eco @@ -6,7 +6,7 @@ <%- @user.avatar("80") %>

    <%= @user.displayName() %>

    <% if @user.organization: %> -
    <%= @user.organization.displayName() %>
    +
    <%= @user.organization.displayName() %>
    <% end %>
    diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 07261ab13..0155d6c3d 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -1294,15 +1294,15 @@ ol.tabs li { @-moz-keyframes fade { from { opacity: 0 } to { opacity: 1 } } @keyframes fade { from { opacity: 0 } to { opacity: 1 } } - .organisation.icon { + .organization.icon { height: 13px; width: 14px; background-position: 0 -118px; } - .icon-switch:hover .organisation.icon, - .task.active .organisation.icon, - .white.organisation.icon { + .icon-switch:hover .organization.icon, + .task.active .organization.icon, + .white.organization.icon { background-position: 0 -132px; } @@ -2614,7 +2614,7 @@ footer { background: white; } - .popover .person .organisation { + .popover .person .organization { color: #a1a4a7; } @@ -2622,8 +2622,8 @@ footer { margin: 8px 0; } - .popover .person .organisation:before { content: '('; } - .popover .person .organisation:after { content: ')'; } + .popover .person .organization:before { content: '('; } + .popover .person .organization:after { content: ')'; } .popover .column h3 { margin: 8px 0 1px; @@ -4073,7 +4073,7 @@ footer { } .recipientList, -.recipientList-organisationMembers { +.recipientList-organizationMembers { list-style: none; padding: 0; } @@ -4143,7 +4143,7 @@ footer { margin-bottom: -2px; } - .recipientList-organisationMembers { + .recipientList-organizationMembers { position: absolute; top: 0; left: 0; diff --git a/db/migrate/20140831000001_create_object_manager.rb b/db/migrate/20140831000001_create_object_manager.rb index 33b26d5b5..fe911334a 100644 --- a/db/migrate/20140831000001_create_object_manager.rb +++ b/db/migrate/20140831000001_create_object_manager.rb @@ -34,7 +34,7 @@ class CreateObjectManager < ActiveRecord::Migration :multiple => false, :null => false, :limit => 200, - :placeholder => 'Enter Person or Organisation/Company', + :placeholder => 'Enter Person or Organization/Company', :minLengt => 2, :translate => false, }, From 4f31a9a120bac8766c2c3d4738098db2bd3a88c3 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Wed, 14 Jan 2015 23:07:29 +0100 Subject: [PATCH 26/75] Added new ticket state where pending time need to be shown. --- db/migrate/20140831000001_create_object_manager.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/db/migrate/20140831000001_create_object_manager.rb b/db/migrate/20140831000001_create_object_manager.rb index 33b26d5b5..818924872 100644 --- a/db/migrate/20140831000001_create_object_manager.rb +++ b/db/migrate/20140831000001_create_object_manager.rb @@ -168,7 +168,7 @@ class CreateObjectManager < ActiveRecord::Migration :null => false, :default => 2, :translate => true, - :filter => [1,2,3,4], + :filter => [1,2,3,4,7], }, :editable => false, :active => true, @@ -190,7 +190,7 @@ class CreateObjectManager < ActiveRecord::Migration :Agent => { :nulloption => false, :null => false, - :filter => [2,3,4], + :filter => [2,3,4,7], }, :Customer => { :nulloption => false, @@ -217,10 +217,10 @@ class CreateObjectManager < ActiveRecord::Migration :null => true, :translate => true, :required_if => { - :state_id => [3] + :state_id => [3,7] }, :shown_if => { - :state_id => [3] + :state_id => [3,7] }, }, :editable => false, From 3247fc32c5536edfe2de2b40b2fb8292a2d0d2fb Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Wed, 14 Jan 2015 23:12:05 +0100 Subject: [PATCH 27/75] Small visibility improvements. --- .../app/views/popover/ticket.jst.eco | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/app/views/popover/ticket.jst.eco b/app/assets/javascripts/app/views/popover/ticket.jst.eco index b743b0f10..e7a5808b3 100644 --- a/app/assets/javascripts/app/views/popover/ticket.jst.eco +++ b/app/assets/javascripts/app/views/popover/ticket.jst.eco @@ -1,13 +1,20 @@
    -
    + <%- @ticket.iconTitle() %>
    -

    Personen

    +

    <%- @P('Agent') %>

    - <%- @P( @ticket.owner ) %> + <%= @ticket.owner.displayName() %> + <% if @ticket.owner.organization_id: %> + <%= @ticket.owner.organization.displayName() %> + <% end %>
    +

    <%- @P('Customer') %>

    - <%- @P( @ticket.customer ) %> + <%= @ticket.customer.displayName() %> + <% if @ticket.customer.organization_id: %> + <%= @ticket.customer.organization.displayName() %> + <% end %>
    @@ -15,10 +22,6 @@

    #

    <%- @P( @ticket.number ) %>
    -
    -

    <%- @T( 'State' ) %>

    -
    <%- @P( @ticket.state.name ) %>
    -

    <%- @T( 'Priority' ) %>

    <%- @T( @ticket.priority.name ) %>
    From f9f0da8c2789a4336abc759e4161a8e384e5e983 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Wed, 14 Jan 2015 23:39:56 +0100 Subject: [PATCH 28/75] fix helper-message height --- app/assets/stylesheets/zammad.css.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 0155d6c3d..4f4e66b7d 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -615,6 +615,12 @@ fieldset > *:not(.form-group) .form-control { .form-group .help-message { cursor: help; opacity: 0.2; + top: -2px; + position: relative; + + .icon { + display: block; + } } .form-group:not(.formGroup--halfSize) { From 62de61f508ae9ab77466a89e6db29b2bbfe77660 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Wed, 14 Jan 2015 23:45:08 +0100 Subject: [PATCH 29/75] add button active states --- app/assets/stylesheets/zammad.css.scss | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 4f4e66b7d..0548f498c 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -265,7 +265,7 @@ span[data-tooltip]:hover:before { color: hsl(202,68%,54%); background: white; border-color: rgba(0,0,0,.1); - outline: none; + outline: none !important; &.is-disabled { pointer-events: none; @@ -275,6 +275,7 @@ span[data-tooltip]:hover:before { &:active { box-shadow: none; + background: hsl(0,0%,98%); } &.btn--action { @@ -284,18 +285,26 @@ span[data-tooltip]:hover:before { &.btn--primary { color: white; - background: #419ed7; - border-color: #419ed7; + background: hsl(203,65%,55%); + &:active { + background: hsl(203,65%,45%); + } } &.btn--success { color: white; background: hsl(145,51%,45%); + &:active { + background: hsl(145,51%,35%); + } } &.btn--danger { color: white; background: hsl(0,65%,55%); + &:active { + background: hsl(0,65%,45%); + } } &.btn--subtle { @@ -307,6 +316,10 @@ span[data-tooltip]:hover:before { background: none; @extend .u-clickable; + &:active { + color: rgba(0,0,0,.42); + } + &:hover { color: rgba(0,0,0,.5); } From 1b1771afd5dce5373b95a230b020810b371fd035 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Wed, 14 Jan 2015 23:45:18 +0100 Subject: [PATCH 30/75] format popovers --- .../app/views/popover/organization.jst.eco | 24 ++++++++++--------- .../app/views/popover/user.jst.eco | 15 ++++++------ app/assets/stylesheets/zammad.css.scss | 5 ++++ 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/app/assets/javascripts/app/views/popover/organization.jst.eco b/app/assets/javascripts/app/views/popover/organization.jst.eco index 98fc357ed..fcf74c795 100644 --- a/app/assets/javascripts/app/views/popover/organization.jst.eco +++ b/app/assets/javascripts/app/views/popover/organization.jst.eco @@ -1,18 +1,20 @@ +
    +
    <% for row in @organizationData: %> <% if @organization[row.name]: %> - <% if row.tag is 'richtext': %> -
    <%- @organization[row.name] %>
    - <% else: %> -
    <%- @L( @P( @organization[row.name] ) ) %>
    - <% end %> +
    +

    <%- @T( row.display ) %>

    +
    <%- @L( @P( @organization[row.name] ) ) %>
    +
    <% end %> <% end %> +
    <% if @organization.members: %>
    - <%- @T('Members') %> -
      - <% for user in @organization.members: %> -
    • <%= user.displayName() %>
      • - <% end %> -
    +

    <%- @T('Members') %>

    + <% for user in @organization.members: %> +
    + <%= user.displayName() %> +
    + <% end %> <% end %> \ No newline at end of file diff --git a/app/assets/javascripts/app/views/popover/user.jst.eco b/app/assets/javascripts/app/views/popover/user.jst.eco index 99e8336dd..8fc3f9294 100644 --- a/app/assets/javascripts/app/views/popover/user.jst.eco +++ b/app/assets/javascripts/app/views/popover/user.jst.eco @@ -1,15 +1,14 @@ <% if @user['organization']: %> -
    - <%- @P( @user['organization'] ) %> -
    +
    <%= @user.organization.displayName() %>
    <% end %> +
    +
    <% for row in @userData: %> <% if @user[row.name]: %> - <% if row.tag is 'richtext': %> -
    <%- @user[row.name] %>
    - <% else: %> -
    <%- @L( @P( @user[row.name] ) ) %>
    - <% end %> +
    +

    <%- @T( row.display ) %>

    +
    <%- @L( @P( @user[row.name] ) ) %>
    +
    <% end %> <% end %> <% if !_.isEmpty(@user['accounts']): %> diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 0548f498c..001a19583 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -2637,6 +2637,11 @@ footer { color: #a1a4a7; } + .popover .user-organization { + margin-bottom: 8px; + margin-top: -4px; + } + .popover hr { margin: 8px 0; } From 14a57f7a124274e03a54a3eb4f35e8a272f9894f Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Wed, 14 Jan 2015 23:52:23 +0100 Subject: [PATCH 31/75] Added iconTextClass to improve ticket popover. --- app/assets/javascripts/app/models/ticket.js.coffee | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/assets/javascripts/app/models/ticket.js.coffee b/app/assets/javascripts/app/models/ticket.js.coffee index 9ed81ad64..25fcc3f81 100644 --- a/app/assets/javascripts/app/models/ticket.js.coffee +++ b/app/assets/javascripts/app/models/ticket.js.coffee @@ -44,6 +44,9 @@ class App.Ticket extends App.Model iconTitle: (user) -> App.TicketState.find( @state_id ).displayName() + iconTextClass: (user) -> + "level-#{ @level() }" + iconActivity: (user) -> if @owner_id == user.id return 'important' From 7580bc98c2835c335298dc355080dc7f4d210126 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Thu, 15 Jan 2015 01:04:07 +0100 Subject: [PATCH 32/75] camelCased textBubble --- .../app/controllers/ticket_zoom.js.coffee | 6 +++--- .../views/layout_ref/communication_overview.jst.eco | 6 +++--- .../app/views/layout_ref/communication_reply.jst.eco | 4 ++-- .../app/views/layout_ref/richtext.jst.eco | 12 ++++++------ .../app/views/ticket_zoom/article_view.jst.eco | 2 +- .../javascripts/app/views/ticket_zoom/edit.jst.eco | 4 ++-- app/assets/stylesheets/zammad.css.scss | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee index cf9d64a5b..01bb6618b 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee @@ -788,7 +788,7 @@ class Edit extends App.Controller '.attachmentUpload-progressBar': 'progressBar' '.js-percentage': 'progressText' '.js-cancel': 'cancelContainer' - '.text-bubble': 'textBubble' + '.textBubble': 'textBubble' '.editControls-item': 'editControlItem' #'.editControls': 'editControls' #'.recipient-picker': 'recipientPicker' @@ -1279,8 +1279,8 @@ class ArticleView extends App.Controller 'click .show_toogle': 'show_toogle' 'click [data-type=reply]': 'reply' 'click [data-type=replyAll]': 'replyAll' - 'click .text-bubble': 'toggle_meta_with_delay' - 'click .text-bubble a': 'stopPropagation' + 'click .textBubble': 'toggle_meta_with_delay' + 'click .textBubble a': 'stopPropagation' constructor: -> super diff --git a/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco b/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco index dd73a13a9..b9a593f07 100644 --- a/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco @@ -58,7 +58,7 @@
    NB
    -
    Welcome! +
    Welcome! Thank you for installing Zammad. @@ -112,7 +112,7 @@ The Zammad
    -
    Hallp HP, du kannst dich nur einmal einloggen. Was machst du genau?
    +
    Hallp HP, du kannst dich nur einmal einloggen. Was machst du genau?
    @@ -150,7 +150,7 @@ The Zammad
    NB
    -
    Ich wollte mir die Lyrics von Maria herunterladen, aber ich schaff es einfach nicht, da raufzukommen. Schick mir bitte mein Passwort. +
    Ich wollte mir die Lyrics von Maria herunterladen, aber ich schaff es einfach nicht, da raufzukommen. Schick mir bitte mein Passwort. Grüße, Peter
    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 d9d5e6569..96cce4e7a 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 @@ -9,10 +9,10 @@
    -
    +
    <%- @content %>
    - +
    +
    diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 001a19583..790f1e939 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -3040,7 +3040,7 @@ footer { /* clip the article-meta to not stand out on the other side - of the text-bubble if the text bubble is small + of the textBubble if the text bubble is small */ .article-meta-clip { From a60e8975a052426d6d053b136a796f63fede7b17 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Thu, 15 Jan 2015 01:11:47 +0100 Subject: [PATCH 33/75] fix attachment style on blue customer background - make attachment icon translucend - make top border translucend --- app/assets/stylesheets/zammad.css.scss | 6 +++--- public/assets/images/sprite.svg | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 790f1e939..154a99855 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -3190,7 +3190,7 @@ footer { } .ticket-article-item .attachments:not(:empty) { - border-top: 1px solid hsl(0,0%,93%); + border-top: 1px solid rgba(0,0,0,.04); white-space: normal; margin: 0 -20px; padding: 26px 20px 7px 72px; @@ -3438,14 +3438,14 @@ footer { .recipient-list input::-moz-placeholder { opacity: 1; color: #666; } .recipient-list input:-ms-input-placeholder { color: #666; } - .ticket-edit .text-bubble { + .ticket-edit .textBubble { border-color: #b3b3b3; border-radius: 5px; padding-left: 12px; padding-right: 12px; } - .ticket-edit .text-bubble [contenteditable], + .ticket-edit .textBubble [contenteditable], .ticket-edit textarea, .ticketEdit-body { width: 100%; diff --git a/public/assets/images/sprite.svg b/public/assets/images/sprite.svg index 654d819c3..13361b646 100644 --- a/public/assets/images/sprite.svg +++ b/public/assets/images/sprite.svg @@ -70,7 +70,7 @@ - + From d5419fcf22396ca0d20586fa763d41583414e1fc Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Thu, 15 Jan 2015 01:12:26 +0100 Subject: [PATCH 34/75] add .btn-text style for pure text buttons (example: "Read More" on articles) --- app/assets/stylesheets/zammad.css.scss | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 154a99855..3d842fae7 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -307,6 +307,17 @@ span[data-tooltip]:hover:before { } } + &.btn--text { + padding-left: 0; + padding-right: 0; + color: hsl(203,65%,55%); + border: none; + background: none; + &:active { + color: hsl(203,65%,45%); + } + } + &.btn--subtle { padding-left: 0; padding-right: 0; From 5c144244377785d67f577240124ea2a80a3fd750 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Thu, 15 Jan 2015 01:12:52 +0100 Subject: [PATCH 35/75] update animation library "velocity" --- .../app/lib/animations/velocity.min.js | 8 +- .../app/lib/animations/velocity.ui.js | 316 +++++++++++------- 2 files changed, 203 insertions(+), 121 deletions(-) diff --git a/app/assets/javascripts/app/lib/animations/velocity.min.js b/app/assets/javascripts/app/lib/animations/velocity.min.js index 8454789cb..33676b351 100644 --- a/app/assets/javascripts/app/lib/animations/velocity.min.js +++ b/app/assets/javascripts/app/lib/animations/velocity.min.js @@ -1,4 +1,4 @@ -/*! VelocityJS.org (1.0.0). (C) 2014 Julian Shapiro. MIT @license: en.wikipedia.org/wiki/MIT_License */ -/*! VelocityJS.org jQuery Shim (1.0.0-rc1). (C) 2014 The jQuery Foundation. MIT @license: en.wikipedia.org/wiki/MIT_License. */ -!function(e){function t(e){var t=e.length,r=$.type(e);return"function"===r||$.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===r||0===t||"number"==typeof t&&t>0&&t-1 in e}if(!e.jQuery){var $=function(e,t){return new $.fn.init(e,t)};$.isWindow=function(e){return null!=e&&e==e.window},$.type=function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?a[o.call(e)]||"object":typeof e},$.isArray=Array.isArray||function(e){return"array"===$.type(e)},$.isPlainObject=function(e){var t;if(!e||"object"!==$.type(e)||e.nodeType||$.isWindow(e))return!1;try{if(e.constructor&&!n.call(e,"constructor")&&!n.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(r){return!1}for(t in e);return void 0===t||n.call(e,t)},$.each=function(e,r,a){var n,o=0,i=e.length,s=t(e);if(a){if(s)for(;i>o&&(n=r.apply(e[o],a),n!==!1);o++);else for(o in e)if(n=r.apply(e[o],a),n===!1)break}else if(s)for(;i>o&&(n=r.call(e[o],o,e[o]),n!==!1);o++);else for(o in e)if(n=r.call(e[o],o,e[o]),n===!1)break;return e},$.data=function(e,t,a){if(void 0===a){var n=e[$.expando],o=n&&r[n];if(void 0===t)return o;if(o&&t in o)return o[t]}else if(void 0!==t){var n=e[$.expando]||(e[$.expando]=++$.uuid);return r[n]=r[n]||{},r[n][t]=a,a}},$.removeData=function(e,t){var a=e[$.expando],n=a&&r[a];n&&$.each(t,function(e,t){delete n[t]})},$.extend=function(){var e,t,r,a,n,o,i=arguments[0]||{},s=1,l=arguments.length,u=!1;for("boolean"==typeof i&&(u=i,i=arguments[s]||{},s++),"object"!=typeof i&&"function"!==$.type(i)&&(i={}),s===l&&(i=this,s--);l>s;s++)if(null!=(n=arguments[s]))for(a in n)e=i[a],r=n[a],i!==r&&(u&&r&&($.isPlainObject(r)||(t=$.isArray(r)))?(t?(t=!1,o=e&&$.isArray(e)?e:[]):o=e&&$.isPlainObject(e)?e:{},i[a]=$.extend(u,o,r)):void 0!==r&&(i[a]=r));return i},$.queue=function(e,r,a){function n(e,r){var a=r||[];return null!=e&&(t(Object(e))?!function(e,t){for(var r=+t.length,a=0,n=e.length;r>a;)e[n++]=t[a++];if(r!==r)for(;void 0!==t[a];)e[n++]=t[a++];return e.length=n,e}(a,"string"==typeof e?[e]:e):[].push.call(a,e)),a}if(e){r=(r||"fx")+"queue";var o=$.data(e,r);return a?(!o||$.isArray(a)?o=$.data(e,r,n(a)):o.push(a),o):o||[]}},$.dequeue=function(e,t){$.each(e.nodeType?[e]:e,function(e,r){t=t||"fx";var a=$.queue(r,t),n=a.shift();"inprogress"===n&&(n=a.shift()),n&&("fx"===t&&a.unshift("inprogress"),n.call(r,function(){$.dequeue(r,t)}))})},$.fn=$.prototype={init:function(e){if(e.nodeType)return this[0]=e,this;throw new Error("Not a DOM node.")},offset:function(){var t=this[0].getBoundingClientRect();return{top:t.top+(e.pageYOffset||document.scrollTop||0)-(document.clientTop||0),left:t.left+(e.pageXOffset||document.scrollLeft||0)-(document.clientLeft||0)}},position:function(){function e(){for(var e=this.offsetParent||document;e&&"html"===!e.nodeType.toLowerCase&&"static"===e.style.position;)e=e.offsetParent;return e||document}var t=this[0],e=e.apply(t),r=this.offset(),a=/^(?:body|html)$/i.test(e.nodeName)?{top:0,left:0}:$(e).offset();return r.top-=parseFloat(t.style.marginTop)||0,r.left-=parseFloat(t.style.marginLeft)||0,e.style&&(a.top+=parseFloat(e.style.borderTopWidth)||0,a.left+=parseFloat(e.style.borderLeftWidth)||0),{top:r.top-a.top,left:r.left-a.left}}};var r={};$.expando="velocity"+(new Date).getTime(),$.uuid=0;for(var a={},n=a.hasOwnProperty,o=a.toString,i="Boolean Number String Function Array Date RegExp Object Error".split(" "),s=0;sn;++n){var o=u(r,e,a);if(0===o)return r;var i=l(r,e,a)-t;r-=i/o}return r}function p(){for(var t=0;b>t;++t)w[t]=l(t*x,e,a)}function f(t,r,n){var o,i,s=0;do i=r+(n-r)/2,o=l(i,e,a)-t,o>0?n=i:r=i;while(Math.abs(o)>h&&++s=y?c(t,s):0==l?s:f(t,r,r+x)}function g(){V=!0,(e!=r||a!=n)&&p()}var m=4,y=.001,h=1e-7,v=10,b=11,x=1/(b-1),S="Float32Array"in t;if(4!==arguments.length)return!1;for(var P=0;4>P;++P)if("number"!=typeof arguments[P]||isNaN(arguments[P])||!isFinite(arguments[P]))return!1;e=Math.min(e,1),a=Math.min(a,1),e=Math.max(e,0),a=Math.max(a,0);var w=S?new Float32Array(b):new Array(b),V=!1,C=function(t){return V||g(),e===r&&a===n?t:0===t?0:1===t?1:l(d(t),r,n)};C.getControlPoints=function(){return[{x:e,y:r},{x:a,y:n}]};var T="generateBezier("+[e,r,a,n]+")";return C.toString=function(){return T},C}function u(e,t){var r=e;return g.isString(e)?v.Easings[e]||(r=!1):r=g.isArray(e)&&1===e.length?s.apply(null,e):g.isArray(e)&&2===e.length?b.apply(null,e.concat([t])):g.isArray(e)&&4===e.length?l.apply(null,e):!1,r===!1&&(r=v.Easings[v.defaults.easing]?v.defaults.easing:h),r}function c(e){if(e)for(var t=(new Date).getTime(),r=0,n=v.State.calls.length;n>r;r++)if(v.State.calls[r]){var o=v.State.calls[r],s=o[0],l=o[2],u=o[3];u||(u=v.State.calls[r][3]=t-16);for(var f=Math.min((t-u)/l.duration,1),d=0,m=s.length;m>d;d++){var y=s[d],h=y.element;if(i(h)){var b=!1;if(l.display!==a&&null!==l.display&&"none"!==l.display){if("flex"===l.display){var S=["-webkit-box","-moz-box","-ms-flexbox","-webkit-flex"];$.each(S,function(e,t){x.setPropertyValue(h,"display",t)})}x.setPropertyValue(h,"display",l.display)}l.visibility&&"hidden"!==l.visibility&&x.setPropertyValue(h,"visibility",l.visibility);for(var w in y)if("element"!==w){var V=y[w],C,T=g.isString(V.easing)?v.Easings[V.easing]:V.easing;if(C=1===f?V.endValue:V.startValue+(V.endValue-V.startValue)*T(f),V.currentValue=C,x.Hooks.registered[w]){var k=x.Hooks.getRoot(w),A=i(h).rootPropertyValueCache[k];A&&(V.rootPropertyValue=A)}var F=x.setPropertyValue(h,w,V.currentValue+(0===parseFloat(C)?"":V.unitType),V.rootPropertyValue,V.scrollData);x.Hooks.registered[w]&&(i(h).rootPropertyValueCache[k]=x.Normalizations.registered[k]?x.Normalizations.registered[k]("extract",null,F[1]):F[1]),"transform"===F[0]&&(b=!0)}l.mobileHA&&i(h).transformCache.translate3d===a&&(i(h).transformCache.translate3d="(0px, 0px, 0px)",b=!0),b&&x.flushTransformCache(h)}}l.display!==a&&"none"!==l.display&&(v.State.calls[r][2].display=!1),l.visibility&&"hidden"!==l.visibility&&(v.State.calls[r][2].visibility=!1),l.progress&&l.progress.call(o[1],o[1],f,Math.max(0,u+l.duration-t),u),1===f&&p(r)}v.State.isTicking&&P(c)}function p(e,t){if(!v.State.calls[e])return!1;for(var r=v.State.calls[e][0],n=v.State.calls[e][1],o=v.State.calls[e][2],s=v.State.calls[e][4],l=!1,u=0,c=r.length;c>u;u++){var p=r[u].element;if(t||o.loop||("none"===o.display&&x.setPropertyValue(p,"display",o.display),"hidden"===o.visibility&&x.setPropertyValue(p,"visibility",o.visibility)),($.queue(p)[1]===a||!/\.velocityQueueEntryFlag/i.test($.queue(p)[1]))&&i(p)){i(p).isAnimating=!1,i(p).rootPropertyValueCache={};var f=!1;$.each(x.Lists.transforms3D,function(e,t){var r=/^scale/.test(t)?1:0,n=i(p).transformCache[t];i(p).transformCache[t]!==a&&new RegExp("^\\("+r+"[^.]").test(n)&&(f=!0,delete i(p).transformCache[t])}),o.mobileHA&&(f=!0,delete i(p).transformCache.translate3d),f&&x.flushTransformCache(p),x.Values.removeClass(p,"velocity-animating")}if(!t&&o.complete&&!o.loop&&u===c-1)try{o.complete.call(n,n)}catch(d){setTimeout(function(){throw d},1)}s&&o.loop!==!0&&s(n),o.loop!==!0||t||($.each(i(p).tweensContainer,function(e,t){/^rotate/.test(e)&&360===parseFloat(t.endValue)&&(t.endValue=0,t.startValue=360)}),v(p,"reverse",{loop:!0,delay:o.delay})),o.queue!==!1&&$.dequeue(p,o.queue)}v.State.calls[e]=!1;for(var g=0,m=v.State.calls.length;m>g;g++)if(v.State.calls[g]!==!1){l=!0;break}l===!1&&(v.State.isTicking=!1,delete v.State.calls,v.State.calls=[])}var f=function(){if(r.documentMode)return r.documentMode;for(var e=7;e>4;e--){var t=r.createElement("div");if(t.innerHTML="",t.getElementsByTagName("span").length)return t=null,e}return a}(),d=function(){var e=0;return t.webkitRequestAnimationFrame||t.mozRequestAnimationFrame||function(t){var r=(new Date).getTime(),a;return a=Math.max(0,16-(r-e)),e=r+a,setTimeout(function(){t(r+a)},a)}}(),g={isString:function(e){return"string"==typeof e},isArray:Array.isArray||function(e){return"[object Array]"===Object.prototype.toString.call(e)},isFunction:function(e){return"[object Function]"===Object.prototype.toString.call(e)},isNode:function(e){return e&&e.nodeType},isNodeList:function(e){return"object"==typeof e&&/^\[object (HTMLCollection|NodeList|Object)\]$/.test(Object.prototype.toString.call(e))&&e.length!==a&&(0===e.length||"object"==typeof e[0]&&e[0].nodeType>0)},isWrapped:function(e){return e&&(e.jquery||t.Zepto&&t.Zepto.zepto.isZ(e))},isSVG:function(e){return t.SVGElement&&e instanceof SVGElement},isEmptyObject:function(e){var t;for(t in e)return!1;return!0}},$,m=!1;if(e.fn&&e.fn.jquery?($=e,m=!0):$=t.Velocity.Utilities,8>=f&&!m)throw new Error("Velocity: IE8 and below require jQuery to be loaded before Velocity.");if(7>=f)return void(jQuery.fn.velocity=jQuery.fn.animate);var y=400,h="swing",v={State:{isMobile:/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent),isAndroid:/Android/i.test(navigator.userAgent),isGingerbread:/Android 2\.3\.[3-7]/i.test(navigator.userAgent),isChrome:t.chrome,isFirefox:/Firefox/i.test(navigator.userAgent),prefixElement:r.createElement("div"),prefixMatches:{},scrollAnchor:null,scrollPropertyLeft:null,scrollPropertyTop:null,isTicking:!1,calls:[]},CSS:{},Utilities:$,Sequences:{},Easings:{},Promise:t.Promise,defaults:{queue:"",duration:y,easing:h,begin:null,complete:null,progress:null,display:a,loop:!1,delay:!1,mobileHA:!0,_cacheValues:!0},init:function(e){$.data(e,"velocity",{isSVG:g.isSVG(e),isAnimating:!1,computedStyle:null,tweensContainer:null,rootPropertyValueCache:{},transformCache:{}})},animate:null,hook:null,mock:!1,version:{major:1,minor:0,patch:0},debug:!1};t.pageYOffset!==a?(v.State.scrollAnchor=t,v.State.scrollPropertyLeft="pageXOffset",v.State.scrollPropertyTop="pageYOffset"):(v.State.scrollAnchor=r.documentElement||r.body.parentNode||r.body,v.State.scrollPropertyLeft="scrollLeft",v.State.scrollPropertyTop="scrollTop");var b=function(){function e(e){return-e.tension*e.x-e.friction*e.v}function t(t,r,a){var n={x:t.x+a.dx*r,v:t.v+a.dv*r,tension:t.tension,friction:t.friction};return{dx:n.v,dv:e(n)}}function r(r,a){var n={dx:r.v,dv:e(r)},o=t(r,.5*a,n),i=t(r,.5*a,o),s=t(r,a,i),l=1/6*(n.dx+2*(o.dx+i.dx)+s.dx),u=1/6*(n.dv+2*(o.dv+i.dv)+s.dv);return r.x=r.x+l*a,r.v=r.v+u*a,r}return function a(e,t,n){var o={x:-1,v:0,tension:null,friction:null},i=[0],s=0,l=1e-4,u=.016,c,p,f;for(e=parseFloat(e)||500,t=parseFloat(t)||20,n=n||null,o.tension=e,o.friction=t,c=null!==n,c?(s=a(e,t),p=s/n*u):p=u;;)if(f=r(f||o,p),i.push(1+f.x),s+=16,!(Math.abs(f.x)>l&&Math.abs(f.v)>l))break;return c?function(e){return i[e*(i.length-1)|0]}:s}}();v.Easings={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},spring:function(e){return 1-Math.cos(4.5*e*Math.PI)*Math.exp(6*-e)}},$.each([["ease",[.25,.1,.25,1]],["ease-in",[.42,0,1,1]],["ease-out",[0,0,.58,1]],["ease-in-out",[.42,0,.58,1]],["easeInSine",[.47,0,.745,.715]],["easeOutSine",[.39,.575,.565,1]],["easeInOutSine",[.445,.05,.55,.95]],["easeInQuad",[.55,.085,.68,.53]],["easeOutQuad",[.25,.46,.45,.94]],["easeInOutQuad",[.455,.03,.515,.955]],["easeInCubic",[.55,.055,.675,.19]],["easeOutCubic",[.215,.61,.355,1]],["easeInOutCubic",[.645,.045,.355,1]],["easeInQuart",[.895,.03,.685,.22]],["easeOutQuart",[.165,.84,.44,1]],["easeInOutQuart",[.77,0,.175,1]],["easeInQuint",[.755,.05,.855,.06]],["easeOutQuint",[.23,1,.32,1]],["easeInOutQuint",[.86,0,.07,1]],["easeInExpo",[.95,.05,.795,.035]],["easeOutExpo",[.19,1,.22,1]],["easeInOutExpo",[1,0,0,1]],["easeInCirc",[.6,.04,.98,.335]],["easeOutCirc",[.075,.82,.165,1]],["easeInOutCirc",[.785,.135,.15,.86]]],function(e,t){v.Easings[t[0]]=l.apply(null,t[1])});var x=v.CSS={RegEx:{isHex:/^#([A-f\d]{3}){1,2}$/i,valueUnwrap:/^[A-z]+\((.*)\)$/i,wrappedValueAlreadyExtracted:/[0-9.]+ [0-9.]+ [0-9.]+( [0-9.]+)?/,valueSplit:/([A-z]+\(.+\))|(([A-z0-9#-.]+?)(?=\s|$))/gi},Lists:{colors:["fill","stroke","stopColor","color","backgroundColor","borderColor","borderTopColor","borderRightColor","borderBottomColor","borderLeftColor","outlineColor"],transformsBase:["translateX","translateY","scale","scaleX","scaleY","skewX","skewY","rotateZ"],transforms3D:["transformPerspective","translateZ","scaleZ","rotateX","rotateY"]},Hooks:{templates:{textShadow:["Color X Y Blur","black 0px 0px 0px"],boxShadow:["Color X Y Blur Spread","black 0px 0px 0px 0px"],clip:["Top Right Bottom Left","0px 0px 0px 0px"],backgroundPosition:["X Y","0% 0%"],transformOrigin:["X Y Z","50% 50% 0px"],perspectiveOrigin:["X Y","50% 50%"]},registered:{},register:function(){for(var e=0;e=f)switch(e){case"name":return"filter";case"extract":var a=r.toString().match(/alpha\(opacity=(.*)\)/i);return r=a?a[1]/100:1;case"inject":return t.style.zoom=1,parseFloat(r)>=1?"":"alpha(opacity="+parseInt(100*parseFloat(r),10)+")"}else switch(e){case"name":return"opacity";case"extract":return r;case"inject":return r}}},register:function(){9>=f||v.State.isGingerbread||(x.Lists.transformsBase=x.Lists.transformsBase.concat(x.Lists.transforms3D));for(var e=0;en&&(n=1),o=!/(\d)$/i.test(n);break;case"skew":o=!/(deg|\d)$/i.test(n);break;case"rotate":o=!/(deg|\d)$/i.test(n)}return o||(i(r).transformCache[t]="("+n+")"),i(r).transformCache[t]}}}();for(var e=0;e=f||3!==o.split(" ").length||(o+=" 1"),o;case"inject":return 8>=f?4===n.split(" ").length&&(n=n.split(/\s+/).slice(0,3).join(" ")):3===n.split(" ").length&&(n+=" 1"),(8>=f?"rgb":"rgba")+"("+n.replace(/\s+/g,",").replace(/\.(\d)+(?=,)/g,"")+")"}}}()}},Names:{camelCase:function(e){return e.replace(/-(\w)/g,function(e,t){return t.toUpperCase()})},SVGAttribute:function(e){var t="width|height|x|y|cx|cy|r|rx|ry|x1|x2|y1|y2";return(f||v.State.isAndroid&&!v.State.isChrome)&&(t+="|transform"),new RegExp("^("+t+")$","i").test(e)},prefixCheck:function(e){if(v.State.prefixMatches[e])return[v.State.prefixMatches[e],!0];for(var t=["","Webkit","Moz","ms","O"],r=0,a=t.length;a>r;r++){var n;if(n=0===r?e:t[r]+e.replace(/^\w/,function(e){return e.toUpperCase()}),g.isString(v.State.prefixElement.style[n]))return v.State.prefixMatches[e]=n,[n,!0]}return[e,!1]}},Values:{hexToRgb:function(e){var t=/^#?([a-f\d])([a-f\d])([a-f\d])$/i,r=/^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i,a;return e=e.replace(t,function(e,t,r,a){return t+t+r+r+a+a}),a=r.exec(e),a?[parseInt(a[1],16),parseInt(a[2],16),parseInt(a[3],16)]:[0,0,0]},isCSSNullValue:function(e){return 0==e||/^(none|auto|transparent|(rgba\(0, ?0, ?0, ?0\)))$/i.test(e)},getUnitType:function(e){return/^(rotate|skew)/i.test(e)?"deg":/(^(scale|scaleX|scaleY|scaleZ|alpha|flexGrow|flexHeight|zIndex|fontWeight)$)|((opacity|red|green|blue|alpha)$)/i.test(e)?"":"px"},getDisplayType:function(e){var t=e.tagName.toString().toLowerCase();return/^(b|big|i|small|tt|abbr|acronym|cite|code|dfn|em|kbd|strong|samp|var|a|bdo|br|img|map|object|q|script|span|sub|sup|button|input|label|select|textarea)$/i.test(t)?"inline":/^(li)$/i.test(t)?"list-item":/^(tr)$/i.test(t)?"table-row":"block"},addClass:function(e,t){e.classList?e.classList.add(t):e.className+=(e.className.length?" ":"")+t},removeClass:function(e,t){e.classList?e.classList.remove(t):e.className=e.className.toString().replace(new RegExp("(^|\\s)"+t.split(" ").join("|")+"(\\s|$)","gi")," ")}},getPropertyValue:function(e,r,n,o){function s(e,r){function n(){u&&x.setPropertyValue(e,"display","none")}var l=0;if(8>=f)l=$.css(e,r);else{var u=!1;if(/^(width|height)$/.test(r)&&0===x.getPropertyValue(e,"display")&&(u=!0,x.setPropertyValue(e,"display",x.Values.getDisplayType(e))),!o){if("height"===r&&"border-box"!==x.getPropertyValue(e,"boxSizing").toString().toLowerCase()){var c=e.offsetHeight-(parseFloat(x.getPropertyValue(e,"borderTopWidth"))||0)-(parseFloat(x.getPropertyValue(e,"borderBottomWidth"))||0)-(parseFloat(x.getPropertyValue(e,"paddingTop"))||0)-(parseFloat(x.getPropertyValue(e,"paddingBottom"))||0);return n(),c}if("width"===r&&"border-box"!==x.getPropertyValue(e,"boxSizing").toString().toLowerCase()){var p=e.offsetWidth-(parseFloat(x.getPropertyValue(e,"borderLeftWidth"))||0)-(parseFloat(x.getPropertyValue(e,"borderRightWidth"))||0)-(parseFloat(x.getPropertyValue(e,"paddingLeft"))||0)-(parseFloat(x.getPropertyValue(e,"paddingRight"))||0);return n(),p}}var d;d=i(e)===a?t.getComputedStyle(e,null):i(e).computedStyle?i(e).computedStyle:i(e).computedStyle=t.getComputedStyle(e,null),(f||v.State.isFirefox)&&"borderColor"===r&&(r="borderTopColor"),l=9===f&&"filter"===r?d.getPropertyValue(r):d[r],(""===l||null===l)&&(l=e.style[r]),n()}if("auto"===l&&/^(top|right|bottom|left)$/i.test(r)){var g=s(e,"position");("fixed"===g||"absolute"===g&&/top|left/i.test(r))&&(l=$(e).position()[r]+"px")}return l}var l;if(x.Hooks.registered[r]){var u=r,c=x.Hooks.getRoot(u);n===a&&(n=x.getPropertyValue(e,x.Names.prefixCheck(c)[0])),x.Normalizations.registered[c]&&(n=x.Normalizations.registered[c]("extract",e,n)),l=x.Hooks.extractValue(u,n)}else if(x.Normalizations.registered[r]){var p,d;p=x.Normalizations.registered[r]("name",e),"transform"!==p&&(d=s(e,x.Names.prefixCheck(p)[0]),x.Values.isCSSNullValue(d)&&x.Hooks.templates[r]&&(d=x.Hooks.templates[r][1])),l=x.Normalizations.registered[r]("extract",e,d)}return/^[\d-]/.test(l)||(l=i(e)&&i(e).isSVG&&x.Names.SVGAttribute(r)?/^(height|width)$/i.test(r)?e.getBBox()[r]:e.getAttribute(r):s(e,x.Names.prefixCheck(r)[0])),x.Values.isCSSNullValue(l)&&(l=0),v.debug>=2&&console.log("Get "+r+": "+l),l},setPropertyValue:function(e,r,a,n,o){var s=r;if("scroll"===r)o.container?o.container["scroll"+o.direction]=a:"Left"===o.direction?t.scrollTo(a,o.alternateValue):t.scrollTo(o.alternateValue,a);else if(x.Normalizations.registered[r]&&"transform"===x.Normalizations.registered[r]("name",e))x.Normalizations.registered[r]("inject",e,a),s="transform",a=i(e).transformCache[r];else{if(x.Hooks.registered[r]){var l=r,u=x.Hooks.getRoot(r);n=n||x.getPropertyValue(e,u),a=x.Hooks.injectValue(l,a,n),r=u}if(x.Normalizations.registered[r]&&(a=x.Normalizations.registered[r]("inject",e,a),r=x.Normalizations.registered[r]("name",e)),s=x.Names.prefixCheck(r)[0],8>=f)try{e.style[s]=a}catch(c){v.debug&&console.log("Browser does not support ["+a+"] for ["+s+"]")}else i(e)&&i(e).isSVG&&x.Names.SVGAttribute(r)?e.setAttribute(r,a):e.style[s]=a;v.debug>=2&&console.log("Set "+r+" ("+s+"): "+a)}return[s,a]},flushTransformCache:function(e){function t(t){return parseFloat(x.getPropertyValue(e,t))}var r="";if((f||v.State.isAndroid&&!v.State.isChrome)&&i(e).isSVG){var a={translate:[t("translateX"),t("translateY")],skewX:[t("skewX")],skewY:[t("skewY")],scale:1!==t("scale")?[t("scale"),t("scale")]:[t("scaleX"),t("scaleY")],rotate:[t("rotateZ"),0,0]};$.each(i(e).transformCache,function(e){/^translate/i.test(e)?e="translate":/^scale/i.test(e)?e="scale":/^rotate/i.test(e)&&(e="rotate"),a[e]&&(r+=e+"("+a[e].join(" ")+") ",delete a[e])})}else{var n,o;$.each(i(e).transformCache,function(t){return n=i(e).transformCache[t],"transformPerspective"===t?(o=n,!0):(9===f&&"rotateZ"===t&&(t="rotate"),void(r+=t+n+" "))}),o&&(r="perspective"+o+" "+r)}x.setPropertyValue(e,"transform",r)}};x.Hooks.register(),x.Normalizations.register(),v.hook=function(e,t,r){var n=a;return e=o(e),$.each(e,function(e,o){if(i(o)===a&&v.init(o),r===a)n===a&&(n=v.CSS.getPropertyValue(o,t));else{var s=v.CSS.setPropertyValue(o,t,r);"transform"===s[0]&&v.CSS.flushTransformCache(o),n=s}}),n};var S=function(){function e(){return f?k.promise||null:d}function s(){function e(e){function f(e,t){var r=a,n=a,i=a;return g.isArray(e)?(r=e[0],!g.isArray(e[1])&&/^[\d-]/.test(e[1])||g.isFunction(e[1])||x.RegEx.isHex.test(e[1])?i=e[1]:(g.isString(e[1])&&!x.RegEx.isHex.test(e[1])||g.isArray(e[1]))&&(n=t?e[1]:u(e[1],s.duration),e[2]!==a&&(i=e[2]))):r=e,t||(n=n||s.easing),g.isFunction(r)&&(r=r.call(o,V,w)),g.isFunction(i)&&(i=i.call(o,V,w)),[r||0,n,i]}function d(e,t){var r,a;return a=(t||0).toString().toLowerCase().replace(/[%A-z]+$/,function(e){return r=e,""}),r||(r=x.Values.getUnitType(e)),[a,r]}function m(){var e={myParent:o.parentNode||r.body,position:x.getPropertyValue(o,"position"),fontSize:x.getPropertyValue(o,"fontSize")},a=e.position===L.lastPosition&&e.myParent===L.lastParent,n=e.fontSize===L.lastFontSize;L.lastParent=e.myParent,L.lastPosition=e.position,L.lastFontSize=e.fontSize;var s=100,l={};if(n&&a)l.emToPx=L.lastEmToPx,l.percentToPxWidth=L.lastPercentToPxWidth,l.percentToPxHeight=L.lastPercentToPxHeight;else{var u=i(o).isSVG?r.createElementNS("http://www.w3.org/2000/svg","rect"):r.createElement("div");v.init(u),e.myParent.appendChild(u),$.each(["overflow","overflowX","overflowY"],function(e,t){v.CSS.setPropertyValue(u,t,"hidden")}),v.CSS.setPropertyValue(u,"position",e.position),v.CSS.setPropertyValue(u,"fontSize",e.fontSize),v.CSS.setPropertyValue(u,"boxSizing","content-box"),$.each(["minWidth","maxWidth","width","minHeight","maxHeight","height"],function(e,t){v.CSS.setPropertyValue(u,t,s+"%")}),v.CSS.setPropertyValue(u,"paddingLeft",s+"em"),l.percentToPxWidth=L.lastPercentToPxWidth=(parseFloat(x.getPropertyValue(u,"width",null,!0))||1)/s,l.percentToPxHeight=L.lastPercentToPxHeight=(parseFloat(x.getPropertyValue(u,"height",null,!0))||1)/s,l.emToPx=L.lastEmToPx=(parseFloat(x.getPropertyValue(u,"paddingLeft"))||1)/s,e.myParent.removeChild(u)}return null===L.remToPx&&(L.remToPx=parseFloat(x.getPropertyValue(r.body,"fontSize"))||16),null===L.vwToPx&&(L.vwToPx=parseFloat(t.innerWidth)/100,L.vhToPx=parseFloat(t.innerHeight)/100),l.remToPx=L.remToPx,l.vwToPx=L.vwToPx,l.vhToPx=L.vhToPx,v.debug>=1&&console.log("Unit ratios: "+JSON.stringify(l),o),l}if(s.begin&&0===V)try{s.begin.call(h,h)}catch(y){setTimeout(function(){throw y},1)}if("scroll"===A){var S=/^x$/i.test(s.axis)?"Left":"Top",C=parseFloat(s.offset)||0,T,F,E;s.container?g.isWrapped(s.container)||g.isNode(s.container)?(s.container=s.container[0]||s.container,T=s.container["scroll"+S],E=T+$(o).position()[S.toLowerCase()]+C):s.container=null:(T=v.State.scrollAnchor[v.State["scrollProperty"+S]],F=v.State.scrollAnchor[v.State["scrollProperty"+("Left"===S?"Top":"Left")]],E=$(o).offset()[S.toLowerCase()]+C),l={scroll:{rootPropertyValue:!1,startValue:T,currentValue:T,endValue:E,unitType:"",easing:s.easing,scrollData:{container:s.container,direction:S,alternateValue:F}},element:o},v.debug&&console.log("tweensContainer (scroll): ",l.scroll,o)}else if("reverse"===A){if(!i(o).tweensContainer)return void $.dequeue(o,s.queue);"none"===i(o).opts.display&&(i(o).opts.display="auto"),"hidden"===i(o).opts.visibility&&(i(o).opts.visibility="visible"),i(o).opts.loop=!1,i(o).opts.begin=null,i(o).opts.complete=null,P.easing||delete s.easing,P.duration||delete s.duration,s=$.extend({},i(o).opts,s);var j=$.extend(!0,{},i(o).tweensContainer);for(var H in j)if("element"!==H){var N=j[H].startValue;j[H].startValue=j[H].currentValue=j[H].endValue,j[H].endValue=N,g.isEmptyObject(P)||(j[H].easing=s.easing),v.debug&&console.log("reverse tweensContainer ("+H+"): "+JSON.stringify(j[H]),o)}l=j}else if("start"===A){var j;i(o).tweensContainer&&i(o).isAnimating===!0&&(j=i(o).tweensContainer),$.each(b,function(e,t){if(RegExp("^"+x.Lists.colors.join("$|^")+"$").test(e)){var r=f(t,!0),n=r[0],o=r[1],i=r[2];if(x.RegEx.isHex.test(n)){for(var s=["Red","Green","Blue"],l=x.Values.hexToRgb(n),u=i?x.Values.hexToRgb(i):a,c=0;c1e4&&(v.State.calls=n(v.State.calls)),v.State.calls.push([O,h,s,null,k.resolver]),v.State.isTicking===!1&&(v.State.isTicking=!0,c())):V++)}var o=this,s=$.extend({},v.defaults,P),l={},p;if(i(o)===a&&v.init(o),parseFloat(s.delay)&&s.queue!==!1&&$.queue(o,s.queue,function(e){v.velocityQueueEntryFlag=!0,i(o).delayTimer={setTimeout:setTimeout(e,parseFloat(s.delay)),next:e}}),v.mock===!0)s.duration=1;else switch(s.duration.toString().toLowerCase()){case"fast":s.duration=200;break;case"normal":s.duration=y;break;case"slow":s.duration=600;break;default:s.duration=parseFloat(s.duration)||1}s.easing=u(s.easing,s.duration),s.begin&&!g.isFunction(s.begin)&&(s.begin=null),s.progress&&!g.isFunction(s.progress)&&(s.progress=null),s.complete&&!g.isFunction(s.complete)&&(s.complete=null),s.display!==a&&null!==s.display&&(s.display=s.display.toString().toLowerCase(),"auto"===s.display&&(s.display=v.CSS.Values.getDisplayType(o))),s.visibility&&(s.visibility=s.visibility.toString().toLowerCase()),s.mobileHA=s.mobileHA&&v.State.isMobile&&!v.State.isGingerbread,s.queue===!1?s.delay?setTimeout(e,s.delay):e():$.queue(o,s.queue,function(t,r){return r===!0?(k.promise&&k.resolver(h),!0):(v.velocityQueueEntryFlag=!0,void e(t))}),""!==s.queue&&"fx"!==s.queue||"inprogress"===$.queue(o)[0]||$.dequeue(o)}var l=arguments[0]&&($.isPlainObject(arguments[0].properties)&&!arguments[0].properties.names||g.isString(arguments[0].properties)),f,d,m,h,b,P;if(g.isWrapped(this)?(f=!1,m=0,h=this,d=this):(f=!0,m=1,h=l?arguments[0].elements:arguments[0]),h=o(h)){l?(b=arguments[0].properties,P=arguments[0].options):(b=arguments[m],P=arguments[m+1]);var w=h.length,V=0;if("stop"!==b&&!$.isPlainObject(P)){var C=m+1;P={};for(var T=C;Tq;q++){var R={delay:E.delay};q===z-1&&(R.display=E.display,R.visibility=E.visibility,R.complete=E.complete),S(h,"reverse",R)}return e()}};v=$.extend(S,v),v.animate=S;var P=t.requestAnimationFrame||d;return v.State.isMobile||r.hidden===a||r.addEventListener("visibilitychange",function(){r.hidden?(P=function(e){return setTimeout(function(){e(!0)},16)},c()):P=t.requestAnimationFrame||d}),e.Velocity=v,e!==t&&(e.fn.velocity=S,e.fn.velocity.defaults=v.defaults),$.each(["Down","Up"],function(e,t){v.Sequences["slide"+t]=function(e,r,n,o,i,s){var l=$.extend({},r),u=l.begin,c=l.complete,p={height:"",marginTop:"",marginBottom:"",paddingTop:"",paddingBottom:""},f={};l.display===a&&(l.display="Down"===t?"inline"===v.CSS.Values.getDisplayType(e)?"inline-block":"block":"none"),l.begin=function(){u&&u.call(i,i),f.overflow=e.style.overflow,e.style.overflow="hidden";for(var r in p){f[r]=e.style[r];var a=v.CSS.getPropertyValue(e,r);p[r]="Down"===t?[a,0]:[0,a]}},l.complete=function(){for(var t in f)e.style[t]=f[t];c&&c.call(i,i),s&&s.resolver(i)},v(e,p,l)}}),$.each(["In","Out"],function(e,t){v.Sequences["fade"+t]=function(e,r,n,o,i,s){var l=$.extend({},r),u={opacity:"In"===t?1:0},c=l.complete;l.complete=n!==o-1?l.begin=null:function(){c&&c.call(i,i),s&&s.resolver(i)},l.display===a&&(l.display="In"===t?"auto":"none"),v(this,u,l)}}),v}(window.jQuery||window.Zepto||window,window,document)}); \ No newline at end of file +/*! VelocityJS.org (1.2.1). (C) 2014 Julian Shapiro. MIT @license: en.wikipedia.org/wiki/MIT_License */ +/*! VelocityJS.org jQuery Shim (1.0.1). (C) 2014 The jQuery Foundation. MIT @license: en.wikipedia.org/wiki/MIT_License. */ +!function(e){function t(e){var t=e.length,r=$.type(e);return"function"===r||$.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===r||0===t||"number"==typeof t&&t>0&&t-1 in e}if(!e.jQuery){var $=function(e,t){return new $.fn.init(e,t)};$.isWindow=function(e){return null!=e&&e==e.window},$.type=function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?a[o.call(e)]||"object":typeof e},$.isArray=Array.isArray||function(e){return"array"===$.type(e)},$.isPlainObject=function(e){var t;if(!e||"object"!==$.type(e)||e.nodeType||$.isWindow(e))return!1;try{if(e.constructor&&!n.call(e,"constructor")&&!n.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(r){return!1}for(t in e);return void 0===t||n.call(e,t)},$.each=function(e,r,a){var n,o=0,i=e.length,s=t(e);if(a){if(s)for(;i>o&&(n=r.apply(e[o],a),n!==!1);o++);else for(o in e)if(n=r.apply(e[o],a),n===!1)break}else if(s)for(;i>o&&(n=r.call(e[o],o,e[o]),n!==!1);o++);else for(o in e)if(n=r.call(e[o],o,e[o]),n===!1)break;return e},$.data=function(e,t,a){if(void 0===a){var n=e[$.expando],o=n&&r[n];if(void 0===t)return o;if(o&&t in o)return o[t]}else if(void 0!==t){var n=e[$.expando]||(e[$.expando]=++$.uuid);return r[n]=r[n]||{},r[n][t]=a,a}},$.removeData=function(e,t){var a=e[$.expando],n=a&&r[a];n&&$.each(t,function(e,t){delete n[t]})},$.extend=function(){var e,t,r,a,n,o,i=arguments[0]||{},s=1,l=arguments.length,u=!1;for("boolean"==typeof i&&(u=i,i=arguments[s]||{},s++),"object"!=typeof i&&"function"!==$.type(i)&&(i={}),s===l&&(i=this,s--);l>s;s++)if(null!=(n=arguments[s]))for(a in n)e=i[a],r=n[a],i!==r&&(u&&r&&($.isPlainObject(r)||(t=$.isArray(r)))?(t?(t=!1,o=e&&$.isArray(e)?e:[]):o=e&&$.isPlainObject(e)?e:{},i[a]=$.extend(u,o,r)):void 0!==r&&(i[a]=r));return i},$.queue=function(e,r,a){function n(e,r){var a=r||[];return null!=e&&(t(Object(e))?!function(e,t){for(var r=+t.length,a=0,n=e.length;r>a;)e[n++]=t[a++];if(r!==r)for(;void 0!==t[a];)e[n++]=t[a++];return e.length=n,e}(a,"string"==typeof e?[e]:e):[].push.call(a,e)),a}if(e){r=(r||"fx")+"queue";var o=$.data(e,r);return a?(!o||$.isArray(a)?o=$.data(e,r,n(a)):o.push(a),o):o||[]}},$.dequeue=function(e,t){$.each(e.nodeType?[e]:e,function(e,r){t=t||"fx";var a=$.queue(r,t),n=a.shift();"inprogress"===n&&(n=a.shift()),n&&("fx"===t&&a.unshift("inprogress"),n.call(r,function(){$.dequeue(r,t)}))})},$.fn=$.prototype={init:function(e){if(e.nodeType)return this[0]=e,this;throw new Error("Not a DOM node.")},offset:function(){var t=this[0].getBoundingClientRect?this[0].getBoundingClientRect():{top:0,left:0};return{top:t.top+(e.pageYOffset||document.scrollTop||0)-(document.clientTop||0),left:t.left+(e.pageXOffset||document.scrollLeft||0)-(document.clientLeft||0)}},position:function(){function e(){for(var e=this.offsetParent||document;e&&"html"===!e.nodeType.toLowerCase&&"static"===e.style.position;)e=e.offsetParent;return e||document}var t=this[0],e=e.apply(t),r=this.offset(),a=/^(?:body|html)$/i.test(e.nodeName)?{top:0,left:0}:$(e).offset();return r.top-=parseFloat(t.style.marginTop)||0,r.left-=parseFloat(t.style.marginLeft)||0,e.style&&(a.top+=parseFloat(e.style.borderTopWidth)||0,a.left+=parseFloat(e.style.borderLeftWidth)||0),{top:r.top-a.top,left:r.left-a.left}}};var r={};$.expando="velocity"+(new Date).getTime(),$.uuid=0;for(var a={},n=a.hasOwnProperty,o=a.toString,i="Boolean Number String Function Array Date RegExp Object Error".split(" "),s=0;sn;++n){var o=u(r,e,a);if(0===o)return r;var i=l(r,e,a)-t;r-=i/o}return r}function p(){for(var t=0;b>t;++t)w[t]=l(t*x,e,a)}function f(t,r,n){var o,i,s=0;do i=r+(n-r)/2,o=l(i,e,a)-t,o>0?n=i:r=i;while(Math.abs(o)>h&&++s=y?c(t,s):0==l?s:f(t,r,r+x)}function g(){V=!0,(e!=r||a!=n)&&p()}var m=4,y=.001,h=1e-7,v=10,b=11,x=1/(b-1),S="Float32Array"in t;if(4!==arguments.length)return!1;for(var P=0;4>P;++P)if("number"!=typeof arguments[P]||isNaN(arguments[P])||!isFinite(arguments[P]))return!1;e=Math.min(e,1),a=Math.min(a,1),e=Math.max(e,0),a=Math.max(a,0);var w=S?new Float32Array(b):new Array(b),V=!1,C=function(t){return V||g(),e===r&&a===n?t:0===t?0:1===t?1:l(d(t),r,n)};C.getControlPoints=function(){return[{x:e,y:r},{x:a,y:n}]};var T="generateBezier("+[e,r,a,n]+")";return C.toString=function(){return T},C}function u(e,t){var r=e;return g.isString(e)?v.Easings[e]||(r=!1):r=g.isArray(e)&&1===e.length?s.apply(null,e):g.isArray(e)&&2===e.length?b.apply(null,e.concat([t])):g.isArray(e)&&4===e.length?l.apply(null,e):!1,r===!1&&(r=v.Easings[v.defaults.easing]?v.defaults.easing:h),r}function c(e){if(e){var t=(new Date).getTime(),r=v.State.calls.length;r>1e4&&(v.State.calls=n(v.State.calls));for(var o=0;r>o;o++)if(v.State.calls[o]){var s=v.State.calls[o],l=s[0],u=s[2],f=s[3],d=!!f,m=null;f||(f=v.State.calls[o][3]=t-16);for(var y=Math.min((t-f)/u.duration,1),h=0,b=l.length;b>h;h++){var S=l[h],w=S.element;if(i(w)){var V=!1;if(u.display!==a&&null!==u.display&&"none"!==u.display){if("flex"===u.display){var C=["-webkit-box","-moz-box","-ms-flexbox","-webkit-flex"];$.each(C,function(e,t){x.setPropertyValue(w,"display",t)})}x.setPropertyValue(w,"display",u.display)}u.visibility!==a&&"hidden"!==u.visibility&&x.setPropertyValue(w,"visibility",u.visibility);for(var T in S)if("element"!==T){var k=S[T],A,F=g.isString(k.easing)?v.Easings[k.easing]:k.easing;if(1===y)A=k.endValue;else{var E=k.endValue-k.startValue;if(A=k.startValue+E*F(y,u,E),!d&&A===k.currentValue)continue}if(k.currentValue=A,"tween"===T)m=A;else{if(x.Hooks.registered[T]){var j=x.Hooks.getRoot(T),H=i(w).rootPropertyValueCache[j];H&&(k.rootPropertyValue=H)}var N=x.setPropertyValue(w,T,k.currentValue+(0===parseFloat(A)?"":k.unitType),k.rootPropertyValue,k.scrollData);x.Hooks.registered[T]&&(i(w).rootPropertyValueCache[j]=x.Normalizations.registered[j]?x.Normalizations.registered[j]("extract",null,N[1]):N[1]),"transform"===N[0]&&(V=!0)}}u.mobileHA&&i(w).transformCache.translate3d===a&&(i(w).transformCache.translate3d="(0px, 0px, 0px)",V=!0),V&&x.flushTransformCache(w)}}u.display!==a&&"none"!==u.display&&(v.State.calls[o][2].display=!1),u.visibility!==a&&"hidden"!==u.visibility&&(v.State.calls[o][2].visibility=!1),u.progress&&u.progress.call(s[1],s[1],y,Math.max(0,f+u.duration-t),f,m),1===y&&p(o)}}v.State.isTicking&&P(c)}function p(e,t){if(!v.State.calls[e])return!1;for(var r=v.State.calls[e][0],n=v.State.calls[e][1],o=v.State.calls[e][2],s=v.State.calls[e][4],l=!1,u=0,c=r.length;c>u;u++){var p=r[u].element;if(t||o.loop||("none"===o.display&&x.setPropertyValue(p,"display",o.display),"hidden"===o.visibility&&x.setPropertyValue(p,"visibility",o.visibility)),o.loop!==!0&&($.queue(p)[1]===a||!/\.velocityQueueEntryFlag/i.test($.queue(p)[1]))&&i(p)){i(p).isAnimating=!1,i(p).rootPropertyValueCache={};var f=!1;$.each(x.Lists.transforms3D,function(e,t){var r=/^scale/.test(t)?1:0,n=i(p).transformCache[t];i(p).transformCache[t]!==a&&new RegExp("^\\("+r+"[^.]").test(n)&&(f=!0,delete i(p).transformCache[t])}),o.mobileHA&&(f=!0,delete i(p).transformCache.translate3d),f&&x.flushTransformCache(p),x.Values.removeClass(p,"velocity-animating")}if(!t&&o.complete&&!o.loop&&u===c-1)try{o.complete.call(n,n)}catch(d){setTimeout(function(){throw d},1)}s&&o.loop!==!0&&s(n),o.loop!==!0||t||($.each(i(p).tweensContainer,function(e,t){/^rotate/.test(e)&&360===parseFloat(t.endValue)&&(t.endValue=0,t.startValue=360),/^backgroundPosition/.test(e)&&100===parseFloat(t.endValue)&&"%"===t.unitType&&(t.endValue=0,t.startValue=100)}),v(p,"reverse",{loop:!0,delay:o.delay})),o.queue!==!1&&$.dequeue(p,o.queue)}v.State.calls[e]=!1;for(var g=0,m=v.State.calls.length;m>g;g++)if(v.State.calls[g]!==!1){l=!0;break}l===!1&&(v.State.isTicking=!1,delete v.State.calls,v.State.calls=[])}var f=function(){if(r.documentMode)return r.documentMode;for(var e=7;e>4;e--){var t=r.createElement("div");if(t.innerHTML="",t.getElementsByTagName("span").length)return t=null,e}return a}(),d=function(){var e=0;return t.webkitRequestAnimationFrame||t.mozRequestAnimationFrame||function(t){var r=(new Date).getTime(),a;return a=Math.max(0,16-(r-e)),e=r+a,setTimeout(function(){t(r+a)},a)}}(),g={isString:function(e){return"string"==typeof e},isArray:Array.isArray||function(e){return"[object Array]"===Object.prototype.toString.call(e)},isFunction:function(e){return"[object Function]"===Object.prototype.toString.call(e)},isNode:function(e){return e&&e.nodeType},isNodeList:function(e){return"object"==typeof e&&/^\[object (HTMLCollection|NodeList|Object)\]$/.test(Object.prototype.toString.call(e))&&e.length!==a&&(0===e.length||"object"==typeof e[0]&&e[0].nodeType>0)},isWrapped:function(e){return e&&(e.jquery||t.Zepto&&t.Zepto.zepto.isZ(e))},isSVG:function(e){return t.SVGElement&&e instanceof t.SVGElement},isEmptyObject:function(e){for(var t in e)return!1;return!0}},$,m=!1;if(e.fn&&e.fn.jquery?($=e,m=!0):$=t.Velocity.Utilities,8>=f&&!m)throw new Error("Velocity: IE8 and below require jQuery to be loaded before Velocity.");if(7>=f)return void(jQuery.fn.velocity=jQuery.fn.animate);var y=400,h="swing",v={State:{isMobile:/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent),isAndroid:/Android/i.test(navigator.userAgent),isGingerbread:/Android 2\.3\.[3-7]/i.test(navigator.userAgent),isChrome:t.chrome,isFirefox:/Firefox/i.test(navigator.userAgent),prefixElement:r.createElement("div"),prefixMatches:{},scrollAnchor:null,scrollPropertyLeft:null,scrollPropertyTop:null,isTicking:!1,calls:[]},CSS:{},Utilities:$,Redirects:{},Easings:{},Promise:t.Promise,defaults:{queue:"",duration:y,easing:h,begin:a,complete:a,progress:a,display:a,visibility:a,loop:!1,delay:!1,mobileHA:!0,_cacheValues:!0},init:function(e){$.data(e,"velocity",{isSVG:g.isSVG(e),isAnimating:!1,computedStyle:null,tweensContainer:null,rootPropertyValueCache:{},transformCache:{}})},hook:null,mock:!1,version:{major:1,minor:2,patch:1},debug:!1};t.pageYOffset!==a?(v.State.scrollAnchor=t,v.State.scrollPropertyLeft="pageXOffset",v.State.scrollPropertyTop="pageYOffset"):(v.State.scrollAnchor=r.documentElement||r.body.parentNode||r.body,v.State.scrollPropertyLeft="scrollLeft",v.State.scrollPropertyTop="scrollTop");var b=function(){function e(e){return-e.tension*e.x-e.friction*e.v}function t(t,r,a){var n={x:t.x+a.dx*r,v:t.v+a.dv*r,tension:t.tension,friction:t.friction};return{dx:n.v,dv:e(n)}}function r(r,a){var n={dx:r.v,dv:e(r)},o=t(r,.5*a,n),i=t(r,.5*a,o),s=t(r,a,i),l=1/6*(n.dx+2*(o.dx+i.dx)+s.dx),u=1/6*(n.dv+2*(o.dv+i.dv)+s.dv);return r.x=r.x+l*a,r.v=r.v+u*a,r}return function a(e,t,n){var o={x:-1,v:0,tension:null,friction:null},i=[0],s=0,l=1e-4,u=.016,c,p,f;for(e=parseFloat(e)||500,t=parseFloat(t)||20,n=n||null,o.tension=e,o.friction=t,c=null!==n,c?(s=a(e,t),p=s/n*u):p=u;;)if(f=r(f||o,p),i.push(1+f.x),s+=16,!(Math.abs(f.x)>l&&Math.abs(f.v)>l))break;return c?function(e){return i[e*(i.length-1)|0]}:s}}();v.Easings={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},spring:function(e){return 1-Math.cos(4.5*e*Math.PI)*Math.exp(6*-e)}},$.each([["ease",[.25,.1,.25,1]],["ease-in",[.42,0,1,1]],["ease-out",[0,0,.58,1]],["ease-in-out",[.42,0,.58,1]],["easeInSine",[.47,0,.745,.715]],["easeOutSine",[.39,.575,.565,1]],["easeInOutSine",[.445,.05,.55,.95]],["easeInQuad",[.55,.085,.68,.53]],["easeOutQuad",[.25,.46,.45,.94]],["easeInOutQuad",[.455,.03,.515,.955]],["easeInCubic",[.55,.055,.675,.19]],["easeOutCubic",[.215,.61,.355,1]],["easeInOutCubic",[.645,.045,.355,1]],["easeInQuart",[.895,.03,.685,.22]],["easeOutQuart",[.165,.84,.44,1]],["easeInOutQuart",[.77,0,.175,1]],["easeInQuint",[.755,.05,.855,.06]],["easeOutQuint",[.23,1,.32,1]],["easeInOutQuint",[.86,0,.07,1]],["easeInExpo",[.95,.05,.795,.035]],["easeOutExpo",[.19,1,.22,1]],["easeInOutExpo",[1,0,0,1]],["easeInCirc",[.6,.04,.98,.335]],["easeOutCirc",[.075,.82,.165,1]],["easeInOutCirc",[.785,.135,.15,.86]]],function(e,t){v.Easings[t[0]]=l.apply(null,t[1])});var x=v.CSS={RegEx:{isHex:/^#([A-f\d]{3}){1,2}$/i,valueUnwrap:/^[A-z]+\((.*)\)$/i,wrappedValueAlreadyExtracted:/[0-9.]+ [0-9.]+ [0-9.]+( [0-9.]+)?/,valueSplit:/([A-z]+\(.+\))|(([A-z0-9#-.]+?)(?=\s|$))/gi},Lists:{colors:["fill","stroke","stopColor","color","backgroundColor","borderColor","borderTopColor","borderRightColor","borderBottomColor","borderLeftColor","outlineColor"],transformsBase:["translateX","translateY","scale","scaleX","scaleY","skewX","skewY","rotateZ"],transforms3D:["transformPerspective","translateZ","scaleZ","rotateX","rotateY"]},Hooks:{templates:{textShadow:["Color X Y Blur","black 0px 0px 0px"],boxShadow:["Color X Y Blur Spread","black 0px 0px 0px 0px"],clip:["Top Right Bottom Left","0px 0px 0px 0px"],backgroundPosition:["X Y","0% 0%"],transformOrigin:["X Y Z","50% 50% 0px"],perspectiveOrigin:["X Y","50% 50%"]},registered:{},register:function(){for(var e=0;e=f)switch(e){case"name":return"filter";case"extract":var a=r.toString().match(/alpha\(opacity=(.*)\)/i);return r=a?a[1]/100:1;case"inject":return t.style.zoom=1,parseFloat(r)>=1?"":"alpha(opacity="+parseInt(100*parseFloat(r),10)+")"}else switch(e){case"name":return"opacity";case"extract":return r;case"inject":return r}}},register:function(){9>=f||v.State.isGingerbread||(x.Lists.transformsBase=x.Lists.transformsBase.concat(x.Lists.transforms3D));for(var e=0;en&&(n=1),o=!/(\d)$/i.test(n);break;case"skew":o=!/(deg|\d)$/i.test(n);break;case"rotate":o=!/(deg|\d)$/i.test(n)}return o||(i(r).transformCache[t]="("+n+")"),i(r).transformCache[t]}}}();for(var e=0;e=f||3!==o.split(" ").length||(o+=" 1"),o;case"inject":return 8>=f?4===n.split(" ").length&&(n=n.split(/\s+/).slice(0,3).join(" ")):3===n.split(" ").length&&(n+=" 1"),(8>=f?"rgb":"rgba")+"("+n.replace(/\s+/g,",").replace(/\.(\d)+(?=,)/g,"")+")"}}}()}},Names:{camelCase:function(e){return e.replace(/-(\w)/g,function(e,t){return t.toUpperCase()})},SVGAttribute:function(e){var t="width|height|x|y|cx|cy|r|rx|ry|x1|x2|y1|y2";return(f||v.State.isAndroid&&!v.State.isChrome)&&(t+="|transform"),new RegExp("^("+t+")$","i").test(e)},prefixCheck:function(e){if(v.State.prefixMatches[e])return[v.State.prefixMatches[e],!0];for(var t=["","Webkit","Moz","ms","O"],r=0,a=t.length;a>r;r++){var n;if(n=0===r?e:t[r]+e.replace(/^\w/,function(e){return e.toUpperCase()}),g.isString(v.State.prefixElement.style[n]))return v.State.prefixMatches[e]=n,[n,!0]}return[e,!1]}},Values:{hexToRgb:function(e){var t=/^#?([a-f\d])([a-f\d])([a-f\d])$/i,r=/^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i,a;return e=e.replace(t,function(e,t,r,a){return t+t+r+r+a+a}),a=r.exec(e),a?[parseInt(a[1],16),parseInt(a[2],16),parseInt(a[3],16)]:[0,0,0]},isCSSNullValue:function(e){return 0==e||/^(none|auto|transparent|(rgba\(0, ?0, ?0, ?0\)))$/i.test(e)},getUnitType:function(e){return/^(rotate|skew)/i.test(e)?"deg":/(^(scale|scaleX|scaleY|scaleZ|alpha|flexGrow|flexHeight|zIndex|fontWeight)$)|((opacity|red|green|blue|alpha)$)/i.test(e)?"":"px"},getDisplayType:function(e){var t=e&&e.tagName.toString().toLowerCase();return/^(b|big|i|small|tt|abbr|acronym|cite|code|dfn|em|kbd|strong|samp|var|a|bdo|br|img|map|object|q|script|span|sub|sup|button|input|label|select|textarea)$/i.test(t)?"inline":/^(li)$/i.test(t)?"list-item":/^(tr)$/i.test(t)?"table-row":/^(table)$/i.test(t)?"table":/^(tbody)$/i.test(t)?"table-row-group":"block"},addClass:function(e,t){e.classList?e.classList.add(t):e.className+=(e.className.length?" ":"")+t},removeClass:function(e,t){e.classList?e.classList.remove(t):e.className=e.className.toString().replace(new RegExp("(^|\\s)"+t.split(" ").join("|")+"(\\s|$)","gi")," ")}},getPropertyValue:function(e,r,n,o){function s(e,r){function n(){u&&x.setPropertyValue(e,"display","none")}var l=0;if(8>=f)l=$.css(e,r);else{var u=!1;if(/^(width|height)$/.test(r)&&0===x.getPropertyValue(e,"display")&&(u=!0,x.setPropertyValue(e,"display",x.Values.getDisplayType(e))),!o){if("height"===r&&"border-box"!==x.getPropertyValue(e,"boxSizing").toString().toLowerCase()){var c=e.offsetHeight-(parseFloat(x.getPropertyValue(e,"borderTopWidth"))||0)-(parseFloat(x.getPropertyValue(e,"borderBottomWidth"))||0)-(parseFloat(x.getPropertyValue(e,"paddingTop"))||0)-(parseFloat(x.getPropertyValue(e,"paddingBottom"))||0);return n(),c}if("width"===r&&"border-box"!==x.getPropertyValue(e,"boxSizing").toString().toLowerCase()){var p=e.offsetWidth-(parseFloat(x.getPropertyValue(e,"borderLeftWidth"))||0)-(parseFloat(x.getPropertyValue(e,"borderRightWidth"))||0)-(parseFloat(x.getPropertyValue(e,"paddingLeft"))||0)-(parseFloat(x.getPropertyValue(e,"paddingRight"))||0);return n(),p}}var d;d=i(e)===a?t.getComputedStyle(e,null):i(e).computedStyle?i(e).computedStyle:i(e).computedStyle=t.getComputedStyle(e,null),"borderColor"===r&&(r="borderTopColor"),l=9===f&&"filter"===r?d.getPropertyValue(r):d[r],(""===l||null===l)&&(l=e.style[r]),n()}if("auto"===l&&/^(top|right|bottom|left)$/i.test(r)){var g=s(e,"position");("fixed"===g||"absolute"===g&&/top|left/i.test(r))&&(l=$(e).position()[r]+"px")}return l}var l;if(x.Hooks.registered[r]){var u=r,c=x.Hooks.getRoot(u);n===a&&(n=x.getPropertyValue(e,x.Names.prefixCheck(c)[0])),x.Normalizations.registered[c]&&(n=x.Normalizations.registered[c]("extract",e,n)),l=x.Hooks.extractValue(u,n)}else if(x.Normalizations.registered[r]){var p,d;p=x.Normalizations.registered[r]("name",e),"transform"!==p&&(d=s(e,x.Names.prefixCheck(p)[0]),x.Values.isCSSNullValue(d)&&x.Hooks.templates[r]&&(d=x.Hooks.templates[r][1])),l=x.Normalizations.registered[r]("extract",e,d)}if(!/^[\d-]/.test(l))if(i(e)&&i(e).isSVG&&x.Names.SVGAttribute(r))if(/^(height|width)$/i.test(r))try{l=e.getBBox()[r]}catch(g){l=0}else l=e.getAttribute(r);else l=s(e,x.Names.prefixCheck(r)[0]);return x.Values.isCSSNullValue(l)&&(l=0),v.debug>=2&&console.log("Get "+r+": "+l),l},setPropertyValue:function(e,r,a,n,o){var s=r;if("scroll"===r)o.container?o.container["scroll"+o.direction]=a:"Left"===o.direction?t.scrollTo(a,o.alternateValue):t.scrollTo(o.alternateValue,a);else if(x.Normalizations.registered[r]&&"transform"===x.Normalizations.registered[r]("name",e))x.Normalizations.registered[r]("inject",e,a),s="transform",a=i(e).transformCache[r];else{if(x.Hooks.registered[r]){var l=r,u=x.Hooks.getRoot(r);n=n||x.getPropertyValue(e,u),a=x.Hooks.injectValue(l,a,n),r=u}if(x.Normalizations.registered[r]&&(a=x.Normalizations.registered[r]("inject",e,a),r=x.Normalizations.registered[r]("name",e)),s=x.Names.prefixCheck(r)[0],8>=f)try{e.style[s]=a}catch(c){v.debug&&console.log("Browser does not support ["+a+"] for ["+s+"]")}else i(e)&&i(e).isSVG&&x.Names.SVGAttribute(r)?e.setAttribute(r,a):e.style[s]=a;v.debug>=2&&console.log("Set "+r+" ("+s+"): "+a)}return[s,a]},flushTransformCache:function(e){function t(t){return parseFloat(x.getPropertyValue(e,t))}var r="";if((f||v.State.isAndroid&&!v.State.isChrome)&&i(e).isSVG){var a={translate:[t("translateX"),t("translateY")],skewX:[t("skewX")],skewY:[t("skewY")],scale:1!==t("scale")?[t("scale"),t("scale")]:[t("scaleX"),t("scaleY")],rotate:[t("rotateZ"),0,0]};$.each(i(e).transformCache,function(e){/^translate/i.test(e)?e="translate":/^scale/i.test(e)?e="scale":/^rotate/i.test(e)&&(e="rotate"),a[e]&&(r+=e+"("+a[e].join(" ")+") ",delete a[e])})}else{var n,o;$.each(i(e).transformCache,function(t){return n=i(e).transformCache[t],"transformPerspective"===t?(o=n,!0):(9===f&&"rotateZ"===t&&(t="rotate"),void(r+=t+n+" "))}),o&&(r="perspective"+o+" "+r)}x.setPropertyValue(e,"transform",r)}};x.Hooks.register(),x.Normalizations.register(),v.hook=function(e,t,r){var n=a;return e=o(e),$.each(e,function(e,o){if(i(o)===a&&v.init(o),r===a)n===a&&(n=v.CSS.getPropertyValue(o,t));else{var s=v.CSS.setPropertyValue(o,t,r);"transform"===s[0]&&v.CSS.flushTransformCache(o),n=s}}),n};var S=function(){function e(){return l?T.promise||null:f}function n(){function e(e){function p(e,t){var r=a,i=a,s=a;return g.isArray(e)?(r=e[0],!g.isArray(e[1])&&/^[\d-]/.test(e[1])||g.isFunction(e[1])||x.RegEx.isHex.test(e[1])?s=e[1]:(g.isString(e[1])&&!x.RegEx.isHex.test(e[1])||g.isArray(e[1]))&&(i=t?e[1]:u(e[1],o.duration),e[2]!==a&&(s=e[2]))):r=e,t||(i=i||o.easing),g.isFunction(r)&&(r=r.call(n,w,P)),g.isFunction(s)&&(s=s.call(n,w,P)),[r||0,i,s]}function f(e,t){var r,a;return a=(t||"0").toString().toLowerCase().replace(/[%A-z]+$/,function(e){return r=e,""}),r||(r=x.Values.getUnitType(e)),[a,r]}function d(){var e={myParent:n.parentNode||r.body,position:x.getPropertyValue(n,"position"),fontSize:x.getPropertyValue(n,"fontSize")},a=e.position===N.lastPosition&&e.myParent===N.lastParent,o=e.fontSize===N.lastFontSize;N.lastParent=e.myParent,N.lastPosition=e.position,N.lastFontSize=e.fontSize;var s=100,l={};if(o&&a)l.emToPx=N.lastEmToPx,l.percentToPxWidth=N.lastPercentToPxWidth,l.percentToPxHeight=N.lastPercentToPxHeight;else{var u=i(n).isSVG?r.createElementNS("http://www.w3.org/2000/svg","rect"):r.createElement("div");v.init(u),e.myParent.appendChild(u),$.each(["overflow","overflowX","overflowY"],function(e,t){v.CSS.setPropertyValue(u,t,"hidden")}),v.CSS.setPropertyValue(u,"position",e.position),v.CSS.setPropertyValue(u,"fontSize",e.fontSize),v.CSS.setPropertyValue(u,"boxSizing","content-box"),$.each(["minWidth","maxWidth","width","minHeight","maxHeight","height"],function(e,t){v.CSS.setPropertyValue(u,t,s+"%")}),v.CSS.setPropertyValue(u,"paddingLeft",s+"em"),l.percentToPxWidth=N.lastPercentToPxWidth=(parseFloat(x.getPropertyValue(u,"width",null,!0))||1)/s,l.percentToPxHeight=N.lastPercentToPxHeight=(parseFloat(x.getPropertyValue(u,"height",null,!0))||1)/s,l.emToPx=N.lastEmToPx=(parseFloat(x.getPropertyValue(u,"paddingLeft"))||1)/s,e.myParent.removeChild(u)}return null===N.remToPx&&(N.remToPx=parseFloat(x.getPropertyValue(r.body,"fontSize"))||16),null===N.vwToPx&&(N.vwToPx=parseFloat(t.innerWidth)/100,N.vhToPx=parseFloat(t.innerHeight)/100),l.remToPx=N.remToPx,l.vwToPx=N.vwToPx,l.vhToPx=N.vhToPx,v.debug>=1&&console.log("Unit ratios: "+JSON.stringify(l),n),l}if(o.begin&&0===w)try{o.begin.call(m,m)}catch(y){setTimeout(function(){throw y},1)}if("scroll"===k){var S=/^x$/i.test(o.axis)?"Left":"Top",V=parseFloat(o.offset)||0,C,A,F;o.container?g.isWrapped(o.container)||g.isNode(o.container)?(o.container=o.container[0]||o.container,C=o.container["scroll"+S],F=C+$(n).position()[S.toLowerCase()]+V):o.container=null:(C=v.State.scrollAnchor[v.State["scrollProperty"+S]],A=v.State.scrollAnchor[v.State["scrollProperty"+("Left"===S?"Top":"Left")]],F=$(n).offset()[S.toLowerCase()]+V),s={scroll:{rootPropertyValue:!1,startValue:C,currentValue:C,endValue:F,unitType:"",easing:o.easing,scrollData:{container:o.container,direction:S,alternateValue:A}},element:n},v.debug&&console.log("tweensContainer (scroll): ",s.scroll,n)}else if("reverse"===k){if(!i(n).tweensContainer)return void $.dequeue(n,o.queue);"none"===i(n).opts.display&&(i(n).opts.display="auto"),"hidden"===i(n).opts.visibility&&(i(n).opts.visibility="visible"),i(n).opts.loop=!1,i(n).opts.begin=null,i(n).opts.complete=null,b.easing||delete o.easing,b.duration||delete o.duration,o=$.extend({},i(n).opts,o);var E=$.extend(!0,{},i(n).tweensContainer);for(var j in E)if("element"!==j){var H=E[j].startValue;E[j].startValue=E[j].currentValue=E[j].endValue,E[j].endValue=H,g.isEmptyObject(b)||(E[j].easing=o.easing),v.debug&&console.log("reverse tweensContainer ("+j+"): "+JSON.stringify(E[j]),n)}s=E}else if("start"===k){var E;i(n).tweensContainer&&i(n).isAnimating===!0&&(E=i(n).tweensContainer),$.each(h,function(e,t){if(RegExp("^"+x.Lists.colors.join("$|^")+"$").test(e)){var r=p(t,!0),n=r[0],o=r[1],i=r[2];if(x.RegEx.isHex.test(n)){for(var s=["Red","Green","Blue"],l=x.Values.hexToRgb(n),u=i?x.Values.hexToRgb(i):a,c=0;cO;O++){var z={delay:F.delay,progress:F.progress};O===R-1&&(z.display=F.display,z.visibility=F.visibility,z.complete=F.complete),S(m,"reverse",z)}return e()}};v=$.extend(S,v),v.animate=S;var P=t.requestAnimationFrame||d;return v.State.isMobile||r.hidden===a||r.addEventListener("visibilitychange",function(){r.hidden?(P=function(e){return setTimeout(function(){e(!0)},16)},c()):P=t.requestAnimationFrame||d}),e.Velocity=v,e!==t&&(e.fn.velocity=S,e.fn.velocity.defaults=v.defaults),$.each(["Down","Up"],function(e,t){v.Redirects["slide"+t]=function(e,r,n,o,i,s){var l=$.extend({},r),u=l.begin,c=l.complete,p={height:"",marginTop:"",marginBottom:"",paddingTop:"",paddingBottom:""},f={};l.display===a&&(l.display="Down"===t?"inline"===v.CSS.Values.getDisplayType(e)?"inline-block":"block":"none"),l.begin=function(){u&&u.call(i,i);for(var r in p){f[r]=e.style[r];var a=v.CSS.getPropertyValue(e,r);p[r]="Down"===t?[a,0]:[0,a]}f.overflow=e.style.overflow,e.style.overflow="hidden"},l.complete=function(){for(var t in f)e.style[t]=f[t];c&&c.call(i,i),s&&s.resolver(i)},v(e,p,l)}}),$.each(["In","Out"],function(e,t){v.Redirects["fade"+t]=function(e,r,n,o,i,s){var l=$.extend({},r),u={opacity:"In"===t?1:0},c=l.complete;l.complete=n!==o-1?l.begin=null:function(){c&&c.call(i,i),s&&s.resolver(i)},l.display===a&&(l.display="In"===t?"auto":"none"),v(this,u,l)}}),v}(window.jQuery||window.Zepto||window,window,document)}); \ No newline at end of file diff --git a/app/assets/javascripts/app/lib/animations/velocity.ui.js b/app/assets/javascripts/app/lib/animations/velocity.ui.js index 2f4aee8ef..e5cc830c3 100644 --- a/app/assets/javascripts/app/lib/animations/velocity.ui.js +++ b/app/assets/javascripts/app/lib/animations/velocity.ui.js @@ -2,48 +2,77 @@ Velocity UI Pack **********************/ -/* VelocityJS.org UI Pack (4.1.4). (C) 2014 Julian Shapiro. MIT @license: en.wikipedia.org/wiki/MIT_License. Portions copyright Daniel Eden, Christian Pucci. */ +/* VelocityJS.org UI Pack (5.0.2). (C) 2014 Julian Shapiro. MIT @license: en.wikipedia.org/wiki/MIT_License. Portions copyright Daniel Eden, Christian Pucci. */ -;(function (factory) { +;(function (factory) { /* CommonJS module. */ - if (typeof module === "object" && typeof module.exports === "object") { + if (typeof require === "function" && typeof exports === "object" ) { module.exports = factory(); /* AMD module. */ } else if (typeof define === "function" && define.amd) { define([ "velocity" ], factory); /* Browser globals. */ - } else { + } else { factory(); } }(function() { return function (global, window, document, undefined) { - /************** + /************* Checks - **************/ + *************/ if (!global.Velocity || !global.Velocity.Utilities) { window.console && console.log("Velocity UI Pack: Velocity must be loaded first. Aborting."); return; - } else if (!global.Velocity.version || (global.Velocity.version.major <= 0 && global.Velocity.version.minor <= 11 && global.Velocity.version.patch < 8)) { - var abortError = "Velocity UI Pack: You need to update Velocity (jquery.velocity.js) to a newer version. Visit http://github.com/julianshapiro/velocity."; + } else { + var Velocity = global.Velocity, + $ = Velocity.Utilities; + } + var velocityVersion = Velocity.version, + requiredVersion = { major: 1, minor: 1, patch: 0 }; + + function greaterSemver (primary, secondary) { + var versionInts = []; + + if (!primary || !secondary) { return false; } + + $.each([ primary, secondary ], function(i, versionObject) { + var versionIntsComponents = []; + + $.each(versionObject, function(component, value) { + while (value.toString().length < 5) { + value = "0" + value; + } + versionIntsComponents.push(value); + }); + + versionInts.push(versionIntsComponents.join("")) + }); + + return (parseFloat(versionInts[0]) > parseFloat(versionInts[1])); + } + + if (greaterSemver(requiredVersion, velocityVersion)){ + var abortError = "Velocity UI Pack: You need to update Velocity (jquery.velocity.js) to a newer version. Visit http://github.com/julianshapiro/velocity."; alert(abortError); throw new Error(abortError); } - /****************** - Register UI - ******************/ + /************************ + Effect Registration + ************************/ - global.Velocity.RegisterUI = function (effectName, properties) { + /* Note: RegisterUI is a legacy name. */ + Velocity.RegisterEffect = Velocity.RegisterUI = function (effectName, properties) { /* Animate the expansion/contraction of the elements' parent's height for In/Out effects. */ function animateParentHeight (elements, direction, totalDuration, stagger) { var totalHeightDelta = 0, parentNode; /* Sum the total height (including padding and margin) of all targeted elements. */ - global.Velocity.Utilities.each(elements.nodeType ? [ elements ] : elements, function(i, element) { + $.each(elements.nodeType ? [ elements ] : elements, function(i, element) { if (stagger) { /* Increase the totalDuration by the successive delay amounts produced by the stagger option. */ totalDuration += i * stagger; @@ -51,84 +80,99 @@ return function (global, window, document, undefined) { parentNode = element.parentNode; - global.Velocity.Utilities.each([ "height", "paddingTop", "paddingBottom", "marginTop", "marginBottom"], function(i, property) { - totalHeightDelta += parseFloat(global.Velocity.CSS.getPropertyValue(element, property)); + $.each([ "height", "paddingTop", "paddingBottom", "marginTop", "marginBottom"], function(i, property) { + totalHeightDelta += parseFloat(Velocity.CSS.getPropertyValue(element, property)); }); }); /* Animate the parent element's height adjustment (with a varying duration multiplier for aesthetic benefits). */ - global.Velocity.animate( + Velocity.animate( parentNode, { height: (direction === "In" ? "+" : "-") + "=" + totalHeightDelta }, { queue: false, easing: "ease-in-out", duration: totalDuration * (direction === "In" ? 0.6 : 1) } ); } - /* Register a custom sequence for each effect. */ - global.Velocity.Sequences[effectName] = function (element, sequenceOptions, elementsIndex, elementsSize, elements, promiseData) { + /* Register a custom redirect for each effect. */ + Velocity.Redirects[effectName] = function (element, redirectOptions, elementsIndex, elementsSize, elements, promiseData) { var finalElement = (elementsIndex === elementsSize - 1); + if (typeof properties.defaultDuration === "function") { + properties.defaultDuration = properties.defaultDuration.call(elements, elements); + } else { + properties.defaultDuration = parseFloat(properties.defaultDuration); + } + /* Iterate through each effect's call array. */ for (var callIndex = 0; callIndex < properties.calls.length; callIndex++) { var call = properties.calls[callIndex], propertyMap = call[0], - sequenceDuration = (sequenceOptions.duration || properties.defaultDuration || 1000), + redirectDuration = (redirectOptions.duration || properties.defaultDuration || 1000), durationPercentage = call[1], callOptions = call[2] || {}, opts = {}; /* Assign the whitelisted per-call options. */ - opts.duration = sequenceDuration * (durationPercentage || 1); - opts.queue = sequenceOptions.queue || ""; + opts.duration = redirectDuration * (durationPercentage || 1); + opts.queue = redirectOptions.queue || ""; opts.easing = callOptions.easing || "ease"; - opts.delay = callOptions.delay || 0; + opts.delay = parseFloat(callOptions.delay) || 0; opts._cacheValues = callOptions._cacheValues || true; /* Special processing for the first effect call. */ if (callIndex === 0) { - /* If a delay was passed into the sequence, combine it with the first call's delay. */ - opts.delay += (sequenceOptions.delay || 0); + /* If a delay was passed into the redirect, combine it with the first call's delay. */ + opts.delay += (parseFloat(redirectOptions.delay) || 0); if (elementsIndex === 0) { opts.begin = function() { /* Only trigger a begin callback on the first effect call with the first element in the set. */ - sequenceOptions.begin && sequenceOptions.begin.call(elements, elements); + redirectOptions.begin && redirectOptions.begin.call(elements, elements); + + var direction = effectName.match(/(In|Out)$/); + + /* Make "in" transitioning elements invisible immediately so that there's no FOUC between now + and the first RAF tick. */ + if ((direction && direction[0] === "In") && propertyMap.opacity !== undefined) { + $.each(elements.nodeType ? [ elements ] : elements, function(i, element) { + Velocity.CSS.setPropertyValue(element, "opacity", 0); + }); + } /* Only trigger animateParentHeight() if we're using an In/Out transition. */ - var direction = effectName.match(/(In|Out)$/); - if (sequenceOptions.animateParentHeight && direction) { - animateParentHeight(elements, direction[0], sequenceDuration + opts.delay, sequenceOptions.stagger); + if (redirectOptions.animateParentHeight && direction) { + animateParentHeight(elements, direction[0], redirectDuration + opts.delay, redirectOptions.stagger); } } } /* If the user isn't overriding the display option, default to "auto" for "In"-suffixed transitions. */ - if (sequenceOptions.display !== null) { - if (sequenceOptions.display !== undefined && sequenceOptions.display !== "none") { - opts.display = sequenceOptions.display; + if (redirectOptions.display !== null) { + if (redirectOptions.display !== undefined && redirectOptions.display !== "none") { + opts.display = redirectOptions.display; } else if (/In$/.test(effectName)) { /* Inline elements cannot be subjected to transforms, so we switch them to inline-block. */ - var defaultDisplay = global.Velocity.CSS.Values.getDisplayType(element); + var defaultDisplay = Velocity.CSS.Values.getDisplayType(element); opts.display = (defaultDisplay === "inline") ? "inline-block" : defaultDisplay; } } - if (sequenceOptions.visibility && sequenceOptions.visibility !== "hidden") { - opts.visibility = sequenceOptions.visibility; + if (redirectOptions.visibility && redirectOptions.visibility !== "hidden") { + opts.visibility = redirectOptions.visibility; } } /* Special processing for the last effect call. */ if (callIndex === properties.calls.length - 1) { - /* Append promise resolving onto the user's sequence callback. */ + /* Append promise resolving onto the user's redirect callback. */ function injectFinalCallbacks () { - if ((sequenceOptions.display === undefined || sequenceOptions.display === "none") && /Out$/.test(effectName)) { - global.Velocity.Utilities.each(elements.nodeType ? [ elements ] : elements, function(i, element) { - global.Velocity.CSS.setPropertyValue(element, "display", "none"); + if ((redirectOptions.display === undefined || redirectOptions.display === "none") && /Out$/.test(effectName)) { + $.each(elements.nodeType ? [ elements ] : elements, function(i, element) { + Velocity.CSS.setPropertyValue(element, "display", "none"); }); } - sequenceOptions.complete && sequenceOptions.complete.call(elements, elements); + redirectOptions.complete && redirectOptions.complete.call(elements, elements); if (promiseData) { promiseData.resolver(elements || element); @@ -142,7 +186,8 @@ return function (global, window, document, undefined) { /* Format each non-array value in the reset property map to [ value, value ] so that changes apply immediately and DOM querying is avoided (via forcefeeding). */ - if (typeof resetValue === "string" || typeof resetValue === "number") { + /* Note: Don't forcefeed hooks, otherwise their hook roots will be defaulted to their null values. */ + if (Velocity.CSS.Hooks.registered[resetProperty] === undefined && (typeof resetValue === "string" || typeof resetValue === "number")) { properties.reset[resetProperty] = [ properties.reset[resetProperty], properties.reset[resetProperty] ]; } } @@ -153,26 +198,26 @@ return function (global, window, document, undefined) { /* Since the reset option uses up the complete callback, we trigger the user's complete callback at the end of ours. */ if (finalElement) { resetOptions.complete = injectFinalCallbacks; - } + } - global.Velocity.animate(element, properties.reset, resetOptions); + Velocity.animate(element, properties.reset, resetOptions); /* Only trigger the user's complete callback on the last effect call with the last element in the set. */ } else if (finalElement) { injectFinalCallbacks(); } }; - if (sequenceOptions.visibility === "hidden") { - opts.visibility = sequenceOptions.visibility; + if (redirectOptions.visibility === "hidden") { + opts.visibility = redirectOptions.visibility; } } - global.Velocity.animate(element, propertyMap, opts); + Velocity.animate(element, propertyMap, opts); } }; /* Return the Velocity object so that RegisterUI calls can be chained. */ - return global.Velocity; + return Velocity; }; /********************* @@ -181,8 +226,8 @@ return function (global, window, document, undefined) { /* Externalize the packagedEffects data so that they can optionally be modified and re-registered. */ /* Support: <=IE8: Callouts will have no effect, and transitions will simply fade in/out. IE9/Android 2.3: Most effects are fully supported, the rest fade in/out. All other browsers: full support. */ - global.Velocity.RegisterUI.packagedEffects = - { + Velocity.RegisterEffect.packagedEffects = + { /* Animate.css */ "callout.bounce": { defaultDuration: 550, @@ -196,7 +241,7 @@ return function (global, window, document, undefined) { /* Animate.css */ "callout.shake": { defaultDuration: 800, - calls: [ + calls: [ [ { translateX: -11 }, 0.125 ], [ { translateX: 11 }, 0.125 ], [ { translateX: -11 }, 0.125 ], @@ -210,7 +255,7 @@ return function (global, window, document, undefined) { /* Animate.css */ "callout.flash": { defaultDuration: 1100, - calls: [ + calls: [ [ { opacity: [ 0, "easeInOutQuad", 1 ] }, 0.25 ], [ { opacity: [ 1, "easeInOutQuad" ] }, 0.25 ], [ { opacity: [ 0, "easeInOutQuad" ] }, 0.25 ], @@ -220,15 +265,15 @@ return function (global, window, document, undefined) { /* Animate.css */ "callout.pulse": { defaultDuration: 825, - calls: [ - [ { scaleX: 1.1, scaleY: 1.1 }, 0.50 ], + calls: [ + [ { scaleX: 1.1, scaleY: 1.1 }, 0.50, { easing: "easeInExpo" } ], [ { scaleX: 1, scaleY: 1 }, 0.50 ] ] }, /* Animate.css */ "callout.swing": { defaultDuration: 950, - calls: [ + calls: [ [ { rotateZ: 15 }, 0.20 ], [ { rotateZ: -10 }, 0.20 ], [ { rotateZ: 5 }, 0.20 ], @@ -239,7 +284,7 @@ return function (global, window, document, undefined) { /* Animate.css */ "callout.tada": { defaultDuration: 1000, - calls: [ + calls: [ [ { scaleX: 0.9, scaleY: 0.9, rotateZ: -3 }, 0.10 ], [ { scaleX: 1.1, scaleY: 1.1, rotateZ: 3 }, 0.10 ], [ { scaleX: 1.1, scaleY: 1.1, rotateZ: -3 }, 0.10 ], @@ -266,7 +311,7 @@ return function (global, window, document, undefined) { /* Support: Loses rotation in IE9/Android 2.3 (fades only). */ "transition.flipXIn": { defaultDuration: 700, - calls: [ + calls: [ [ { opacity: [ 1, 0 ], transformPerspective: [ 800, 800 ], rotateY: [ 0, -55 ] } ] ], reset: { transformPerspective: 0 } @@ -274,7 +319,7 @@ return function (global, window, document, undefined) { /* Support: Loses rotation in IE9/Android 2.3 (fades only). */ "transition.flipXOut": { defaultDuration: 700, - calls: [ + calls: [ [ { opacity: [ 0, 1 ], transformPerspective: [ 800, 800 ], rotateY: 55 } ] ], reset: { transformPerspective: 0, rotateY: 0 } @@ -282,7 +327,7 @@ return function (global, window, document, undefined) { /* Support: Loses rotation in IE9/Android 2.3 (fades only). */ "transition.flipYIn": { defaultDuration: 800, - calls: [ + calls: [ [ { opacity: [ 1, 0 ], transformPerspective: [ 800, 800 ], rotateX: [ 0, -45 ] } ] ], reset: { transformPerspective: 0 } @@ -290,7 +335,7 @@ return function (global, window, document, undefined) { /* Support: Loses rotation in IE9/Android 2.3 (fades only). */ "transition.flipYOut": { defaultDuration: 800, - calls: [ + calls: [ [ { opacity: [ 0, 1 ], transformPerspective: [ 800, 800 ], rotateX: 25 } ] ], reset: { transformPerspective: 0, rotateX: 0 } @@ -299,7 +344,7 @@ return function (global, window, document, undefined) { /* Support: Loses rotation in IE9/Android 2.3 (fades only). */ "transition.flipBounceXIn": { defaultDuration: 900, - calls: [ + calls: [ [ { opacity: [ 0.725, 0 ], transformPerspective: [ 400, 400 ], rotateY: [ -10, 90 ] }, 0.50 ], [ { opacity: 0.80, rotateY: 10 }, 0.25 ], [ { opacity: 1, rotateY: 0 }, 0.25 ] @@ -310,7 +355,7 @@ return function (global, window, document, undefined) { /* Support: Loses rotation in IE9/Android 2.3 (fades only). */ "transition.flipBounceXOut": { defaultDuration: 800, - calls: [ + calls: [ [ { opacity: [ 0.9, 1 ], transformPerspective: [ 400, 400 ], rotateY: -10 }, 0.50 ], [ { opacity: 0, rotateY: 90 }, 0.50 ] ], @@ -320,7 +365,7 @@ return function (global, window, document, undefined) { /* Support: Loses rotation in IE9/Android 2.3 (fades only). */ "transition.flipBounceYIn": { defaultDuration: 850, - calls: [ + calls: [ [ { opacity: [ 0.725, 0 ], transformPerspective: [ 400, 400 ], rotateX: [ -10, 90 ] }, 0.50 ], [ { opacity: 0.80, rotateX: 10 }, 0.25 ], [ { opacity: 1, rotateX: 0 }, 0.25 ] @@ -331,7 +376,7 @@ return function (global, window, document, undefined) { /* Support: Loses rotation in IE9/Android 2.3 (fades only). */ "transition.flipBounceYOut": { defaultDuration: 800, - calls: [ + calls: [ [ { opacity: [ 0.9, 1 ], transformPerspective: [ 400, 400 ], rotateX: -15 }, 0.50 ], [ { opacity: 0, rotateX: 90 }, 0.50 ] ], @@ -340,7 +385,7 @@ return function (global, window, document, undefined) { /* Magic.css */ "transition.swoopIn": { defaultDuration: 850, - calls: [ + calls: [ [ { opacity: [ 1, 0 ], transformOriginX: [ "100%", "50%" ], transformOriginY: [ "100%", "100%" ], scaleX: [ 1, 0 ], scaleY: [ 1, 0 ], translateX: [ 0, -700 ], translateZ: 0 } ] ], reset: { transformOriginX: "50%", transformOriginY: "50%" } @@ -348,7 +393,7 @@ return function (global, window, document, undefined) { /* Magic.css */ "transition.swoopOut": { defaultDuration: 850, - calls: [ + calls: [ [ { opacity: [ 0, 1 ], transformOriginX: [ "50%", "100%" ], transformOriginY: [ "100%", "100%" ], scaleX: 0, scaleY: 0, translateX: -700, translateZ: 0 } ] ], reset: { transformOriginX: "50%", transformOriginY: "50%", scaleX: 1, scaleY: 1, translateX: 0 } @@ -356,42 +401,42 @@ return function (global, window, document, undefined) { /* Magic.css */ /* Support: Loses rotation in IE9/Android 2.3. (Fades and scales only.) */ "transition.whirlIn": { - defaultDuration: 900, - calls: [ - [ { opacity: [ 1, 0 ], transformOriginX: [ "50%", "50%" ], transformOriginY: [ "50%", "50%" ], scaleX: [ 1, 0 ], scaleY: [ 1, 0 ], rotateY: [ 0, 160 ] } ] + defaultDuration: 850, + calls: [ + [ { opacity: [ 1, 0 ], transformOriginX: [ "50%", "50%" ], transformOriginY: [ "50%", "50%" ], scaleX: [ 1, 0 ], scaleY: [ 1, 0 ], rotateY: [ 0, 160 ] }, 1, { easing: "easeInOutSine" } ] ] }, /* Magic.css */ /* Support: Loses rotation in IE9/Android 2.3. (Fades and scales only.) */ "transition.whirlOut": { - defaultDuration: 900, - calls: [ - [ { opacity: [ 0, 1 ], transformOriginX: [ "50%", "50%" ], transformOriginY: [ "50%", "50%" ], scaleX: 0, scaleY: 0, rotateY: 160 } ] + defaultDuration: 750, + calls: [ + [ { opacity: [ 0, "easeInOutQuint", 1 ], transformOriginX: [ "50%", "50%" ], transformOriginY: [ "50%", "50%" ], scaleX: 0, scaleY: 0, rotateY: 160 }, 1, { easing: "swing" } ] ], reset: { scaleX: 1, scaleY: 1, rotateY: 0 } }, "transition.shrinkIn": { - defaultDuration: 700, - calls: [ + defaultDuration: 750, + calls: [ [ { opacity: [ 1, 0 ], transformOriginX: [ "50%", "50%" ], transformOriginY: [ "50%", "50%" ], scaleX: [ 1, 1.5 ], scaleY: [ 1, 1.5 ], translateZ: 0 } ] ] }, "transition.shrinkOut": { - defaultDuration: 650, - calls: [ + defaultDuration: 600, + calls: [ [ { opacity: [ 0, 1 ], transformOriginX: [ "50%", "50%" ], transformOriginY: [ "50%", "50%" ], scaleX: 1.3, scaleY: 1.3, translateZ: 0 } ] ], reset: { scaleX: 1, scaleY: 1 } }, "transition.expandIn": { defaultDuration: 700, - calls: [ + calls: [ [ { opacity: [ 1, 0 ], transformOriginX: [ "50%", "50%" ], transformOriginY: [ "50%", "50%" ], scaleX: [ 1, 0.625 ], scaleY: [ 1, 0.625 ], translateZ: 0 } ] ] }, "transition.expandOut": { defaultDuration: 700, - calls: [ + calls: [ [ { opacity: [ 0, 1 ], transformOriginX: [ "50%", "50%" ], transformOriginY: [ "50%", "50%" ], scaleX: 0.5, scaleY: 0.5, translateZ: 0 } ] ], reset: { scaleX: 1, scaleY: 1 } @@ -399,7 +444,7 @@ return function (global, window, document, undefined) { /* Animate.css */ "transition.bounceIn": { defaultDuration: 800, - calls: [ + calls: [ [ { opacity: [ 1, 0 ], scaleX: [ 1.05, 0.3 ], scaleY: [ 1.05, 0.3 ] }, 0.40 ], [ { scaleX: 0.9, scaleY: 0.9, translateZ: 0 }, 0.20 ], [ { scaleX: 1, scaleY: 1 }, 0.50 ] @@ -408,17 +453,17 @@ return function (global, window, document, undefined) { /* Animate.css */ "transition.bounceOut": { defaultDuration: 800, - calls: [ - [ { scaleX: 0.95, scaleY: 0.95 }, 0.40 ], - [ { scaleX: 1.1, scaleY: 1.1, translateZ: 0 }, 0.40 ], - [ { opacity: [ 0, 1 ], scaleX: 0.3, scaleY: 0.3 }, 0.20 ] + calls: [ + [ { scaleX: 0.95, scaleY: 0.95 }, 0.35 ], + [ { scaleX: 1.1, scaleY: 1.1, translateZ: 0 }, 0.35 ], + [ { opacity: [ 0, 1 ], scaleX: 0.3, scaleY: 0.3 }, 0.30 ] ], reset: { scaleX: 1, scaleY: 1 } }, /* Animate.css */ "transition.bounceUpIn": { defaultDuration: 800, - calls: [ + calls: [ [ { opacity: [ 1, 0 ], translateY: [ -30, 1000 ] }, 0.60, { easing: "easeOutCirc" } ], [ { translateY: 10 }, 0.20 ], [ { translateY: 0 }, 0.20 ] @@ -427,7 +472,7 @@ return function (global, window, document, undefined) { /* Animate.css */ "transition.bounceUpOut": { defaultDuration: 1000, - calls: [ + calls: [ [ { translateY: 20 }, 0.20 ], [ { opacity: [ 0, "easeInCirc", 1 ], translateY: -1000 }, 0.80 ] ], @@ -436,7 +481,7 @@ return function (global, window, document, undefined) { /* Animate.css */ "transition.bounceDownIn": { defaultDuration: 800, - calls: [ + calls: [ [ { opacity: [ 1, 0 ], translateY: [ 30, -1000 ] }, 0.60, { easing: "easeOutCirc" } ], [ { translateY: -10 }, 0.20 ], [ { translateY: 0 }, 0.20 ] @@ -445,7 +490,7 @@ return function (global, window, document, undefined) { /* Animate.css */ "transition.bounceDownOut": { defaultDuration: 1000, - calls: [ + calls: [ [ { translateY: -20 }, 0.20 ], [ { opacity: [ 0, "easeInCirc", 1 ], translateY: 1000 }, 0.80 ] ], @@ -454,7 +499,7 @@ return function (global, window, document, undefined) { /* Animate.css */ "transition.bounceLeftIn": { defaultDuration: 750, - calls: [ + calls: [ [ { opacity: [ 1, 0 ], translateX: [ 30, -1250 ] }, 0.60, { easing: "easeOutCirc" } ], [ { translateX: -10 }, 0.20 ], [ { translateX: 0 }, 0.20 ] @@ -463,7 +508,7 @@ return function (global, window, document, undefined) { /* Animate.css */ "transition.bounceLeftOut": { defaultDuration: 750, - calls: [ + calls: [ [ { translateX: 30 }, 0.20 ], [ { opacity: [ 0, "easeInCirc", 1 ], translateX: -1250 }, 0.80 ] ], @@ -472,7 +517,7 @@ return function (global, window, document, undefined) { /* Animate.css */ "transition.bounceRightIn": { defaultDuration: 750, - calls: [ + calls: [ [ { opacity: [ 1, 0 ], translateX: [ -30, 1250 ] }, 0.60, { easing: "easeOutCirc" } ], [ { translateX: 10 }, 0.20 ], [ { translateX: 0 }, 0.20 ] @@ -481,7 +526,7 @@ return function (global, window, document, undefined) { /* Animate.css */ "transition.bounceRightOut": { defaultDuration: 750, - calls: [ + calls: [ [ { translateX: -30 }, 0.20 ], [ { opacity: [ 0, "easeInCirc", 1 ], translateX: 1250 }, 0.80 ] ], @@ -489,104 +534,104 @@ return function (global, window, document, undefined) { }, "transition.slideUpIn": { defaultDuration: 900, - calls: [ + calls: [ [ { opacity: [ 1, 0 ], translateY: [ 0, 20 ], translateZ: 0 } ] ] }, "transition.slideUpOut": { defaultDuration: 900, - calls: [ + calls: [ [ { opacity: [ 0, 1 ], translateY: -20, translateZ: 0 } ] ], reset: { translateY: 0 } }, "transition.slideDownIn": { defaultDuration: 900, - calls: [ + calls: [ [ { opacity: [ 1, 0 ], translateY: [ 0, -20 ], translateZ: 0 } ] ] }, "transition.slideDownOut": { defaultDuration: 900, - calls: [ + calls: [ [ { opacity: [ 0, 1 ], translateY: 20, translateZ: 0 } ] ], reset: { translateY: 0 } }, "transition.slideLeftIn": { defaultDuration: 1000, - calls: [ + calls: [ [ { opacity: [ 1, 0 ], translateX: [ 0, -20 ], translateZ: 0 } ] ] }, "transition.slideLeftOut": { defaultDuration: 1050, - calls: [ + calls: [ [ { opacity: [ 0, 1 ], translateX: -20, translateZ: 0 } ] ], reset: { translateX: 0 } }, "transition.slideRightIn": { defaultDuration: 1000, - calls: [ + calls: [ [ { opacity: [ 1, 0 ], translateX: [ 0, 20 ], translateZ: 0 } ] ] }, "transition.slideRightOut": { defaultDuration: 1050, - calls: [ + calls: [ [ { opacity: [ 0, 1 ], translateX: 20, translateZ: 0 } ] ], reset: { translateX: 0 } }, "transition.slideUpBigIn": { defaultDuration: 850, - calls: [ + calls: [ [ { opacity: [ 1, 0 ], translateY: [ 0, 75 ], translateZ: 0 } ] ] }, "transition.slideUpBigOut": { defaultDuration: 800, - calls: [ + calls: [ [ { opacity: [ 0, 1 ], translateY: -75, translateZ: 0 } ] ], reset: { translateY: 0 } }, "transition.slideDownBigIn": { defaultDuration: 850, - calls: [ + calls: [ [ { opacity: [ 1, 0 ], translateY: [ 0, -75 ], translateZ: 0 } ] ] }, "transition.slideDownBigOut": { defaultDuration: 800, - calls: [ + calls: [ [ { opacity: [ 0, 1 ], translateY: 75, translateZ: 0 } ] ], reset: { translateY: 0 } }, "transition.slideLeftBigIn": { defaultDuration: 800, - calls: [ + calls: [ [ { opacity: [ 1, 0 ], translateX: [ 0, -75 ], translateZ: 0 } ] ] }, "transition.slideLeftBigOut": { defaultDuration: 750, - calls: [ + calls: [ [ { opacity: [ 0, 1 ], translateX: -75, translateZ: 0 } ] ], reset: { translateX: 0 } }, "transition.slideRightBigIn": { defaultDuration: 800, - calls: [ + calls: [ [ { opacity: [ 1, 0 ], translateX: [ 0, 75 ], translateZ: 0 } ] ] }, "transition.slideRightBigOut": { defaultDuration: 750, - calls: [ + calls: [ [ { opacity: [ 0, 1 ], translateX: 75, translateZ: 0 } ] ], reset: { translateX: 0 } @@ -594,16 +639,15 @@ return function (global, window, document, undefined) { /* Magic.css */ "transition.perspectiveUpIn": { defaultDuration: 800, - calls: [ + calls: [ [ { opacity: [ 1, 0 ], transformPerspective: [ 800, 800 ], transformOriginX: [ 0, 0 ], transformOriginY: [ "100%", "100%" ], rotateX: [ 0, -180 ] } ] - ], - reset: { transformPerspective: 0, transformOriginX: "50%", transformOriginY: "50%" } + ] }, /* Magic.css */ /* Support: Loses rotation in IE9/Android 2.3 (fades only). */ "transition.perspectiveUpOut": { defaultDuration: 850, - calls: [ + calls: [ [ { opacity: [ 0, 1 ], transformPerspective: [ 800, 800 ], transformOriginX: [ 0, 0 ], transformOriginY: [ "100%", "100%" ], rotateX: -180 } ] ], reset: { transformPerspective: 0, transformOriginX: "50%", transformOriginY: "50%", rotateX: 0 } @@ -612,7 +656,7 @@ return function (global, window, document, undefined) { /* Support: Loses rotation in IE9/Android 2.3 (fades only). */ "transition.perspectiveDownIn": { defaultDuration: 800, - calls: [ + calls: [ [ { opacity: [ 1, 0 ], transformPerspective: [ 800, 800 ], transformOriginX: [ 0, 0 ], transformOriginY: [ 0, 0 ], rotateX: [ 0, 180 ] } ] ], reset: { transformPerspective: 0, transformOriginX: "50%", transformOriginY: "50%" } @@ -621,7 +665,7 @@ return function (global, window, document, undefined) { /* Support: Loses rotation in IE9/Android 2.3 (fades only). */ "transition.perspectiveDownOut": { defaultDuration: 850, - calls: [ + calls: [ [ { opacity: [ 0, 1 ], transformPerspective: [ 800, 800 ], transformOriginX: [ 0, 0 ], transformOriginY: [ 0, 0 ], rotateX: 180 } ] ], reset: { transformPerspective: 0, transformOriginX: "50%", transformOriginY: "50%", rotateX: 0 } @@ -630,7 +674,7 @@ return function (global, window, document, undefined) { /* Support: Loses rotation in IE9/Android 2.3 (fades only). */ "transition.perspectiveLeftIn": { defaultDuration: 950, - calls: [ + calls: [ [ { opacity: [ 1, 0 ], transformPerspective: [ 2000, 2000 ], transformOriginX: [ 0, 0 ], transformOriginY: [ 0, 0 ], rotateY: [ 0, -180 ] } ] ], reset: { transformPerspective: 0, transformOriginX: "50%", transformOriginY: "50%" } @@ -639,7 +683,7 @@ return function (global, window, document, undefined) { /* Support: Loses rotation in IE9/Android 2.3 (fades only). */ "transition.perspectiveLeftOut": { defaultDuration: 950, - calls: [ + calls: [ [ { opacity: [ 0, 1 ], transformPerspective: [ 2000, 2000 ], transformOriginX: [ 0, 0 ], transformOriginY: [ 0, 0 ], rotateY: -180 } ] ], reset: { transformPerspective: 0, transformOriginX: "50%", transformOriginY: "50%", rotateY: 0 } @@ -648,7 +692,7 @@ return function (global, window, document, undefined) { /* Support: Loses rotation in IE9/Android 2.3 (fades only). */ "transition.perspectiveRightIn": { defaultDuration: 950, - calls: [ + calls: [ [ { opacity: [ 1, 0 ], transformPerspective: [ 2000, 2000 ], transformOriginX: [ "100%", "100%" ], transformOriginY: [ 0, 0 ], rotateY: [ 0, 180 ] } ] ], reset: { transformPerspective: 0, transformOriginX: "50%", transformOriginY: "50%" } @@ -657,7 +701,7 @@ return function (global, window, document, undefined) { /* Support: Loses rotation in IE9/Android 2.3 (fades only). */ "transition.perspectiveRightOut": { defaultDuration: 950, - calls: [ + calls: [ [ { opacity: [ 0, 1 ], transformPerspective: [ 2000, 2000 ], transformOriginX: [ "100%", "100%" ], transformOriginY: [ 0, 0 ], rotateY: 180 } ] ], reset: { transformPerspective: 0, transformOriginX: "50%", transformOriginY: "50%", rotateY: 0 } @@ -665,8 +709,46 @@ return function (global, window, document, undefined) { }; /* Register the packaged effects. */ - for (var effectName in global.Velocity.RegisterUI.packagedEffects) { - global.Velocity.RegisterUI(effectName, global.Velocity.RegisterUI.packagedEffects[effectName]); + for (var effectName in Velocity.RegisterEffect.packagedEffects) { + Velocity.RegisterEffect(effectName, Velocity.RegisterEffect.packagedEffects[effectName]); } + + /********************* + Sequence Running + **********************/ + + /* Note: Sequence calls must use Velocity's single-object arguments syntax. */ + Velocity.RunSequence = function (originalSequence) { + var sequence = $.extend(true, [], originalSequence); + + if (sequence.length > 1) { + $.each(sequence.reverse(), function(i, currentCall) { + var nextCall = sequence[i + 1]; + + if (nextCall) { + /* Parallel sequence calls (indicated via sequenceQueue:false) are triggered + in the previous call's begin callback. Otherwise, chained calls are normally triggered + in the previous call's complete callback. */ + var timing = (currentCall.options && currentCall.options.sequenceQueue === false) ? "begin" : "complete", + callbackOriginal = nextCall.options && nextCall.options[timing], + options = {}; + + options[timing] = function() { + var nextCallElements = nextCall.elements || nextCall.e; + var elements = nextCallElements.nodeType ? [ nextCallElements ] : nextCallElements; + + callbackOriginal && callbackOriginal.call(elements, elements); + Velocity(currentCall); + } + + nextCall.options = $.extend({}, nextCall.options, options); + } + }); + + sequence.reverse(); + } + + Velocity(sequence[0]); + }; }((window.jQuery || window.Zepto || window), window, document); })); \ No newline at end of file From df1fd1f64638c52977a1891e2ad142c48649ad38 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Thu, 15 Jan 2015 01:13:08 +0100 Subject: [PATCH 36/75] add article Read More prototype --- .../app/controllers/layout_ref.js.coffee | 20 ++++++- .../layout_ref/communication_overview.jst.eco | 20 ++++++- app/assets/stylesheets/zammad.css.scss | 57 +++++++++++++++---- 3 files changed, 84 insertions(+), 13 deletions(-) diff --git a/app/assets/javascripts/app/controllers/layout_ref.js.coffee b/app/assets/javascripts/app/controllers/layout_ref.js.coffee index 61aadbc29..ef40756a4 100644 --- a/app/assets/javascripts/app/controllers/layout_ref.js.coffee +++ b/app/assets/javascripts/app/controllers/layout_ref.js.coffee @@ -104,6 +104,8 @@ App.Config.set( 'layout_ref/content', Content, 'Routes' ) class CommunicationOverview extends App.ControllerContent + events: + 'click .js-unfold': 'unfold' constructor: -> super @@ -116,6 +118,22 @@ class CommunicationOverview extends App.ControllerContent scrollHolder = pageHeader.scrollParent() scrollBody = scrollHolder.get(0).scrollHeight - scrollHolder.height() + unfold: (e) -> + container = $(e.currentTarget).parents('.textBubble-content') + + container.find('.textBubble-overflowContainer').velocity + properties: + opacity: 0 + options: + duration: 300 + + container.velocity + properties: + height: container.attr('data-height') + options: + duration: 300 + complete: -> container.parents('.textBubble').removeClass('is-overflowing') + render: -> @html App.view('layout_ref/communication_overview')() @@ -133,7 +151,7 @@ class LayoutRefCommunicationReply extends App.ControllerContent '.attachmentUpload': 'attachmentUpload' '.attachmentUpload-progressBar':'progressBar' '.js-percentage': 'progressText' - '.text-bubble': 'textBubble' + '.textBubble': 'textBubble' events: 'focus .js-textarea': 'open_textarea' diff --git a/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco b/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco index b9a593f07..63d52cbe5 100644 --- a/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco @@ -196,12 +196,30 @@ Grüße, Peter
    -
    Lieber HP,
    +
    +
    Lieber HP,
    anbei findest du die Midi Noten für Maria Maria "I Like it Loud".
    Wünsche dir einen guten Auftritt in Hamburg.

    +Deine Frau bekommt ein Kind haben wir gehört.
    +Gratulation dazu! Wir schicken dir was liebes.
    +
    +Und wenn du noch mal Probleme mit der Stimme hast sag bescheid – ich kenn da ein Wundermittel.
    +
    +Das ist eine Pille von einem Druiden aus dem Bayerischen Wald. Die ölt einem so richtig die Stimmbänder.
    +
    +Verwende ich immer wenn ich meine Frau anschreien will. Die macht meinen Tenor richtig zum Löwen.
    +
    +Ach ja und dein Freund Tim. Richt dem mal aus dass er das doch bitte sein lassen soll mit den Anrufen.
    +
    Ich weiß schon dass ich ein hübscher bin. Aber ich hab ihm schon tausend mal gesagt, dass ich seine Gefühle leider nicht erwiedern kann.
    +
    +Bin verheiratet, hab Kind. Is doch offensichtlich, Junge!
    Alles gute,
    Oliver
    +
    +
    See More
    +
    +

    2 <%- @T('Attached Files') %>

    diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 3d842fae7..2b17be820 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -3121,7 +3121,7 @@ footer { display: none; } - .text-bubble { + .textBubble { padding: 10px 20px; background: white; border-radius: 2px; @@ -3130,32 +3130,67 @@ footer { position: relative; overflow-wrap: break-word; word-wrap: break-word; - } - + /* email css reset */ - .text-bubble p { + p { margin: 0; } - .text-bubble blockquote, - .text-bubble pre - { + blockquote, + pre { margin: 0px; padding: 8px 12px 8px 12px; } + } + .ticket-article-item.state--folde-out .textBubble { + border-color: hsl(0,0%,90%); + } - .ticket-article-item.state--folde-out .text-bubble { - border-color: hsl(0,0%,90%); + .textBubble-content { + overflow: hidden; + position: relative; + } + + .is-overflowing .textBubble-overflowContainer { + position: absolute; + bottom: 0; + left: 0; + right: 0; + background: white; + + .btn { + padding: 7px 0; } - .customer.ticket-article-item .text-bubble { + &:before { + content: ""; + position: absolute; + left: 0; + right: 0; + top: -30px; + height: 30px; + background: linear-gradient(transparent, white); + } + } + + .customer .is-overflowing .textBubble-overflowContainer { + background: #e5f0f5; + &:before { + background: linear-gradient(transparent, #e5f0f5); + } + } + + .customer.ticket-article-item .textBubble { background: #e5f0f5; border-color: hsl(199,38%,92%); box-shadow: none; + &.is-overflowing:after { + background: linear-gradient(transparent, #e5f0f5 60px); + } } - .customer.ticket-article-item.state--folde-out .text-bubble { + .customer.ticket-article-item.state--folde-out .textBubble { border-color: hsl(199,44%,85%); } From 4efebb9b1dd2d03203b055cb2c7a788029e786a6 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Thu, 15 Jan 2015 01:26:19 +0100 Subject: [PATCH 37/75] simplyfy Read More --- .../javascripts/app/controllers/layout_ref.js.coffee | 5 +++-- .../app/views/layout_ref/communication_overview.jst.eco | 2 +- app/assets/stylesheets/zammad.css.scss | 7 ++----- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/app/controllers/layout_ref.js.coffee b/app/assets/javascripts/app/controllers/layout_ref.js.coffee index ef40756a4..789cfecda 100644 --- a/app/assets/javascripts/app/controllers/layout_ref.js.coffee +++ b/app/assets/javascripts/app/controllers/layout_ref.js.coffee @@ -120,8 +120,9 @@ class CommunicationOverview extends App.ControllerContent unfold: (e) -> container = $(e.currentTarget).parents('.textBubble-content') + overflowContainer = container.find('.textBubble-overflowContainer') - container.find('.textBubble-overflowContainer').velocity + overflowContainer.velocity properties: opacity: 0 options: @@ -132,7 +133,7 @@ class CommunicationOverview extends App.ControllerContent height: container.attr('data-height') options: duration: 300 - complete: -> container.parents('.textBubble').removeClass('is-overflowing') + complete: -> overflowContainer.addClass('hide'); render: -> @html App.view('layout_ref/communication_overview')() diff --git a/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco b/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco index 63d52cbe5..0dab231b9 100644 --- a/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco @@ -196,7 +196,7 @@ Grüße, Peter
    -
    +
    Lieber HP,
    anbei findest du die Midi Noten für Maria Maria "I Like it Loud".
    Wünsche dir einen guten Auftritt in Hamburg.
    diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 2b17be820..9be8242a4 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -3152,7 +3152,7 @@ footer { position: relative; } - .is-overflowing .textBubble-overflowContainer { + .textBubble-overflowContainer { position: absolute; bottom: 0; left: 0; @@ -3174,7 +3174,7 @@ footer { } } - .customer .is-overflowing .textBubble-overflowContainer { + .customer .textBubble-overflowContainer { background: #e5f0f5; &:before { background: linear-gradient(transparent, #e5f0f5); @@ -3185,9 +3185,6 @@ footer { background: #e5f0f5; border-color: hsl(199,38%,92%); box-shadow: none; - &.is-overflowing:after { - background: linear-gradient(transparent, #e5f0f5 60px); - } } .customer.ticket-article-item.state--folde-out .textBubble { From fe42d16383b130ce6a72bf087c731e76297a695e Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Thu, 15 Jan 2015 10:07:06 +0100 Subject: [PATCH 38/75] add local modal Usage: new option "container" [jquery element] (default: body) if the modal should be local the container should be the content element. Demo: Merge Ticket in Ticket Zoom => new App.TicketMerge in ticket_zoom.js.coffee:332 --- .../_application_controller.js.coffee | 5 + .../app/controllers/layout_ref.js.coffee | 11 + .../app/controllers/ticket_zoom.js.coffee | 5 +- .../javascripts/app/lib/bootstrap/modal.js | 25 +- .../app/views/layout_ref/index.jst.eco | 1 + .../app/views/layout_ref/local_modal.jst.eco | 537 ++++++++++++++++++ app/assets/javascripts/application.js | 3 + app/assets/stylesheets/zammad.css.scss | 16 + 8 files changed, 593 insertions(+), 10 deletions(-) create mode 100644 app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco diff --git a/app/assets/javascripts/app/controllers/_application_controller.js.coffee b/app/assets/javascripts/app/controllers/_application_controller.js.coffee index 245fb52ed..078e3dd82 100644 --- a/app/assets/javascripts/app/controllers/_application_controller.js.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller.js.coffee @@ -500,6 +500,7 @@ class App.ControllerModal extends App.Controller head: '?' buttonClass: 'btn--success' centerButtons: [] + container: null options = _.extend( defaults, options ) @@ -526,10 +527,14 @@ class App.ControllerModal extends App.Controller if @content @body.html @content + if @container + @el.addClass('modal--local') + @el.modal keyboard: @keyboard show: true backdrop: @backdrop + container: @container .on 'show.bs.modal': @onShow 'shown.bs.modal': @onShown diff --git a/app/assets/javascripts/app/controllers/layout_ref.js.coffee b/app/assets/javascripts/app/controllers/layout_ref.js.coffee index 789cfecda..82cee0451 100644 --- a/app/assets/javascripts/app/controllers/layout_ref.js.coffee +++ b/app/assets/javascripts/app/controllers/layout_ref.js.coffee @@ -732,4 +732,15 @@ class RichText extends App.ControllerContent App.Config.set( 'layout_ref/richtext', RichText, 'Routes' ) +class LocalModalRef extends App.ControllerContent + + constructor: -> + super + @render() + + render: -> + @html App.view('layout_ref/local_modal')() + +App.Config.set( 'layout_ref/local_modal', LocalModalRef, 'Routes' ) + App.Config.set( 'LayoutRef', { prio: 1700, parent: '#current_user', name: 'Layout Reference', target: '#layout_ref', role: [ 'Admin' ] }, 'NavBarRight' ) \ No newline at end of file diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee index 01bb6618b..631c095fd 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee @@ -329,7 +329,10 @@ class App.TicketZoom extends App.Controller showTicketHistory = => new App.TicketHistory( ticket_id: @ticket.id ) showTicketMerge = => - new App.TicketMerge( ticket: @ticket, task_key: @task_key ) + new App.TicketMerge + ticket: @ticket + task_key: @task_key + container: @el changeCustomer = (e, el) => new App.TicketCustomer( ticket: @ticket diff --git a/app/assets/javascripts/app/lib/bootstrap/modal.js b/app/assets/javascripts/app/lib/bootstrap/modal.js index 93891aa4e..6db63d443 100644 --- a/app/assets/javascripts/app/lib/bootstrap/modal.js +++ b/app/assets/javascripts/app/lib/bootstrap/modal.js @@ -6,6 +6,12 @@ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ + /* + modified by Felix Jan-2014 + - change $body to $container + - add this.$container = $(options.container || document.body) +*/ + +function ($) { 'use strict'; @@ -15,7 +21,7 @@ var Modal = function (element, options) { this.options = options - this.$body = $(document.body) + this.$container = $(options.container || document.body) this.$element = $(element) this.$backdrop = this.isShown = null @@ -57,7 +63,8 @@ this.checkScrollbar() this.setScrollbar() - this.$body.addClass('modal-open') + + this.$container.addClass('modal-open') this.escape() this.resize() @@ -68,7 +75,7 @@ var transition = $.support.transition && that.$element.hasClass('fade') if (!that.$element.parent().length) { - that.$element.appendTo(that.$body) // don't move modals dom position + that.$element.appendTo(that.$container) // don't move modals dom position } that.$element @@ -160,7 +167,7 @@ var that = this this.$element.hide() this.backdrop(function () { - that.$body.removeClass('modal-open') + that.$container.removeClass('modal-open') that.resetAdjustments() that.resetScrollbar() that.$element.trigger('hidden.bs.modal') @@ -253,20 +260,20 @@ } Modal.prototype.setScrollbar = function () { - var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10) - if (this.bodyIsOverflowing) this.$body.css('padding-right', bodyPad + this.scrollbarWidth) + var bodyPad = parseInt((this.$container.css('padding-right') || 0), 10) + if (this.bodyIsOverflowing) this.$container.css('padding-right', bodyPad + this.scrollbarWidth) } Modal.prototype.resetScrollbar = function () { - this.$body.css('padding-right', '') + this.$container.css('padding-right', '') } Modal.prototype.measureScrollbar = function () { // thx walsh var scrollDiv = document.createElement('div') scrollDiv.className = 'modal-scrollbar-measure' - this.$body.append(scrollDiv) + this.$container.append(scrollDiv) var scrollbarWidth = scrollDiv.offsetWidth - scrollDiv.clientWidth - this.$body[0].removeChild(scrollDiv) + this.$container[0].removeChild(scrollDiv) return scrollbarWidth } diff --git a/app/assets/javascripts/app/views/layout_ref/index.jst.eco b/app/assets/javascripts/app/views/layout_ref/index.jst.eco index ae9c4d412..8b8b8928f 100644 --- a/app/assets/javascripts/app/views/layout_ref/index.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/index.jst.eco @@ -19,6 +19,7 @@
  • Organization Profile
  • Setup Wizard
  • Richtext
    • +
  • Local Modal
    • \ No newline at end of file diff --git a/app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco b/app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco new file mode 100644 index 000000000..7f685341e --- /dev/null +++ b/app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco @@ -0,0 +1,537 @@ +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +

    Edit Customer

    +
    +
    +
    +
    +
    + + + + +
    +
    + + + + +
    +
    +
    + + + + +
    +
    + + + + +
    +
    +
    + + + + +
    +
    + + + + +
    +
    +
    + + + + +
    +
    + + + + +
    +
    +
    + + + + +
    +
    + + + + +
    +
    +
    + + + + +
    +
    + + + + +
    +
    +
    + + + + +
    +
    + + + + +
    +
    +
    + + + + +
    +
    + +
    +
    + + + + +
    +
    +
    + + + + +
    +
    + + + + +
    +
    +
    + + + + +
    +
    + + + + +
    +
    +
    + + + + +
    +
    + + + + +
    +
    +
    + + + + +
    +
    + + + + +
    +
    +
    + + + + +
    +
    + + + + +
    +
    +
    + + + + +
    +
    + + + + +
    +
    +
    + + + + +
    +
    +
    + +
    +
    +
    +
    + + + + +
    +
    +
    + + + + +
    +
    + + + + + + + +
    + + + + +
    +
    +
    + + + + +
    +
    + + + +
    + + + + +
    +
    +
    + + + + +
    +
    + +
    +
    + + + + +
    +
    +
    +
    +
    + Cancel & Go Back + +
    +
    +
    +
    +
    + +
    +
    +
    + + +
    +
    +

    Doreen Kubiak

    +
    Steuerbüro C. Kaik
    +
    +
    +
    +
    + + doreen.kubiak@gmail.com +
    +
    + + Steuerbüro C. Kaik +
    +
    + + chaik.com +
    +
    + + Johannitergasse 2/2 +
    +
    + + +43 5522 36346 +
    +
    + + 6800 Feldkirch +
    +
    + + +43 699 4565789 +
    +
    + + Österreich +
    +
    +
    +
    + +
    +
    Tickets von Doreen Kubiak
    +
    Tickets von Steuerbüro C. Kaik
    +
    + +
    +
    + +
    +
    + Keine offenen Tickets +
    + Alle Tickets von Doreen Kubiak … +
    +
    + +
      +
    1. +
      +
      +
      +
      +
      Micro-SIM doesn't work
      +
      23 minutes ago
      +
      +
    2. +
      +
      +
      +
      +
      Superb Service!
      +
      43 minutes ago
      +
      +
    3. +
      +
      +
      +
      +
      Print sheets strip off
      +
      1 hour ago
      +
      +
    4. +
      +
      +
      +
      +
      Block not properly wrought
      +
      2 hour ago
      +
      +
    + Alle Tickets von Steuerbüro C. Kaik … +
    +
    +
    +
    +
    +

    Status

    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    Tickets of my Group: 78 of 234
    +
    Average: 22%
    +
    +
    +

    Stimmung

    +
    +
    +
    +
    3% of my tickets escalated.
    +
    Average: 17%
    +
    +
    +
    +
    +

    Frequency

    +
    +
    +
    +
    +
    +
    +
    Jan
    +
    +
    +
    +
    +
    +
    +
    Feb
    +
    +
    +
    +
    +
    +
    +
    Mär
    +
    +
    +
    +
    +
    +
    +
    Apr
    +
    +
    +
    +
    +
    +
    +
    Mai
    +
    +
    +
    +
    +
    +
    +
    Jun
    +
    +
    +
    +
    +
    +
    +
    Jul
    +
    +
    +
    +
    +
    +
    +
    Aug
    +
    +
    +
    +
    +
    +
    +
    Sep
    +
    +
    +
    +
    +
    +
    +
    Okt
    +
    +
    +
    +
    +
    +
    +
    Nov
    +
    +
    +
    +
    +
    +
    +
    Dez
    +
    +
    +
    +
    Bearbeitet
    +
    Offen
    +
    +
    +
    +
    +
    \ No newline at end of file diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index a286bf89f..1fd527660 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -26,7 +26,10 @@ //= require ./app/lib/bootstrap/tooltip.js //= require ./app/lib/bootstrap/popover.js //= require ./app/lib/bootstrap/popover-enhance.js + +// modified by Felix Jan-2014 //= require ./app/lib/bootstrap/modal.js + //= require ./app/lib/bootstrap/tab.js //= require ./app/lib/bootstrap/transition.js //= require ./app/lib/bootstrap/button.js diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 9be8242a4..a68b47334 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -4070,6 +4070,22 @@ footer { border: none; } +.modal.modal--local { + display: block; + padding-left: 40px; + position: absolute; + overflow: auto; + background: hsla(210,17%,98%,.55); + + .modal-backdrop { + display: none; + } + + .modal-dialog { + box-shadow: 0 0 40px hsla(210,17%,40%,.34); + } +} + .caret { position: absolute; top: 50%; From 0b84217682f1ac4cc602c4ce0e29be2354d057d0 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Thu, 15 Jan 2015 10:58:20 +0100 Subject: [PATCH 39/75] add loading icon to loading tabs --- .../javascripts/app/controllers/taskbar_widget.js.coffee | 1 + app/assets/stylesheets/zammad.css.scss | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/app/assets/javascripts/app/controllers/taskbar_widget.js.coffee b/app/assets/javascripts/app/controllers/taskbar_widget.js.coffee index c2495436e..8eaa14778 100644 --- a/app/assets/javascripts/app/controllers/taskbar_widget.js.coffee +++ b/app/assets/javascripts/app/controllers/taskbar_widget.js.coffee @@ -29,6 +29,7 @@ class App.TaskbarWidget extends App.Controller data = url: '#' id: false + iconClass: 'loading' title: App.i18n.translateInline('Loading...') head: App.i18n.translateInline('Loading...') worker = App.TaskManager.worker( task.key ) diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index a68b47334..72e531966 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -2070,6 +2070,11 @@ footer { .tasks-navigation .icon-holder .icon { margin-right: 3px; margin-top: -3px; + + &.loading { + width: 14px; + height: 14px; + } } .task:hover { From 4e65b331a39354538dbabc6f107e29b9e0fa6bcd Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Thu, 15 Jan 2015 11:12:02 +0100 Subject: [PATCH 40/75] loading ticket screen layout reference --- .../app/controllers/layout_ref.js.coffee | 11 +++++++++++ .../javascripts/app/views/layout_ref/index.jst.eco | 1 + .../views/layout_ref/loading_placeholder.jst.eco | 3 +++ app/assets/stylesheets/zammad.css.scss | 13 ++++++++++++- 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 app/assets/javascripts/app/views/layout_ref/loading_placeholder.jst.eco diff --git a/app/assets/javascripts/app/controllers/layout_ref.js.coffee b/app/assets/javascripts/app/controllers/layout_ref.js.coffee index 82cee0451..7d159b806 100644 --- a/app/assets/javascripts/app/controllers/layout_ref.js.coffee +++ b/app/assets/javascripts/app/controllers/layout_ref.js.coffee @@ -743,4 +743,15 @@ class LocalModalRef extends App.ControllerContent App.Config.set( 'layout_ref/local_modal', LocalModalRef, 'Routes' ) +class loadingPlaceholderRef extends App.ControllerContent + + constructor: -> + super + @render() + + render: -> + @html App.view('layout_ref/loading_placeholder')() + +App.Config.set( 'layout_ref/loading_placeholder', loadingPlaceholderRef, 'Routes' ) + App.Config.set( 'LayoutRef', { prio: 1700, parent: '#current_user', name: 'Layout Reference', target: '#layout_ref', role: [ 'Admin' ] }, 'NavBarRight' ) \ No newline at end of file diff --git a/app/assets/javascripts/app/views/layout_ref/index.jst.eco b/app/assets/javascripts/app/views/layout_ref/index.jst.eco index 8b8b8928f..e261f2e0b 100644 --- a/app/assets/javascripts/app/views/layout_ref/index.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/index.jst.eco @@ -20,6 +20,7 @@
  • Setup Wizard
  • Richtext
  • Local Modal
    • +
  • Loading Placeholder
    • \ No newline at end of file diff --git a/app/assets/javascripts/app/views/layout_ref/loading_placeholder.jst.eco b/app/assets/javascripts/app/views/layout_ref/loading_placeholder.jst.eco new file mode 100644 index 000000000..91d4063bd --- /dev/null +++ b/app/assets/javascripts/app/views/layout_ref/loading_placeholder.jst.eco @@ -0,0 +1,3 @@ +
    +

    Loading Ticket

    +
    \ No newline at end of file diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 72e531966..f1537070b 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -766,6 +766,18 @@ textarea, z-index: 1; } +.loadingPlaceholder { + @extend .centered; + + .icon { + margin: -5px 14px 0 0; + } + + h2 { + margin: 0; + } +} + .form-stacked .checkbox label { color: inherit; font-size: 13px; @@ -774,7 +786,6 @@ textarea, letter-spacing: inherit; } - .pagination { margin: 0; } From 3b85bda73d1012d21e0c97e9ddfd7e5c3b63b6ad Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Thu, 15 Jan 2015 11:19:51 +0100 Subject: [PATCH 41/75] insufficient rights warning layout reference hint: use the error class for the icon in the tabs list --- .../javascripts/app/controllers/layout_ref.js.coffee | 11 +++++++++++ .../javascripts/app/views/layout_ref/index.jst.eco | 1 + .../app/views/layout_ref/insufficient_rights.jst.eco | 3 +++ .../app/views/layout_ref/loading_placeholder.jst.eco | 2 +- app/assets/stylesheets/zammad.css.scss | 2 +- 5 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 app/assets/javascripts/app/views/layout_ref/insufficient_rights.jst.eco diff --git a/app/assets/javascripts/app/controllers/layout_ref.js.coffee b/app/assets/javascripts/app/controllers/layout_ref.js.coffee index 7d159b806..ce1433073 100644 --- a/app/assets/javascripts/app/controllers/layout_ref.js.coffee +++ b/app/assets/javascripts/app/controllers/layout_ref.js.coffee @@ -754,4 +754,15 @@ class loadingPlaceholderRef extends App.ControllerContent App.Config.set( 'layout_ref/loading_placeholder', loadingPlaceholderRef, 'Routes' ) +class insufficientRightsRef extends App.ControllerContent + + constructor: -> + super + @render() + + render: -> + @html App.view('layout_ref/insufficient_rights')() + +App.Config.set( 'layout_ref/insufficient_rights', insufficientRightsRef, 'Routes' ) + App.Config.set( 'LayoutRef', { prio: 1700, parent: '#current_user', name: 'Layout Reference', target: '#layout_ref', role: [ 'Admin' ] }, 'NavBarRight' ) \ No newline at end of file diff --git a/app/assets/javascripts/app/views/layout_ref/index.jst.eco b/app/assets/javascripts/app/views/layout_ref/index.jst.eco index e261f2e0b..6305abbf3 100644 --- a/app/assets/javascripts/app/views/layout_ref/index.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/index.jst.eco @@ -21,6 +21,7 @@
  • Richtext
  • Local Modal
  • Loading Placeholder
    • +
  • Insufficient Rights Warning
    • \ No newline at end of file diff --git a/app/assets/javascripts/app/views/layout_ref/insufficient_rights.jst.eco b/app/assets/javascripts/app/views/layout_ref/insufficient_rights.jst.eco new file mode 100644 index 000000000..49d6fba85 --- /dev/null +++ b/app/assets/javascripts/app/views/layout_ref/insufficient_rights.jst.eco @@ -0,0 +1,3 @@ +
    +

    Opps.. I'm sorry, but you have insufficient rights to open this ticket.

    +
    \ No newline at end of file diff --git a/app/assets/javascripts/app/views/layout_ref/loading_placeholder.jst.eco b/app/assets/javascripts/app/views/layout_ref/loading_placeholder.jst.eco index 91d4063bd..ca1b84ef7 100644 --- a/app/assets/javascripts/app/views/layout_ref/loading_placeholder.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/loading_placeholder.jst.eco @@ -1,3 +1,3 @@ -
    +

    Loading Ticket

    \ No newline at end of file diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index f1537070b..bba9f4883 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -766,7 +766,7 @@ textarea, z-index: 1; } -.loadingPlaceholder { +.fullscreenMessage { @extend .centered; .icon { From 592b418473a43a65cc850840d77154f612d294d0 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Thu, 15 Jan 2015 12:01:04 +0100 Subject: [PATCH 42/75] simplyfy modal.js changes --- .../javascripts/app/lib/bootstrap/modal.js | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/app/assets/javascripts/app/lib/bootstrap/modal.js b/app/assets/javascripts/app/lib/bootstrap/modal.js index 6db63d443..5c059a2fe 100644 --- a/app/assets/javascripts/app/lib/bootstrap/modal.js +++ b/app/assets/javascripts/app/lib/bootstrap/modal.js @@ -8,8 +8,7 @@ /* modified by Felix Jan-2014 - - change $body to $container - - add this.$container = $(options.container || document.body) + - add this.$body = $(options.container || document.body) */ @@ -21,7 +20,7 @@ var Modal = function (element, options) { this.options = options - this.$container = $(options.container || document.body) + this.$body = $(options.container || document.body) this.$element = $(element) this.$backdrop = this.isShown = null @@ -64,7 +63,7 @@ this.checkScrollbar() this.setScrollbar() - this.$container.addClass('modal-open') + this.$body.addClass('modal-open') this.escape() this.resize() @@ -75,7 +74,7 @@ var transition = $.support.transition && that.$element.hasClass('fade') if (!that.$element.parent().length) { - that.$element.appendTo(that.$container) // don't move modals dom position + that.$element.appendTo(that.$body) // don't move modals dom position } that.$element @@ -167,7 +166,7 @@ var that = this this.$element.hide() this.backdrop(function () { - that.$container.removeClass('modal-open') + that.$body.removeClass('modal-open') that.resetAdjustments() that.resetScrollbar() that.$element.trigger('hidden.bs.modal') @@ -260,20 +259,20 @@ } Modal.prototype.setScrollbar = function () { - var bodyPad = parseInt((this.$container.css('padding-right') || 0), 10) - if (this.bodyIsOverflowing) this.$container.css('padding-right', bodyPad + this.scrollbarWidth) + var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10) + if (this.bodyIsOverflowing) this.$body.css('padding-right', bodyPad + this.scrollbarWidth) } Modal.prototype.resetScrollbar = function () { - this.$container.css('padding-right', '') + this.$body.css('padding-right', '') } Modal.prototype.measureScrollbar = function () { // thx walsh var scrollDiv = document.createElement('div') scrollDiv.className = 'modal-scrollbar-measure' - this.$container.append(scrollDiv) + this.$body.append(scrollDiv) var scrollbarWidth = scrollDiv.offsetWidth - scrollDiv.clientWidth - this.$container[0].removeChild(scrollDiv) + this.$body[0].removeChild(scrollDiv) return scrollbarWidth } From d4cb8a6b5759d48b4a21d22f6298ed138d42f5dc Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Thu, 15 Jan 2015 12:01:17 +0100 Subject: [PATCH 43/75] adjust error icon size in sidebar tabs --- app/assets/stylesheets/zammad.css.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index bba9f4883..eb9276542 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -2086,6 +2086,10 @@ footer { width: 14px; height: 14px; } + + &.error { + transform: scale(0.85); + } } .task:hover { From c593ecf01e5341062af5634c2b1d087fedf1e402 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Fri, 16 Jan 2015 12:40:15 +0100 Subject: [PATCH 44/75] add padding to fullscreenMessage to don't stick to the sides of the content container when the text is long or the container small --- app/assets/stylesheets/zammad.css.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index eb9276542..1c968909f 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -767,6 +767,7 @@ textarea, } .fullscreenMessage { + padding: 22px; @extend .centered; .icon { From 749dcdba30e21afd124f46a6dfd2f16515639b8b Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Fri, 16 Jan 2015 12:41:52 +0100 Subject: [PATCH 45/75] fix FF bug in Ticket Zoom Header and clean up a bit --- app/assets/javascripts/app/views/ticket_zoom.jst.eco | 4 ++-- app/assets/stylesheets/zammad.css.scss | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/app/views/ticket_zoom.jst.eco b/app/assets/javascripts/app/views/ticket_zoom.jst.eco index 42a814cd0..ac6160cc8 100644 --- a/app/assets/javascripts/app/views/ticket_zoom.jst.eco +++ b/app/assets/javascripts/app/views/ticket_zoom.jst.eco @@ -1,9 +1,9 @@
    -
    +
    <%- @C('ticket_hook') %> <%- @ticket.number %> -
    +
    1/36
    diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 1c968909f..1ce69c509 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -789,6 +789,7 @@ textarea, .pagination { margin: 0; + @extend .horizontal; } .pagination > li > a, @@ -4399,6 +4400,10 @@ footer { } .scrollPageHeader { + // @extend .tabsSidebar-sidebarSpacer; + @extend .zIndex-6; + @extend .horizontal; + @extend .center; background: white; border-bottom: 1px solid hsl(0,0%,78%); height: 64px; @@ -4418,6 +4423,8 @@ footer { .scrollPageHeader .ticket-title { max-width: initial; padding: 0; + min-width: 0; + @extend .flex; } .scrollPageHeader h1 { From c0c108dba6b7b99fff20e0e85419ed9d7c68df67 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Fri, 16 Jan 2015 12:59:33 +0100 Subject: [PATCH 46/75] fix heigh in reset password in FF MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit and fix navigation glitch when going back from reset or signup to #login (before that back links went to #/, leading to the sidebar blinking up because of the redirect delay – hardwired them to go back to #login [if there is a nother case to go back to it should be set via js]). --- app/assets/javascripts/app/views/password/reset.jst.eco | 2 +- app/assets/javascripts/app/views/signup.jst.eco | 2 +- app/assets/stylesheets/zammad.css.scss | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/app/views/password/reset.jst.eco b/app/assets/javascripts/app/views/password/reset.jst.eco index de43a6e9c..7ec97d400 100644 --- a/app/assets/javascripts/app/views/password/reset.jst.eco +++ b/app/assets/javascripts/app/views/password/reset.jst.eco @@ -10,7 +10,7 @@
    - <%- @T( 'Cancel & Go Back' ) %> + <%- @T( 'Cancel & Go Back' ) %>
    diff --git a/app/assets/javascripts/app/views/signup.jst.eco b/app/assets/javascripts/app/views/signup.jst.eco index 35b473ce7..a7e095378 100644 --- a/app/assets/javascripts/app/views/signup.jst.eco +++ b/app/assets/javascripts/app/views/signup.jst.eco @@ -4,7 +4,7 @@

    <%- @T( 'Join' ) %> <%= @C( 'product_name' ) %>

    - <%- @T( 'Cancel & Go Back' ) %> + <%- @T( 'Cancel & Go Back' ) %>
    diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 1ce69c509..59ad672b4 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -993,6 +993,7 @@ textarea, @extend .fit; display: table; width: 100%; + height: 100%; min-height: 100vh; } @@ -4400,7 +4401,7 @@ footer { } .scrollPageHeader { - // @extend .tabsSidebar-sidebarSpacer; + @extend .tabsSidebar-sidebarSpacer; @extend .zIndex-6; @extend .horizontal; @extend .center; From 2d37a7421eb4fe5d0cc4508a2e3167df172bfc6c Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Fri, 16 Jan 2015 13:45:44 +0100 Subject: [PATCH 47/75] fix main navigation hover and active state --- app/assets/stylesheets/zammad.css.scss | 19 ++++++++++--------- public/assets/images/sprite.svg | 12 ++++++------ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 59ad672b4..4c2a9a31e 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -1976,7 +1976,7 @@ footer { .navigation { width: 260px; - background: #26272e; + background: hsl(232,10%,16%); position: relative; } @@ -1998,16 +1998,17 @@ footer { text-decoration: none; } - .main-navigation > li.active > a, - .main-navigation > li > a:hover, - .main-navigation > li > a:focus { - background: none; - color: #F0FAFF; + .main-navigation > li > a:hover { + background: hsl(230,10%,13%); + border-bottom-color: rgba(240, 250, 255, .08); } - .main-navigation > li.active > a .icon, - .main-navigation > li > a:hover .icon, - .main-navigation > li > a:focus .icon { + .main-navigation > li.active > a { + background: none; + color: white; + } + + .main-navigation > li.active > a .icon { opacity: 1; } diff --git a/public/assets/images/sprite.svg b/public/assets/images/sprite.svg index 13361b646..dae98acea 100644 --- a/public/assets/images/sprite.svg +++ b/public/assets/images/sprite.svg @@ -16,12 +16,12 @@ - - - - - - + + + + + + From ec891bf0cd949fa468400522cb10f79435e023d7 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Fri, 16 Jan 2015 17:33:42 +0100 Subject: [PATCH 48/75] Show long values in multiple lines. --- app/assets/stylesheets/zammad.css.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 4c2a9a31e..c51b7f2ea 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -2506,7 +2506,8 @@ footer { .sidebar-block { margin: 20px 0; - + word-wrap: break-word; + &:first-child { margin-top: 0; } From a25e977edc5dd8d4eb035fa90747debbb53f1b6e Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Fri, 16 Jan 2015 17:37:43 +0100 Subject: [PATCH 49/75] Show long values in multiple lines. --- app/assets/stylesheets/zammad.css.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index c51b7f2ea..6bf9c33ea 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -4844,6 +4844,7 @@ label + .wizard-buttonList { .profile-details { margin-left: -50px; + word-wrap: break-word; } .profile-ticketsPlaceholder { From a400ae32621682e8980c8a8e9b91c2c01097787d Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Sat, 17 Jan 2015 12:56:24 +0100 Subject: [PATCH 50/75] Improved split of tickets. --- .../app/controllers/agent_ticket_create.js.coffee | 7 ++++++- .../javascripts/app/controllers/ticket_zoom.js.coffee | 10 +++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee b/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee index 5347ddd79..52cc296ff 100644 --- a/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee +++ b/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee @@ -173,7 +173,12 @@ class App.TicketCreate extends App.Controller t.owner_id = 0 t.customer_id_completion = a.from t.subject = a.subject || t.title - t.body = a.body + + # convert non text/html from text 2 html + if a.content_type.match(/\/html/) + t.body = a.body + else + t.body = App.Utils.text2html( a.body ) # render page @render( options: t ) diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee index 631c095fd..2d61a9cbc 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee @@ -1653,11 +1653,11 @@ class Article extends App.Controller type: 'replyAll' href: '#' } - actions.push { - name: 'split' - type: 'split' - href: '#ticket/create/' + @article.ticket_id + '/' + @article.id - } + actions.push { + name: 'split' + type: 'split' + href: '#ticket/create/' + @article.ticket_id + '/' + @article.id + } @article.actions = actions attachments: -> From c92e4c0f9a3c2c65ee1e65b41406d4c0eff043f7 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Sat, 17 Jan 2015 13:07:51 +0100 Subject: [PATCH 51/75] Improved style of error messages. --- .../javascripts/app/controllers/ticket_zoom.js.coffee | 9 +++++---- .../javascripts/app/views/generic/error/generic.jst.eco | 4 ++-- .../app/views/generic/error/not_found.jst.eco | 5 ++--- .../app/views/generic/error/unauthorized.jst.eco | 5 ++--- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee index 2d61a9cbc..ce0a8bd97 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee @@ -119,10 +119,10 @@ class App.TicketZoom extends App.Controller # show error message if xhr.status is 401 || error is 'Unauthorized' @taskTitle = '» ' + App.i18n.translateInline('Unauthorized') + ' «' - @html App.view('generic/error/unauthorized')() + @html App.view('generic/error/unauthorized')( objectName: 'Ticket' ) else if xhr.status is 404 || error is 'Not Found' @taskTitle = '» ' + App.i18n.translateInline('Not Found') + ' «' - @html App.view('generic/error/not_found')() + @html App.view('generic/error/not_found')( objectName: 'Ticket' ) else @taskTitle = '» ' + App.i18n.translateInline('Error') + ' «' status = xhr.status @@ -130,8 +130,9 @@ class App.TicketZoom extends App.Controller if !status && !detail detail = 'General communication error, maybe internet is not available!' @html App.view('generic/error/generic')( - status: status - detail: detail + status: status + detail: detail + objectName: 'Ticket' ) # update current task title diff --git a/app/assets/javascripts/app/views/generic/error/generic.jst.eco b/app/assets/javascripts/app/views/generic/error/generic.jst.eco index 2726085f4..746df4876 100644 --- a/app/assets/javascripts/app/views/generic/error/generic.jst.eco +++ b/app/assets/javascripts/app/views/generic/error/generic.jst.eco @@ -1,5 +1,5 @@ -
    -

    <%- @T('Error') %>

    +
    +

    <%- @T('Opps.. I\'m sorry, something went wrong!' ) %>

    <%- @T('Status Code') %>: <%= @status %>

    <%= @detail %>

    \ No newline at end of file diff --git a/app/assets/javascripts/app/views/generic/error/not_found.jst.eco b/app/assets/javascripts/app/views/generic/error/not_found.jst.eco index 8c2fb0c44..4353b61c7 100644 --- a/app/assets/javascripts/app/views/generic/error/not_found.jst.eco +++ b/app/assets/javascripts/app/views/generic/error/not_found.jst.eco @@ -1,4 +1,3 @@ -
    -

    <%- @T('Not Found') %>

    -

    <%- @T('Sorry, unable to find this ressource.') %>

    +
    +

    <%- @T('Opps.. I\'m sorry, but I can\'t find this %s.', @objectName ) %>

    \ No newline at end of file diff --git a/app/assets/javascripts/app/views/generic/error/unauthorized.jst.eco b/app/assets/javascripts/app/views/generic/error/unauthorized.jst.eco index d24fcb524..094403ee1 100644 --- a/app/assets/javascripts/app/views/generic/error/unauthorized.jst.eco +++ b/app/assets/javascripts/app/views/generic/error/unauthorized.jst.eco @@ -1,4 +1,3 @@ -
    -

    <%- @T('Unauthorized') %>

    -

    <%- @T('Sorry, you are not allowed to access this ressource.') %>

    +
    +

    <%- @T('Opps.. I\'m sorry, but you have insufficient rights to open this %s.', @objectName ) %>

    \ No newline at end of file From 4d1f55ee6b2e9de5ee32b0fe1c166f4aeb20e837 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Sat, 17 Jan 2015 16:30:49 +0100 Subject: [PATCH 52/75] Implemented "see more" feature. --- .../app/controllers/layout_ref.js.coffee | 12 +++++ .../app/controllers/ticket_zoom.js.coffee | 46 ++++++++++++++++--- .../layout_ref/communication_overview.jst.eco | 39 ++++++++++------ .../views/ticket_zoom/article_view.jst.eco | 5 ++ 4 files changed, 80 insertions(+), 22 deletions(-) diff --git a/app/assets/javascripts/app/controllers/layout_ref.js.coffee b/app/assets/javascripts/app/controllers/layout_ref.js.coffee index ce1433073..9ff018978 100644 --- a/app/assets/javascripts/app/controllers/layout_ref.js.coffee +++ b/app/assets/javascripts/app/controllers/layout_ref.js.coffee @@ -138,6 +138,18 @@ class CommunicationOverview extends App.ControllerContent render: -> @html App.view('layout_ref/communication_overview')() + # set see more options + previewHeight = 240 + @$('.textBubble-content').each( (index) -> + bubble = $( @ ) + heigth = bubble.height() + if heigth > (previewHeight + 30) + bubble.attr('data-height', heigth) + bubble.css('height', "#{previewHeight}px") + else + bubble.parent().find('.textBubble-overflowContainer').addClass('hide') + ) + App.Config.set( 'layout_ref/communication_overview', CommunicationOverview, 'Routes' ) diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee index ce0a8bd97..671edc330 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee @@ -440,6 +440,18 @@ class App.TicketZoom extends App.Controller ui: @ ) + # set see more options + previewHeight = 240 + @$('.textBubble-content').each( (index) -> + bubble = $( @ ) + heigth = bubble.height() + if heigth > (previewHeight + 30) + bubble.attr('data-height', heigth) + bubble.css('height', "#{previewHeight}px") + else + bubble.parent().find('.textBubble-overflowContainer').addClass('hide') + ) + # scroll to article if given if @article_id && document.getElementById( 'article-' + @article_id ) offset = document.getElementById( 'article-' + @article_id ).offsetTop @@ -1278,13 +1290,14 @@ class Edit extends App.Controller class ArticleView extends App.Controller events: - 'click [data-type=public]': 'public_internal' - 'click [data-type=internal]': 'public_internal' - 'click .show_toogle': 'show_toogle' - 'click [data-type=reply]': 'reply' - 'click [data-type=replyAll]': 'replyAll' - 'click .textBubble': 'toggle_meta_with_delay' - 'click .textBubble a': 'stopPropagation' + 'click [data-type=public]': 'public_internal' + 'click [data-type=internal]': 'public_internal' + 'click .show_toogle': 'show_toogle' + 'click [data-type=reply]': 'reply' + 'click [data-type=replyAll]': 'replyAll' + 'click .textBubble': 'toggle_meta_with_delay' + 'click .textBubble a': 'stopPropagation' + 'click .js-unfold': 'unfold' constructor: -> super @@ -1434,6 +1447,25 @@ class ArticleView extends App.Controller metaTopClip.velocity({ height: metaTop.outerHeight() }, animSpeed, 'easeOutQuad') metaBottomClip.velocity({ height: metaBottom.outerHeight() }, animSpeed, 'easeOutQuad') + unfold: (e) -> + e.preventDefault() + e.stopPropagation() + container = $(e.currentTarget).parents('.textBubble-content') + overflowContainer = container.find('.textBubble-overflowContainer') + + overflowContainer.velocity + properties: + opacity: 0 + options: + duration: 300 + + container.velocity + properties: + height: container.attr('data-height') + options: + duration: 300 + complete: -> overflowContainer.addClass('hide'); + isOrContains: (node, container) -> while node if node is container diff --git a/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco b/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco index 0dab231b9..3803f941d 100644 --- a/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco @@ -58,17 +58,24 @@
    NB
    -
    Welcome! - -Thank you for installing Zammad. - -You will find updates and patches at http://zammad.org/. Online -documentation is available at http://guides.zammad.org/. You can also -use our forums at http://forums.zammad.org/ - -Regards, -See more
    -The Zammad.org Project
    +
    +
    +
    +Welcome! +
    +Thank you for installing Zammad.
    +
    +You will find updates and patches at http://zammad.org/. Online
    +documentation is available at http://guides.zammad.org/. You can also
    +use our forums at http://forums.zammad.org/
    +
    +Regards,
    +The Zammad.org Project +
    +
    <%- @T('See more') %>
    +
    +
    +
    @@ -196,8 +203,9 @@ Grüße, Peter
    -
    -
    Lieber HP,
    +
    +
    +
    Lieber HP,
    anbei findest du die Midi Noten für Maria Maria "I Like it Loud".
    Wünsche dir einen guten Auftritt in Hamburg.

    @@ -217,7 +225,7 @@ Bin verheiratet, hab Kind. Is doch offensichtlich, Junge!
    Alles gute,
    Oliver
    -
    See More
    +
    <%- @T('See more') %>
    @@ -231,7 +239,8 @@ Oliver
    lyrics_I_Like_it_Loud.txt
    17.1kb
    -
    +
    +
    diff --git a/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco index 723db1630..bbd619500 100644 --- a/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco +++ b/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco @@ -44,7 +44,12 @@
    +
    <%- article.html %> +
    +
    <%- @T('See more') %>
    +
    +
    <% if !_.isEmpty( article.attachments ): %>
    From f672a930019b0d60947be8d2fc401d5db4ff7215 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Sun, 18 Jan 2015 23:43:16 +0100 Subject: [PATCH 53/75] Improved contentediable. Just rework content on past, not on every key press. --- .../app/lib/base/jquery.contenteditable.js | 141 ++++++------------ 1 file changed, 46 insertions(+), 95 deletions(-) diff --git a/app/assets/javascripts/app/lib/base/jquery.contenteditable.js b/app/assets/javascripts/app/lib/base/jquery.contenteditable.js index f47e1ac43..ee1d5ac8c 100644 --- a/app/assets/javascripts/app/lib/base/jquery.contenteditable.js +++ b/app/assets/javascripts/app/lib/base/jquery.contenteditable.js @@ -25,6 +25,7 @@ 40: true, // left 91: true, // cmd left 92: true, // cmd right + 224: true, // cmd left }, extraAllowKey: { 65: true, // a + ctrl - select all @@ -38,6 +39,7 @@ 73: true, // i 85: true, // u }, + //maxlength: 20, }; function Plugin( element, options ) { @@ -58,13 +60,9 @@ this.preventInput = false this.init(); - // bind - - // bind paste } - Plugin.prototype.init = function () { var _this = this @@ -84,98 +82,55 @@ e.preventDefault() return } - // limit check - if ( !_this.maxLengthOk( true ) ) { + } + + // limit check + if ( !_this.allowKey(e) ) { + if ( !_this.maxLengthOk( 1 ) ) { e.preventDefault() return } } }) - this.$element.on('keyup', function (e) { - console.log('KU', e.ctrlKey) - // do not remove tags on space, enter or backspace key, it's needed for FF - if ( _this.options.mode === 'textonly' ) { - if ( !_this.options.multiline ) { - - // do tricky this for FF - if ( e.keyCode !== 32 && e.keyCode !== 13 && e.keyCode !== 8 ) { - - // start request to remove tags - _this.htmlRemoveTags() - } - else { - - // clear request to delete tags, in FF we need
    anytime at the end - _this.htmlRemoveTagsClearClearTimeout() - } - } - else { - App.Utils.htmlRemoveRichtext(_this.$element) - } - } - else { - App.Utils.htmlClanup(_this.$element) - } - }) - - // just paste text this.$element.on('paste', function (e) { console.log('paste') + + // check existing + paste text for limit + var text + if (window.clipboardData) { // IE + text = window.clipboardData.getData('Text') + } + else { + text = (e.originalEvent || e).clipboardData.getData('text/plain') + } + + if ( !_this.maxLengthOk( text.length) ) { + e.preventDefault() + return + } + + // use setTimeout() with 0 to execute it right after paste event if ( _this.options.mode === 'textonly' ) { if ( !_this.options.multiline ) { - _this.htmlRemoveTags() + setTimeout($.proxy(function(){ + App.Utils.htmlRemoveTags(this.$element) + }, _this), 0) } else { - App.Utils.htmlRemoveRichtext(_this.$element) + setTimeout($.proxy(function(){ + App.Utils.htmlRemoveRichtext(this.$element) + }, _this), 0) } } else { - App.Utils.htmlClanup(_this.$element) + setTimeout($.proxy(function(){ + App.Utils.htmlClanup(this.$element) + }, _this), 0) } + return true - if ( this.options.mode === 'textonly' ) { - e.preventDefault() - var text - if (window.clipboardData) { // IE - text = window.clipboardData.getData('Text') - } - else { - text = (e.originalEvent || e).clipboardData.getData('text/plain') - } - var overlimit = false - if (text) { - - // replace new lines - if ( !_this.options.multiline ) { - text = text.replace(/\n/g, '') - text = text.replace(/\r/g, '') - text = text.replace(/\t/g, '') - } - - // limit length, limit paste string - if ( _this.options.maxlength ) { - var pasteLength = text.length - var currentLength = _this.$element.text().length - var overSize = ( currentLength + pasteLength ) - _this.options.maxlength - if ( overSize > 0 ) { - text = text.substr( 0, pasteLength - overSize ) - overlimit = true - } - } - - // insert new text - if (document.selection) { // IE - var range = document.selection.createRange() - range.pasteHTML(text) - } - else { - document.execCommand('inserttext', false, text) - } - _this.maxLengthOk( overlimit ) - } - } }) // disable rich text b/u/i @@ -188,23 +143,15 @@ } } - // check if rich text key is pressed - Plugin.prototype.htmlRemoveTags = function() { - - // clear old clear request - this.htmlRemoveTagsClearClearTimeout() - - // set new clear request - this._setTimeOutReformat = setTimeout($.proxy(function(){ - App.Utils.htmlRemoveTags(this.$element) - }, this), 100) - console.log('htmlRemoveTagsClearSetTimeout', this._setTimeOutReformat) - } - Plugin.prototype.htmlRemoveTagsClearClearTimeout = function() { - if (this._setTimeOutReformat) { - console.log('htmlRemoveTagsClearClearTimeout', this._setTimeOutReformat) - clearTimeout(this._setTimeOutReformat) + // check if key is allowed, even if length limit is reached + Plugin.prototype.allowKey = function(e) { + if ( this.options.allowKey[ e.keyCode ] ) { + return true } + if ( ( e.ctrlKey || e.metaKey ) && this.options.extraAllowKey[ e.keyCode ] ) { + return true + } + return false } // check if rich text key is pressed @@ -225,10 +172,14 @@ // max length check Plugin.prototype.maxLengthOk = function(typeAhead) { + if ( !this.options.maxlength ) { + return true + } var length = this.$element.text().length if (typeAhead) { - length = length + 1 + length = length + typeAhead } + console.log('maxLengthOk', length, this.options.maxlength) if ( length > this.options.maxlength ) { // try to set error on framework form From bb1c476db170d049e31beb91fb443454764f907f Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Mon, 19 Jan 2015 22:55:38 +0100 Subject: [PATCH 54/75] Improved/fixed use of text modules. --- .../app/lib/base/jquery.textmodule.js | 147 +++++++++++------- 1 file changed, 87 insertions(+), 60 deletions(-) diff --git a/app/assets/javascripts/app/lib/base/jquery.textmodule.js b/app/assets/javascripts/app/lib/base/jquery.textmodule.js index 989443f39..cc955504e 100644 --- a/app/assets/javascripts/app/lib/base/jquery.textmodule.js +++ b/app/assets/javascripts/app/lib/base/jquery.textmodule.js @@ -22,8 +22,8 @@ this._name = pluginName this.collection = [] - this.active = false - this.buffer = '' + this.active = false + this.buffer = '' // check if ce exists if ( $.data(element, 'plugin_ce') ) { @@ -52,18 +52,22 @@ e.preventDefault() var id = _this.$widget.find('.dropdown-menu li.active a').data('id') _this.take(id) + return } - // arrow keys - if ( e.keyCode === 37 || e.keyCode === 38 || e.keyCode === 39 || e.keyCode === 40 ) { + // arrow keys left/right + if ( e.keyCode === 37 || e.keyCode === 39 ) { e.preventDefault() + return } // up if ( e.keyCode === 38 ) { + e.preventDefault() if ( !_this.$widget.find('.dropdown-menu li.active')[0] ) { var top = _this.$widget.find('.dropdown-menu li').last().addClass('active').position().top _this.$widget.find('.dropdown-menu').scrollTop( top ); + return } else { var prev = _this.$widget.find('.dropdown-menu li.active').removeClass('active').prev() @@ -72,15 +76,17 @@ top = prev.addClass('active').position().top } _this.$widget.find('.dropdown-menu').scrollTop( top ); + return } } // down if ( e.keyCode === 40 ) { + e.preventDefault() if ( !_this.$widget.find('.dropdown-menu li.active')[0] ) { var top = _this.$widget.find('.dropdown-menu li').first().addClass('active').position().top _this.$widget.find('.dropdown-menu').scrollTop( top ); - + return } else { var next = _this.$widget.find('.dropdown-menu li.active').removeClass('active').next() @@ -89,6 +95,7 @@ top = next.addClass('active').position().top } _this.$widget.find('.dropdown-menu').scrollTop( top ); + return } } @@ -100,9 +107,15 @@ // backspace if ( e.keyCode === 8 && _this.buffer ) { + + // backspace + buffer === :: -> close textmodule if ( _this.buffer === '::' ) { _this.close() + e.preventDefault() + return } + + // reduce buffer and show new result var length = _this.buffer.length _this.buffer = _this.buffer.substr( 0, length-1 ) console.log('BS backspace', _this.buffer) @@ -115,22 +128,26 @@ console.log('BUFF', _this.buffer, e.keyCode, String.fromCharCode(e.which) ) // shift - if ( e.keyCode === 16 ) { - return - } + if ( e.keyCode === 16 ) return // enter - if ( e.keyCode === 13 ) { - return - } + if ( e.keyCode === 13 ) return // arrow keys - if ( e.keyCode === 37 || e.keyCode === 38 || e.keyCode === 39 || e.keyCode === 40 ) { - return + if ( e.keyCode === 37 || e.keyCode === 38 || e.keyCode === 39 || e.keyCode === 40 ) return + + // observer other second key + if ( _this.buffer === ':' && String.fromCharCode(e.which) !== ':' ) { + _this.buffer = '' } - // enter : - if ( String.fromCharCode(e.which) === ':' ) { + // oberserve second : + if ( _this.buffer === ':' && String.fromCharCode(e.which) === ':' ) { + _this.buffer = _this.buffer + ':' + } + + // oberserve first : + if ( !_this.buffer && String.fromCharCode(e.which) === ':' ) { _this.buffer = _this.buffer + ':' } @@ -172,57 +189,37 @@ this.$widget = this.$element.next() } - // update widget position + // set height of widget + Plugin.prototype.movePosition = function() { + var height = this.$element.height() + 20 + var widgetHeight = this.$widget.find('ul').height() //+ 60 // + height + var top = -( widgetHeight + height ) + this._position.top + this.$widget.css('top', top) + this.$widget.css('left', this._position.left) + } + + // set position of widget Plugin.prototype.updatePosition = function() { this.$widget.find('.dropdown-menu').scrollTop( 300 ); if ( !this.$element.is(':visible') ) return // get cursor position var marker = '' - - // IE9 and non-IE - sel = window.getSelection(); - if (sel.getRangeAt && sel.rangeCount) { - range = sel.getRangeAt(0); - range.deleteContents(); - - // Range.createContextualFragment() would be useful here but is - // only relatively recently standardized and is not supported in - // some browsers (IE9, for one) - var el = document.createElement("div"); - el.innerHTML = marker; - var frag = document.createDocumentFragment(), node, lastNode; - while ( (node = el.firstChild) ) { - lastNode = frag.appendChild(node); - } - range.insertNode(frag); - - // Preserve the selection - if (lastNode) { - range = range.cloneRange(); - range.setStartAfter(lastNode); - range.collapse(true); - sel.removeAllRanges(); - sel.addRange(range); - } - } - position = $('#js-cursor-position').position() + var range = this.getFirstRange(); + var clone = range.cloneRange() + clone.pasteHtml(marker) + this._position = $('#js-cursor-position').position() $('#js-cursor-position').remove() - if (!position) return + if (!this._position) return // set position of widget - var height = this.$element.height() - var widgetHeight = this.$widget.find('ul').height() //+ 60 // + height - var top = -( widgetHeight + height ) + position.top - this.$widget.css('top', top) - this.$widget.css('left', position.left) + this.movePosition() } // open widget Plugin.prototype.open = function() { this.active = true this.updatePosition() - b = $.proxy(function() { this.$widget.addClass('open') }, this) @@ -231,9 +228,11 @@ // close widget Plugin.prototype.close = function() { - this.active = false - this.cutInput() this.$widget.removeClass('open') + if ( this.active ) { + this.cutInput(true) + } + this.active = false } // check if widget is active/open @@ -255,11 +254,15 @@ // cut some content Plugin.prototype.cut = function(string) { + var range = this.getFirstRange(); + if (!range) return + /* var sel = window.getSelection() if ( !sel || sel.rangeCount < 1) { return } var range = sel.getRangeAt(0) + */ var clone = range.cloneRange() // improve error handling @@ -267,9 +270,34 @@ if (start < 0) { start = 0 } + + // for chrome, remove also leading space, add it later - otherwice space will be tropped + if (start) { + clone.setStart(range.startContainer, start-1) + clone.setEnd(range.startContainer, start) + var spacerChar = clone.toString() + if ( spacerChar === ' ' ) { + start = start - 1 + } + } + //console.log('CUT FOR', string, "-"+clone.toString()+"-", start, range.startOffset) clone.setStart(range.startContainer, start) clone.setEnd(range.startContainer, range.startOffset) clone.deleteContents() + + // for chrome, insert space again + if (start) { + if ( spacerChar === ' ' ) { + string = " " + if (document.selection) { // IE + var range = document.selection.createRange() + range.pasteHTML(string) + } + else { + document.execCommand('insertHTML', false, string) + } + } + } } // select text module and insert into text @@ -291,15 +319,15 @@ return } + Plugin.prototype.getFirstRange = function() { + var sel = rangy.getSelection(); + return sel.rangeCount ? sel.getRangeAt(0) : null; + } + // cut out search string from text Plugin.prototype.cutInput = function() { if (!this.buffer) return if (!this.$element.text()) return - var sel = window.getSelection() - if ( !sel || sel.rangeCount < 1) { - this.buffer = '' - return - } this.cut(this.buffer) this.buffer = '' } @@ -340,10 +368,9 @@ _this.take(id) } ) - this.updatePosition() + this.movePosition() } - $.fn[pluginName] = function ( options ) { return this.each(function () { if (!$.data(this, 'plugin_' + pluginName)) { From 20c5bfd22cadce1bfdab47a7c88cf559377f167b Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Mon, 19 Jan 2015 23:24:20 +0100 Subject: [PATCH 55/75] Improved text modules. --- .../app/lib/base/jquery.textmodule.js | 1 + .../app/lib/base/rangy-textrange.js | 1925 +++++++++++++++++ 2 files changed, 1926 insertions(+) create mode 100755 app/assets/javascripts/app/lib/base/rangy-textrange.js diff --git a/app/assets/javascripts/app/lib/base/jquery.textmodule.js b/app/assets/javascripts/app/lib/base/jquery.textmodule.js index cc955504e..f550cab41 100644 --- a/app/assets/javascripts/app/lib/base/jquery.textmodule.js +++ b/app/assets/javascripts/app/lib/base/jquery.textmodule.js @@ -191,6 +191,7 @@ // set height of widget Plugin.prototype.movePosition = function() { + if (!this._position) return var height = this.$element.height() + 20 var widgetHeight = this.$widget.find('ul').height() //+ 60 // + height var top = -( widgetHeight + height ) + this._position.top diff --git a/app/assets/javascripts/app/lib/base/rangy-textrange.js b/app/assets/javascripts/app/lib/base/rangy-textrange.js new file mode 100755 index 000000000..58d7528b5 --- /dev/null +++ b/app/assets/javascripts/app/lib/base/rangy-textrange.js @@ -0,0 +1,1925 @@ +/** + * Text range module for Rangy. + * Text-based manipulation and searching of ranges and selections. + * + * Features + * + * - Ability to move range boundaries by character or word offsets + * - Customizable word tokenizer + * - Ignores text nodes inside