From 4d9a31956c79c8561dfe3a1d15ab51582f8414a3 Mon Sep 17 00:00:00 2001 From: Joshua McNeese Date: Tue, 20 Dec 2011 14:44:32 -0700 Subject: [PATCH] added check for left offset to detect when mousedrag exceeds top boundary of slider, to prevent muting when trying to max out volume --- build/mediaelement-and-player.js | 2 +- build/mediaelement-and-player.min.js | 4 ++-- build/mediaelementplayer.js | 2 +- build/mediaelementplayer.min.js | 4 ++-- src/js/mep-feature-volume.js | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/mediaelement-and-player.js b/build/mediaelement-and-player.js index 4ac8efc9a..dd0072497 100644 --- a/build/mediaelement-and-player.js +++ b/build/mediaelement-and-player.js @@ -2916,7 +2916,7 @@ if (typeof jQuery != 'undefined') { volume = (railHeight - newY) / railHeight // the controls just hide themselves (usually when mouse moves too far up) - if (totalOffset.top == 0) + if (totalOffset.top == 0 || totalOffset.left == 0) return; // 0-1 diff --git a/build/mediaelement-and-player.min.js b/build/mediaelement-and-player.min.js index f04de87ce..4de9db262 100644 --- a/build/mediaelement-and-player.min.js +++ b/build/mediaelement-and-player.min.js @@ -108,8 +108,8 @@ this.total.width()*this.media.currentTime/this.media.duration,b=a-this.handle.ou (this.options.duration>0?mejs.Utility.secondsToTimeCode(this.options.duration,this.options.alwaysShowHours||this.media.duration>3600,this.options.showTimecodeFrameCount,this.options.framesPerSecond||25):(a.options.alwaysShowHours?"00:":"")+(a.options.showTimecodeFrameCount?"00:00:00":"00:00"))+"").appendTo(b)}this.durationD=this.controls.find(".mejs-duration");d.addEventListener("timeupdate",function(){a.updateDuration()},false)},updateCurrent:function(){if(this.currenttime)this.currenttime.html(mejs.Utility.secondsToTimeCode(this.media.currentTime, this.options.alwaysShowHours||this.media.duration>3600,this.options.showTimecodeFrameCount,this.options.framesPerSecond||25))},updateDuration:function(){if(this.media.duration&&this.durationD)this.durationD.html(mejs.Utility.secondsToTimeCode(this.media.duration,this.options.alwaysShowHours,this.options.showTimecodeFrameCount,this.options.framesPerSecond||25))}})})(mejs.$); (function(f){f.extend(mejs.MepDefaults,{muteText:"Mute Toggle",hideVolumeOnTouchDevices:true});f.extend(MediaElementPlayer.prototype,{buildvolume:function(a,b,c,d){if(!(mejs.MediaFeatures.hasTouch&&this.options.hideVolumeOnTouchDevices)){var e=f('
').appendTo(b), -g=e.find(".mejs-volume-slider"),j=e.find(".mejs-volume-total"),h=e.find(".mejs-volume-current"),l=e.find(".mejs-volume-handle"),m=function(i){if(g.is(":visible")){var o=j.height(),n=j.position();i=o-o*i;l.css("top",n.top+i-l.height()/2);h.height(o-i);h.css("top",n.top+i)}else{g.show();m(i);g.hide()}},p=function(i){var o=j.height(),n=j.offset(),s=parseInt(j.css("top").replace(/px/,""),10);i=i.pageY-n.top;var q=(o-i)/o;if(n.top!=0){q=Math.max(0,q);q=Math.min(q,1);if(i<0)i=0;else if(i>o)i=o;l.css("top", -i-l.height()/2+s);h.height(o-i);h.css("top",i+s);if(q==0){d.setMuted(true);e.removeClass("mejs-mute").addClass("mejs-unmute")}else{d.setMuted(false);e.removeClass("mejs-unmute").addClass("mejs-mute")}q=Math.max(0,q);q=Math.min(q,1);d.setVolume(q)}},r=false,k=false;e.hover(function(){g.show();k=true},function(){k=false;r||g.hide()});g.bind("mouseover",function(){k=true}).bind("mousedown",function(i){p(i);r=true;return false});f(document).bind("mouseup",function(){r=false;k||g.hide()}).bind("mousemove", +g=e.find(".mejs-volume-slider"),j=e.find(".mejs-volume-total"),h=e.find(".mejs-volume-current"),l=e.find(".mejs-volume-handle"),m=function(i){if(g.is(":visible")){var o=j.height(),n=j.position();i=o-o*i;l.css("top",n.top+i-l.height()/2);h.height(o-i);h.css("top",n.top+i)}else{g.show();m(i);g.hide()}},p=function(i){var o=j.height(),n=j.offset(),s=parseInt(j.css("top").replace(/px/,""),10);i=i.pageY-n.top;var q=(o-i)/o;if(!(n.top==0||n.left==0)){q=Math.max(0,q);q=Math.min(q,1);if(i<0)i=0;else if(i> +o)i=o;l.css("top",i-l.height()/2+s);h.height(o-i);h.css("top",i+s);if(q==0){d.setMuted(true);e.removeClass("mejs-mute").addClass("mejs-unmute")}else{d.setMuted(false);e.removeClass("mejs-unmute").addClass("mejs-mute")}q=Math.max(0,q);q=Math.min(q,1);d.setVolume(q)}},r=false,k=false;e.hover(function(){g.show();k=true},function(){k=false;r||g.hide()});g.bind("mouseover",function(){k=true}).bind("mousedown",function(i){p(i);r=true;return false});f(document).bind("mouseup",function(){r=false;k||g.hide()}).bind("mousemove", function(i){r&&p(i)});e.find("button").click(function(){d.setMuted(!d.muted)});d.addEventListener("volumechange",function(){if(!r)if(d.muted){m(0);e.removeClass("mejs-mute").addClass("mejs-unmute")}else{m(d.volume);e.removeClass("mejs-unmute").addClass("mejs-mute")}},false);m(a.options.startVolume);d.pluginType==="native"&&d.setVolume(a.options.startVolume)}}})})(mejs.$); (function(f){f.extend(mejs.MepDefaults,{usePluginFullScreen:false,newWindowCallback:function(){return""},fullscreenText:"Fullscreen"});f.extend(MediaElementPlayer.prototype,{isFullScreen:false,isNativeFullScreen:false,docStyleOverflow:null,isInIframe:false,buildfullscreen:function(a,b,c,d){if(a.isVideo){a.isInIframe=window.location!=window.parent.location;mejs.MediaFeatures.hasTrueNativeFullScreen&&a.container.bind(mejs.MediaFeatures.fullScreenEventName,function(){if(mejs.MediaFeatures.isFullScreen()){a.isNativeFullScreen= true;a.setControlsSize()}else{a.isNativeFullScreen=false;a.exitFullScreen()}});var e=this,g=f('
').appendTo(b);if(e.media.pluginType==="native"||!e.options.usePluginFullScreen&&!mejs.MediaFeatures.isFirefox)g.click(function(){mejs.MediaFeatures.hasTrueNativeFullScreen&&mejs.MediaFeatures.isFullScreen()||a.isFullScreen?a.exitFullScreen():a.enterFullScreen()}); diff --git a/build/mediaelementplayer.js b/build/mediaelementplayer.js index 64b67da02..c3c9b83e2 100644 --- a/build/mediaelementplayer.js +++ b/build/mediaelementplayer.js @@ -1437,7 +1437,7 @@ if (typeof jQuery != 'undefined') { volume = (railHeight - newY) / railHeight // the controls just hide themselves (usually when mouse moves too far up) - if (totalOffset.top == 0) + if (totalOffset.top == 0 || totalOffset.left == 0) return; // 0-1 diff --git a/build/mediaelementplayer.min.js b/build/mediaelementplayer.min.js index 0219bc847..0abdeaf13 100644 --- a/build/mediaelementplayer.min.js +++ b/build/mediaelementplayer.min.js @@ -49,8 +49,8 @@ this.total.width()*this.media.currentTime/this.media.duration,b=a-this.handle.ou (this.options.duration>0?mejs.Utility.secondsToTimeCode(this.options.duration,this.options.alwaysShowHours||this.media.duration>3600,this.options.showTimecodeFrameCount,this.options.framesPerSecond||25):(a.options.alwaysShowHours?"00:":"")+(a.options.showTimecodeFrameCount?"00:00:00":"00:00"))+"").appendTo(b)}this.durationD=this.controls.find(".mejs-duration");d.addEventListener("timeupdate",function(){a.updateDuration()},false)},updateCurrent:function(){if(this.currenttime)this.currenttime.html(mejs.Utility.secondsToTimeCode(this.media.currentTime, this.options.alwaysShowHours||this.media.duration>3600,this.options.showTimecodeFrameCount,this.options.framesPerSecond||25))},updateDuration:function(){if(this.media.duration&&this.durationD)this.durationD.html(mejs.Utility.secondsToTimeCode(this.media.duration,this.options.alwaysShowHours,this.options.showTimecodeFrameCount,this.options.framesPerSecond||25))}})})(mejs.$); (function(f){f.extend(mejs.MepDefaults,{muteText:"Mute Toggle",hideVolumeOnTouchDevices:true});f.extend(MediaElementPlayer.prototype,{buildvolume:function(a,b,c,d){if(!(mejs.MediaFeatures.hasTouch&&this.options.hideVolumeOnTouchDevices)){var e=f('
').appendTo(b), -g=e.find(".mejs-volume-slider"),j=e.find(".mejs-volume-total"),h=e.find(".mejs-volume-current"),l=e.find(".mejs-volume-handle"),m=function(i){if(g.is(":visible")){var o=j.height(),n=j.position();i=o-o*i;l.css("top",n.top+i-l.height()/2);h.height(o-i);h.css("top",n.top+i)}else{g.show();m(i);g.hide()}},p=function(i){var o=j.height(),n=j.offset(),s=parseInt(j.css("top").replace(/px/,""),10);i=i.pageY-n.top;var q=(o-i)/o;if(n.top!=0){q=Math.max(0,q);q=Math.min(q,1);if(i<0)i=0;else if(i>o)i=o;l.css("top", -i-l.height()/2+s);h.height(o-i);h.css("top",i+s);if(q==0){d.setMuted(true);e.removeClass("mejs-mute").addClass("mejs-unmute")}else{d.setMuted(false);e.removeClass("mejs-unmute").addClass("mejs-mute")}q=Math.max(0,q);q=Math.min(q,1);d.setVolume(q)}},r=false,k=false;e.hover(function(){g.show();k=true},function(){k=false;r||g.hide()});g.bind("mouseover",function(){k=true}).bind("mousedown",function(i){p(i);r=true;return false});f(document).bind("mouseup",function(){r=false;k||g.hide()}).bind("mousemove", +g=e.find(".mejs-volume-slider"),j=e.find(".mejs-volume-total"),h=e.find(".mejs-volume-current"),l=e.find(".mejs-volume-handle"),m=function(i){if(g.is(":visible")){var o=j.height(),n=j.position();i=o-o*i;l.css("top",n.top+i-l.height()/2);h.height(o-i);h.css("top",n.top+i)}else{g.show();m(i);g.hide()}},p=function(i){var o=j.height(),n=j.offset(),s=parseInt(j.css("top").replace(/px/,""),10);i=i.pageY-n.top;var q=(o-i)/o;if(!(n.top==0||n.left==0)){q=Math.max(0,q);q=Math.min(q,1);if(i<0)i=0;else if(i> +o)i=o;l.css("top",i-l.height()/2+s);h.height(o-i);h.css("top",i+s);if(q==0){d.setMuted(true);e.removeClass("mejs-mute").addClass("mejs-unmute")}else{d.setMuted(false);e.removeClass("mejs-unmute").addClass("mejs-mute")}q=Math.max(0,q);q=Math.min(q,1);d.setVolume(q)}},r=false,k=false;e.hover(function(){g.show();k=true},function(){k=false;r||g.hide()});g.bind("mouseover",function(){k=true}).bind("mousedown",function(i){p(i);r=true;return false});f(document).bind("mouseup",function(){r=false;k||g.hide()}).bind("mousemove", function(i){r&&p(i)});e.find("button").click(function(){d.setMuted(!d.muted)});d.addEventListener("volumechange",function(){if(!r)if(d.muted){m(0);e.removeClass("mejs-mute").addClass("mejs-unmute")}else{m(d.volume);e.removeClass("mejs-unmute").addClass("mejs-mute")}},false);m(a.options.startVolume);d.pluginType==="native"&&d.setVolume(a.options.startVolume)}}})})(mejs.$); (function(f){f.extend(mejs.MepDefaults,{usePluginFullScreen:false,newWindowCallback:function(){return""},fullscreenText:"Fullscreen"});f.extend(MediaElementPlayer.prototype,{isFullScreen:false,isNativeFullScreen:false,docStyleOverflow:null,isInIframe:false,buildfullscreen:function(a,b,c,d){if(a.isVideo){a.isInIframe=window.location!=window.parent.location;mejs.MediaFeatures.hasTrueNativeFullScreen&&a.container.bind(mejs.MediaFeatures.fullScreenEventName,function(){if(mejs.MediaFeatures.isFullScreen()){a.isNativeFullScreen= true;a.setControlsSize()}else{a.isNativeFullScreen=false;a.exitFullScreen()}});var e=this,g=f('
').appendTo(b);if(e.media.pluginType==="native"||!e.options.usePluginFullScreen&&!mejs.MediaFeatures.isFirefox)g.click(function(){mejs.MediaFeatures.hasTrueNativeFullScreen&&mejs.MediaFeatures.isFullScreen()||a.isFullScreen?a.exitFullScreen():a.enterFullScreen()}); diff --git a/src/js/mep-feature-volume.js b/src/js/mep-feature-volume.js index 8f9058814..5174c1704 100644 --- a/src/js/mep-feature-volume.js +++ b/src/js/mep-feature-volume.js @@ -65,7 +65,7 @@ volume = (railHeight - newY) / railHeight // the controls just hide themselves (usually when mouse moves too far up) - if (totalOffset.top == 0) + if (totalOffset.top == 0 || totalOffset.left == 0) return; // 0-1