From 199fb025b9c66984ff07ebe019c65ca2f2a81455 Mon Sep 17 00:00:00 2001 From: hristoterezov Date: Wed, 27 Aug 2014 13:59:28 +0300 Subject: [PATCH] Adds reload button to the input in the welcome page. --- app.js | 15 ++++++-- css/font.css | 4 +++ css/welcome_page.css | 16 +++++++-- fonts/jitsi.eot | Bin 9508 -> 10040 bytes fonts/jitsi.svg | 1 + fonts/jitsi.ttf | Bin 9352 -> 9884 bytes fonts/jitsi.woff | Bin 6100 -> 6396 bytes fonts/selection.json | 82 ++++++++++++++++++++++++++++++------------- index.html | 4 ++- 9 files changed, 92 insertions(+), 30 deletions(-) diff --git a/app.js b/app.js index 741cefc58..ba309dba0 100644 --- a/app.js +++ b/app.js @@ -1048,21 +1048,30 @@ $(document).ready(function () { } }); + var updateTimeout; + var animateTimeout; + $("#reload_roomname").click(function () { + clearTimeout(updateTimeout); + clearTimeout(animateTimeout); + update_roomname(); + }); + function animate(word) { var currentVal = $("#enter_room_field").attr("placeholder"); $("#enter_room_field").attr("placeholder", currentVal + word.substr(0, 1)); - setTimeout(function() { + animateTimeout = setTimeout(function() { animate(word.substring(1, word.length)) - }, 150); + }, 70); } + function update_roomname() { var word = RoomNameGenerator.generateRoomWithoutSeparator(); $("#enter_room_field").attr("room_name", word); $("#enter_room_field").attr("placeholder", ""); animate(word); - setTimeout(update_roomname, 10000); + updateTimeout = setTimeout(update_roomname, 10000); } update_roomname(); diff --git a/css/font.css b/css/font.css index c03b02c0b..e9fe8c2c7 100755 --- a/css/font.css +++ b/css/font.css @@ -99,3 +99,7 @@ .icon-hangup:before { content: "\e617"; } + +.icon-reload:before { + content: "\e618"; +} diff --git a/css/welcome_page.css b/css/welcome_page.css index ced9165a6..75a8a55ad 100644 --- a/css/welcome_page.css +++ b/css/welcome_page.css @@ -64,7 +64,7 @@ #enter_room_field { font-size: 16px; - padding: 15px 5px 10px 10px; + padding: 15px 0px 10px 10px; border: none; -webkit-appearance: none; width: 228px; @@ -99,7 +99,7 @@ #enter_room_container { margin: 70px auto 0px auto; - width:437px; + width:468px; } #enter_room{ @@ -210,4 +210,16 @@ padding-top: 30px; line-height: 22px; font-weight: 200; +} + +#reload_roomname +{ + width: 30px; + height: 19px; + color: #acacac; + margin-top: 22px; + z-index: 3; + float: left; + cursor: pointer; + text-align: center; } \ No newline at end of file diff --git a/fonts/jitsi.eot b/fonts/jitsi.eot index 9aafd530f5b6161d15c3e9bda33e2ca629fe701c..fe5029e8a73ed003b391ee13605947451555fd1e 100755 GIT binary patch delta 784 zcmXw%&ui0Q7{{OI{gpOplQhZNxpm!4vQ{?T)@?Rrjv=TZ9t6S7gNQ40IApa2d)Ptf zpCB{nL3R)kym*^}pa-ww5J69#rYAwKUcBg&YzxoBoA2{H-{+IS`~1?I%c@xe*r{%- zhWNPhbbtG7r|<~?-chcuwOiex<-N}K`*J@Fem(-gE`a}XW4(2Y4gY!w5SD4Ku|Wm# zguNntm2|k#?rlX1zR~Lz>E32%t#xf_^%?2kq!-(*tu9QU1~7ht^w`~2d;RU^^k32! zi80sh-0K0S4pi?aec&v80N?wG>BSG3qd8eKwK zGB*Fq{6Zmg+?wO~X3k)bla6OuQDFOy6S`j2agSR( zm*e>n%O15$rv|*xat4Lea+uKiiVMPV&WJ}iLB#|o4K2Z$DXy8xOCj~FK3pg+R4S2+ zNW+{`2;ymZP36fUh2mV0T?yKtvLqOvX-!O?AJ9!nKPZ)D=tEkaORBFFXF0CMy*&h?HX30fuu!5e6{1AOP0a7v4>4@edeuBk1`Y pEZ;dg<2^sZkyr#>!Ri2UFIaF2E2(n?CFD{AiwooK?w8;S{s&KyX@md( delta 252 zcmdntx5SH0MU{b}LuDeH8B3)v_t%LI`GRK|7#Q{daYAx#Vu4iXnY@VyWaY>aR5a@nq)SgQq5xo00$pG6aWAK diff --git a/fonts/jitsi.svg b/fonts/jitsi.svg index 2e319a98a..6f504253b 100755 --- a/fonts/jitsi.svg +++ b/fonts/jitsi.svg @@ -31,4 +31,5 @@ + \ No newline at end of file diff --git a/fonts/jitsi.ttf b/fonts/jitsi.ttf index dbba4b0984d287efbf96317502e5be5011f228a1..4dc1cbaf847a5586b075b2b9d4b317ec7d7243fb 100755 GIT binary patch delta 806 zcmYk4&1(};6vf|tUo)9WW+sy~t^G*rOiZQKCTVM?*3yj?6%-d*U5O2~Hb~P3+C>E+ zF5QVOx)4`x+_&Tdbw!R-@g&_`ty1{?5j5(-i{?t> zCLj2*!&oVvuQySUPxwpdE6}B8Yim2w>y6gRo3+Ys=yQNfwKq1ma8NwuyANNVrM?|HO?`U{^lqfX8THS?NC=5EW)g{c%6ZV~&Jn$8?f&PE{5643X(LDtWh!fN0QF=g`LDwyMy~pzTl9M~6 zl(xAbWofR2G`Zl!x#V0Sgs=>0o2FwJnU1Lqtqn`59QVAL&<(QLlAjy({lH1v{BhjL zyKWSEf$x`c`Ldro?22?+WQJUC*y}yslP|e`pHxPg5}c603BkbwPNEj$lx@T~C!x)l z86}mKvIeq+&TO$5<%lpXu%raf$QU{Ui;`Lh3BQ)uLZ=|Os5ZvN7kVs5;SZH|ZL8m? z35EL7`1qNE&r8={SLsQW^+=q6EXc7$Iy8OmeqzS=>+0 t^EceNU(CiO!SgX(ynT>&t3gCVyUn02d5y8%&%vyjy_z_O_WHwh`UesgXDI*x delta 269 zcmbQ^+u>Qyz{tSBz|GLWz|3IaAFOZ0q4ei0P-G7fCnV=47D$Dj$zxz(lmYU6(i4jd zfV2RRp8=#f(sL@)3d1?dfqbC2!kmoM#1tm6M@jxRl!}rmg0EcW(Rd z&g@)*)=MdYR4;)pLAY2ENjG92dMSG7sS7>JO8U^5sQ>W&KmW&n4hPQp=-#Td-SpJg zdzza)2syS;4kF=58ZYdHM%tdGmFJGLWeBllRgb=X_cXbWAXMZeBbP1kzO4^lKi5m# z28ma1l3%)yNQCUx%zlfkX*%ii-v|=h^n$!>2d$=4fK;ujxXAe`f3X0yNG9Yk&L#H z#5xPmZi>pz-H~5lckVqGyibocZP-kRVes^O*Nyn!>-mB$gHDH)X@ zm$6QrqzgYSSJ0~kT5=Cqt4Df++~8ydj#RCh0PcOHA7) z`*ySVXH&9oWqfP}FaWa(&t{euM-t(Cl8G~iQtXtVlcj7EE2$bTGjX^^k(|HcZ=w$-;K>hm4G^j&c~a z>}irG*rU#`^R4eL<=3vGT$(%wLg~_$tN*K!W@{*yfs1-`=t@gABIH^gD{7_w0J#Y1 A-T(jq delta 369 zcmexkctu~N+~3X3KP1GTfkFHV0~Z4ji1$o>C?PRXhpS$MnSnusdG(sAIR9XMBOv<+ zP&xsGIh6jKP0md$U|&$yNd*Ig7)T$`42A*| - + @@ -79,7 +79,9 @@
+
+