Changeset 2056

Timestamp:

01/12/12 16:32:22 (16 months ago)

Author:

pablo

Message:

Sets the player volume to 0 if the user clicks the bottom 10% of the controlbar (1339)

Location:

trunk/fl5

Files:

• js/bin-debug/jwplayer.js (modified) (2 diffs)
• js/src/html5/jwplayer.html5.controlbar.js (modified) (1 diff)
• js/src/jwplayer.js (modified) (1 diff)
• js/test/examples/settings.js (modified) (1 diff)
• js/test/examples/single_mp4.html (modified) (2 diffs)
• player.swf (modified) (previous)
• src/com/longtailvideo/jwplayer/player/PlayerVersion.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/view/components/ControlbarComponent.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/view/components/ControlbarComponentV4.as (modified) (1 diff)

trunk/fl5/js/bin-debug/jwplayer.js

@@ -19 +19 @@
 var $jw = jwplayer;
 
-jwplayer.version = '5.9.2055';
+jwplayer.version = '5.9.2056';
 
 // "Shiv" method for older IE browsers; required for parsing media tags
@@ -5461 +5461 @@
                                 xps = msx - _positions.volumeSliderRail.left - window.pageXOffset;
                                 var pct = Math.round(xps / _positions.volumeSliderRail.width * 100);
-                                if (pct < 0) {
+                                if (pct < 10) {
                                         pct = 0;
                                 } else if (pct > 100) {

trunk/fl5/js/src/html5/jwplayer.html5.controlbar.js

@@ -711 +711 @@
                                 xps = msx - _positions.volumeSliderRail.left - window.pageXOffset;
                                 var pct = Math.round(xps / _positions.volumeSliderRail.width * 100);
-                                if (pct < 0) {
+                                if (pct < 10) {
                                         pct = 0;
                                 } else if (pct > 100) {

trunk/fl5/js/src/jwplayer.js

@@ -11 +11 @@
 var $jw = jwplayer;
 
-jwplayer.version = '5.9.2055';
+jwplayer.version = '5.9.2056';
 
 // "Shiv" method for older IE browsers; required for parsing media tags

trunk/fl5/js/test/examples/settings.js

@@ -30 +30 @@
 
 };
+
+function getVariable(name) {
+        var regex = new RegExp(name+"=([\\w\\,]+)");
+        var match = window.location.href.match(regex);
+        if (match && match.length > 1) {
+                return match[1];
+        } else {
+                return "";
+        }
+}
+
+function setDefault(name) {
+        var val = getVariable(name);
+        if (val) {
+                document.getElementById(name+"_"+val).selected = true;
+        }
+}

trunk/fl5/js/test/examples/single_mp4.html

@@ -16 +16 @@
         </p>
         <p>Rendering mode:
-            <select id="renderer">
-              <option value="flashonly"  selected="selected">Flash Only</option>
-              <option value="html5only">HTML5 Only</option>
+            <select id="mode">
+              <option id="mode_html5" value="html5" selected="selected">HTML5</option>
+              <option id="mode_flash" value="flash">Flash</option>
             </select>
                         <button id="update" onclick="return setupAll();">Update</button>
@@ -27 +27 @@
         </div>
         <script type="text/javascript">
+                        setDefault("mode");
+       
                 function setupAll() {
-                var mode = document.getElementById('renderer').value;
+                var mode = document.getElementById('mode').value;
 
                 jwplayer("player").setup({

trunk/fl5/src/com/longtailvideo/jwplayer/player/PlayerVersion.as

@@ -3 +3 @@
         
         public class PlayerVersion {
-                protected static var _version:String = '5.9.2055';
+                protected static var _version:String = '5.9.2056';
                 
                 public static function get version():String {

trunk/fl5/src/com/longtailvideo/jwplayer/view/components/ControlbarComponent.as

@@ -570 +570 @@
                 private function volumeHandler(evt:ViewEvent):void {
                         var volume:Number = Math.round(evt.data * 100);
+                        volume = volume < 10 ? 0 : volume;
                         if (!_player.locked) {
                                 var volumeEvent:MediaEvent = new MediaEvent(MediaEvent.JWPLAYER_MEDIA_VOLUME);

trunk/fl5/src/com/longtailvideo/jwplayer/view/components/ControlbarComponentV4.as

@@ -591 +591 @@
                         }
                         var pct:Number = (scrubber.icon.x - scrubber.rail.x) / (scrubber.rail.width - scrubber.icon.width) * mpl;
+                        pct = pct < 10 ? 0 : pct;
+                        
                         scrubber = null;
                         if (sliderType == 'volumeSlider') {