From e5a29418b670f774b85e5e6f4bce6e7b3df1f039 Mon Sep 17 00:00:00 2001 From: Hussam Ghazzi Date: Tue, 18 Oct 2016 12:05:50 -0400 Subject: [PATCH] Show mute button on mobile (#1490) * Show volume toggle on mobile JW7-2956 --- assets/fonts/jw-icons.eot | Bin 5472 -> 5580 bytes assets/fonts/jw-icons.svg | 2 +- assets/fonts/jw-icons.ttf | Bin 5304 -> 5412 bytes assets/fonts/jw-icons.woff | Bin 5380 -> 5488 bytes assets/fonts/svg/jw7-icomoon-icon-setup.json | 5 +++-- assets/fonts/svg/volume.jw-off.svg | 1 + src/css/flags/touch.less | 6 ++++++ src/js/view/controlbar.js | 4 ++-- 8 files changed, 13 insertions(+), 5 deletions(-) mode change 100755 => 100644 assets/fonts/jw-icons.eot mode change 100755 => 100644 assets/fonts/jw-icons.ttf mode change 100755 => 100644 assets/fonts/jw-icons.woff diff --git a/assets/fonts/jw-icons.eot b/assets/fonts/jw-icons.eot old mode 100755 new mode 100644 index 89b1161300287349b386bff1c8e25a6e75a0c19f..20f9e31e8fec75b0b4fa0741a7736a624bea580a GIT binary patch delta 413 zcmXwzKS%;`6vw~s?)0*xIxi7|qDT{pP!JNr==uu{LD14xmlYCOXE_M>qi$n}1eO7A-(<~-Nb|)7b0$pm`w@NE476R z`C>x+N4eg5Ag3Gapj^uiB(wq%AL+eXBH5?)YJH&uDI`eT{y4AkI|X;~SI}qOFFQ3D zl2dcoO8hEk=V5MosV((|md5YEOaE!{zq%KJBz3vffTefT}k$wT?iDsPu delta 304 zcmX@3{XmN?L6m`EhsZ=WGnR$l9&eoJP|d%Wfq`KU5GN$(CKkN3nRrUB{+EU53kC+p z1_lO!n2glK6dpgfW(EeqJ3v)t89)I}2i92(3_>D6zDh=JNkv&A+bTCIx0;23DX>L1R@xRfn^T!vEef8Z!!? z{TqCCvl@Rpvoa&l2q510_}jvGew(ih+(0{k;POp|g)n-ufUr5E%w!MYg2{V?bwzX7 a&ak~>S7VQ1@8i$|ssWiGv-zL!IYt0E(@qNj diff --git a/assets/fonts/jw-icons.svg b/assets/fonts/jw-icons.svg index a4b80c0235..691c5e64b1 100755 --- a/assets/fonts/jw-icons.svg +++ b/assets/fonts/jw-icons.svg @@ -24,7 +24,7 @@ - + diff --git a/assets/fonts/jw-icons.ttf b/assets/fonts/jw-icons.ttf old mode 100755 new mode 100644 index fa3075eedd6f79d84aeca0d9b0edcf14483ba4cc..f5a04e383db2fab1643d5efd2765fc50448f19c8 GIT binary patch delta 437 zcmdm?xkRg;fsuiMft#U$ftkU;KUm+0Ux@7xP-G7fCnV=47QD25c8`I9Q3lA5Nlz>; z0MY_Leg%-`NYANE+y7;nI*{K06h4xXnwY}#vM!l{LC6ItZ{dYj0wBL6CqLOS(YDAjf`LI;1SnvWn^;l6pu%tg$PWPW74i~uQ@OI7-GF?c z#f*~*@{3D=4g~^H7LYsxGt2ae2kaRcCo%dmGH&)`e9q&^#Nfb?#(bVxn1Pi+5U5em zSXEG!QJr0#U7TIqT-;pU;Vh%@zqd?>^lPdOYHAFsYxJubjTwc{{tZ6M$f;jb14Em` z_}ZD1LB=t#9AIu>U}E57U{K{`6jl^8Hdhu@6jT;BW@KTkVXQgwyWy(AQ5J@y23Hvv zzx?B2ZuraKz|`=!0jL!eyg)29q0lv+-{va=H^|`(3|G|VOoY*sgv=RbCtC;=u&^>P jI80t4q$}FM_JEy<-HN?{eG!KfM-tc++0Czn&M^W2RoP}U delta 343 zcmZ3YwL`O>fsuiMft#U$ftkU;KUm+0Ux;llP-G7fCnV=47QD21c8`I9Q3lA5Nlz>; z0MY_Leg%-`NYANE`(+{e0?2Ow3ddxmCZ_QCxivE|2;Kq8n`Hn6I2~ALF)#>;0Qo8z zxg`~4iEO`sdd|l#`D{JW#9%{00ftBGAxAAlQV?O z8D%Cf5Gt4~BCIQ)!*+)49lIKP40|7k9#9R)1Q~{N3~V6v3`~;+MTIvP3vXlu08oHV ATL1t6 diff --git a/assets/fonts/jw-icons.woff b/assets/fonts/jw-icons.woff old mode 100755 new mode 100644 index c5e1701fa81d221de76b15f91335d4321f59c78a..2183c3574bb6455bf37ead58ab2237350d578c6e GIT binary patch delta 497 zcmX|;-z!6L6u{59_s-q8vAc_v60%v8wpv+-?vOj=Q*)?%zj5b&BONe|K-%!9F^Ed8Fq%V$-!T4m=BRv=kFateobe`b zP!8aApwb`*LydBS+~^LXfCd`bFY`WdA;3l89x(qc@n!*3&McVpmCb>u*_!X0sOb2F zGJyoZUDM(A-)RlFLRf2UxOBk=pjvrXYn@s0C~{)EsEbGT9{W_WOf6hPN%1$whM5^v Gj`0VL({TU* delta 368 zcmeyM)uJU*?(gQtz{mguqAU#DAX;R{L=o-!y~(+W1q=*~89|T0eF-YtP zkk0|d0_i!GX+W_v3=9H5bpkQJEJR;qq$Z{?FbHV?)tG@WkDps}22c6 z>#U62k_w<$3y=>qm!Y66k?mJbelk#b z1H + diff --git a/src/css/flags/touch.less b/src/css/flags/touch.less index 8893e47c4e..4ba5f3573e 100644 --- a/src/css/flags/touch.less +++ b/src/css/flags/touch.less @@ -24,6 +24,12 @@ } } + .jw-controlbar { + .jw-icon-volume { + display: inline-block; + } + } + .jw-display-icon-container { pointer-events: none; } diff --git a/src/js/view/controlbar.js b/src/js/view/controlbar.js index fbd7b994f0..26569f3d9f 100644 --- a/src/js/view/controlbar.js +++ b/src/js/view/controlbar.js @@ -94,12 +94,12 @@ define([ var vol = this._localization.volume; var rewind = this._localization.rewind; - // Do not initialize volume sliders on mobile. + // Do not initialize volume slider or tooltip on mobile if(!this._isMobile){ - muteButton = button('jw-icon-volume', this._api.setMute, vol); volumeSlider = new Slider('jw-slider-volume', 'horizontal');//, vol); volumeTooltip = new VolumeTooltip(this._model, 'jw-icon-volume', vol); } + muteButton = button('jw-icon-volume', this._api.setMute, vol); this.elements = { alt: text('jw-text-alt', 'status'),