Skip to content
Permalink
Browse files

Multimedia: Dropped the fast froward and rewind buttons

Fixes (#5175)
  • Loading branch information...
LaurentGoderre committed Apr 9, 2014
1 parent 3cd3144 commit a45ce94317aae00aa2466f511862b318235942cb
Showing with 3 additions and 9 deletions.
  1. +0 −2 src/i18n/base.js
  2. +0 −2 src/plugins/multimedia/assets/mediacontrols.html
  3. +3 −5 src/plugins/multimedia/multimedia.js
@@ -73,8 +73,6 @@ wb.i18nDict = {
pause: "@pause@",
open: "@open@",
close: "@close@",
rew: "@rew@",
ffwd: "@ffwd@",
mute: {
on: "@mute-on@",
off: "@mute-off@"
@@ -12,9 +12,7 @@

<div class="frstpnl">
<div class="btn-group">
<button type="button" class="btn btn-default rewind" aria-controls="{{mId}}" title="{{rewind}}" data-role="none"><span class="glyphicon glyphicon-backward"><span class="wb-inv">{{rewind}}</span></span></button>
<button type="button" class="btn btn-default playpause" aria-controls="{{mId}}" title="{{play}}" data-state-on="{{play}}" data-state-off="{{pause}}" data-role="none"><span class="glyphicon glyphicon-play"><span class="wb-inv">{{play}}</span></span></button>
<button type="button" class="btn btn-default fastforward" aria-controls="{{mId}}" title="{{ff}}" data-role="none"><span class="glyphicon glyphicon-forward"><span class="wb-inv">{{ff}}</span></span></button>
</div>
</div>

@@ -50,8 +50,6 @@ var pluginName = "wb-mltmd",
if ( !i18nText ) {
i18n = wb.i18n;
i18nText = {
rewind: i18n( "rew" ),
ff: i18n( "ffwd" ),
play: i18n( "play" ),
pause: i18n( "pause" ),
cc_on: i18n( "cc", "on" ),
@@ -768,7 +766,7 @@ $document.on( "click", selector, function( event ) {
return true;
}

// Opitmized multiple class tests to include child glyphicon because Safari was reporting the click event
// Optimized multiple class tests to include child glyphicon because Safari was reporting the click event
// from the child span not the parent button, forcing us to have to check for both elements
// JSPerf for multiple class matching http://jsperf.com/hasclass-vs-is-stackoverflow/7
if ( className.match( /playpause|-play|-pause|wb-mm-ovrly/ ) || $target.is( "object" ) ) {
@@ -801,11 +799,11 @@ $document.on( "keydown", selector, function( event ) {
break;

case 37:
$this.find( ctrls + " .rewind" ).trigger( "click" );
playerTarget.player( "setCurrentTime", this.player( "getCurrentTime" ) - this.player( "getDuration" ) * 0.05);
break;

case 39:
$this.find( ctrls + " .fastforward" ).trigger( "click" );
playerTarget.player( "setCurrentTime", this.player( "getCurrentTime" ) + this.player( "getDuration" ) * 0.05);
break;

case 38:

0 comments on commit a45ce94

Please sign in to comment.
You can’t perform that action at this time.