Show mute button on mobile (#1490)

* Show volume toggle on mobile JW7-2956
jwplayer · Oct 18, 2016 · e5a2941 · e5a2941
1 parent f72f947
commit e5a2941
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 5 deletions.
diff --git a/assets/fonts/jw-icons.eot b/assets/fonts/jw-icons.eot
diff --git a/assets/fonts/jw-icons.svg b/assets/fonts/jw-icons.svg
diff --git a/assets/fonts/jw-icons.ttf b/assets/fonts/jw-icons.ttf
diff --git a/assets/fonts/jw-icons.woff b/assets/fonts/jw-icons.woff
diff --git a/assets/fonts/svg/jw7-icomoon-icon-setup.json b/assets/fonts/svg/jw7-icomoon-icon-setup.json
@@ -129,7 +129,7 @@
       "width": 84,
       "height": 100
     },
-    "iconsHash": 289144099
+    "iconsHash": 1284002988
   },
   "height": 1024,
   "prevSize": 32,
@@ -283,7 +283,8 @@
     },
     {
       "paths": [
-        "M64 652.8v-275.2h204.8l275.2-204.8v684.8l-275.2-204.8h-204.8z"
+        "M64 652.8v-275.2h204.8l275.2-204.8v684.8l-275.2-204.8h-204.8z",
+        "M974.9 387.7l-46.8-46.7-124.2 124.3-123.2-124.3-47.8 46.7 124.2 124.3-124.2 124.3 47.8 46.7 123.2-124.3 124.2 124.3 46.8-46.7-123.2-124.3z"
       ],
       "width": 1216,
       "isMulticolor2": false,

diff --git a/assets/fonts/svg/volume.jw-off.svg b/assets/fonts/svg/volume.jw-off.svg
diff --git 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
@@ -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'),