Fixes bug with 1.1.8 volume

sampotts · May 18, 2015 · 19d7522 · 19d7522
1 parent ceace2a
commit 19d7522
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 18 deletions.
diff --git a/dist/plyr.js b/dist/plyr.js
diff --git a/docs/error.html b/docs/error.html
@@ -6,7 +6,7 @@
  <meta name="viewport" content="width=device-width, initial-scale=1">
 
  <!-- Docs styles -->
- <link rel="stylesheet" href="//cdn.plyr.io/1.1.8/docs.css">
+ <link rel="stylesheet" href="//cdn.plyr.io/1.1.9/docs.css">
  </head>
  <body>
  <main>

diff --git a/docs/index.html b/docs/index.html
@@ -8,10 +8,10 @@
  <meta name="viewport" content="width=device-width, initial-scale=1">
 
  <!-- Styles -->
- <link rel="stylesheet" href="https://cdn.plyr.io/1.1.8/plyr.css">
+ <link rel="stylesheet" href="https://cdn.plyr.io/1.1.9/plyr.css">
 
  <!-- Docs styles -->
- <link rel="stylesheet" href="https://cdn.plyr.io/1.1.8/docs.css">
+ <link rel="stylesheet" href="https://cdn.plyr.io/1.1.9/docs.css">
  </head>
  <body>
  <header>
@@ -79,13 +79,13 @@ <h1>Plyr</h1>
  b.insertBefore(c, b.childNodes[0]);
  }
  }
- })(document, "https://cdn.plyr.io/1.1.8/sprite.svg");
+ })(document, "https://cdn.plyr.io/1.1.9/sprite.svg");
  </script>
 
  <!-- Plyr core script -->
- <script src="https://cdn.plyr.io/1.1.8/plyr.js"></script>
+ <script src="https://cdn.plyr.io/1.1.9/plyr.js"></script>
 
  <!-- Docs script -->
- <script src="https://cdn.plyr.io/1.1.8/docs.js"></script>
+ <script src="https://cdn.plyr.io/1.1.9/docs.js"></script>
  </body>
 </html>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "plyr",
- "version": "1.1.8",
+ "version": "1.1.9",
  "description": "A simple HTML5 media player using custom controls",
  "homepage": "http://plyr.io",
  "main": "gulpfile.js",

diff --git a/readme.md b/readme.md
@@ -37,7 +37,7 @@ If you have any cool ideas or features, please let me know by [creating an issue
 
 Check `docs/index.html` and `docs/dist/docs.js` for an example setup. 
 
-**Heads up**, the example `index.html` file needs to be served from a webserver (such as Apache, Nginx, IIS or similar) unless you change the file sources to include http or https. e.g. change `//cdn.plyr.io/1.1.8/plyr.js` to `https://cdn.plyr.io/1.1.8/plyr.js`
+**Heads up**, the example `index.html` file needs to be served from a webserver (such as Apache, Nginx, IIS or similar) unless you change the file sources to include http or https. e.g. change `//cdn.plyr.io/1.1.9/plyr.js` to `https://cdn.plyr.io/1.1.9/plyr.js`
 
 ### Bower
 If bower is your thang, you can grab Plyr using:
@@ -57,11 +57,11 @@ More info is on [npm](https://www.npmjs.com/package/ember-cli-plyr) and [GitHub]
 If you want to use our CDN, you can use the following:
 
 ```html
-<link rel="stylesheet" href="https://cdn.plyr.io/1.1.8/plyr.css">
-<script src="https://cdn.plyr.io/1.1.8/plyr.js"></script>
+<link rel="stylesheet" href="https://cdn.plyr.io/1.1.9/plyr.css">
+<script src="https://cdn.plyr.io/1.1.9/plyr.js"></script>
 ```
 
-You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.1.8/sprite.svg`.
+You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.1.9/sprite.svg`.
 
 ### CSS
 If you want to use the default css, add the `plyr.css` file from /dist into your head, or even better use `plyr.less` or `plyr.sass` file included in `/src` in your build to save a request. 

diff --git a/src/js/plyr.js b/src/js/plyr.js
@@ -1,6 +1,6 @@
 // ==========================================================================
 // Plyr
-// plyr.js v1.1.8
+// plyr.js v1.1.9
 // https://github.com/selz/plyr
 // License: The MIT License (MIT)
 // ==========================================================================
@@ -1167,6 +1167,11 @@
 
  // Set the player volume
  player.media.volume = parseFloat(volume / 10);
+
+ // Toggle muted state
+ if(player.media.muted && volume > 0) {
+ _toggleMute();
+ } 
  }
 
  // Mute
@@ -1189,18 +1194,15 @@
  if(player.supported.full && player.volume) {
  player.volume.value = volume;
  }
- // Update mute button state
- if(player.supported.full && player.buttons.mute) {
- player.buttons.mute.checked = player.media.muted;
- }
 
  // Store the volume in storage
  if(config.storage.enabled && _storage().supported) {
  window.localStorage.setItem(config.storage.key, volume);
  }
 
  // Toggle class if muted
- _toggleClass(player.container, config.classes.muted, volume === 0);
+ _toggleClass(player.container, config.classes.muted, (volume === 0));
+ player.buttons.mute.checked = (volume === 0);
  }
 
  // Toggle captions