Index: branches/js2-work/phase3/js/mwEmbed/skins/ctrlBuilder.js |
— | — | @@ -995,6 +995,8 @@ |
996 | 996 | mw.log('getPlayerSelect'); |
997 | 997 | |
998 | 998 | var embedPlayer = this.embedPlayer; |
| 999 | + |
| 1000 | + var _this = this; |
999 | 1001 | |
1000 | 1002 | $playerSelect = $j('<div />') |
1001 | 1003 | .append( |
— | — | @@ -1026,8 +1028,7 @@ |
1027 | 1029 | .text( |
1028 | 1030 | supporting_players[i].getName() |
1029 | 1031 | ) |
1030 | | - .addClass( 'ui-state-highlight ui-corner-all' ); |
1031 | | - |
| 1032 | + .addClass( 'ui-state-highlight ui-corner-all' ); |
1032 | 1033 | } else { |
1033 | 1034 | // Non active player add link to select: |
1034 | 1035 | $playerLine = $j( '<a />') |
— | — | @@ -1045,6 +1046,12 @@ |
1046 | 1047 | mw.log( 'source id: ' + source_id + ' player id: ' + default_player_id ); |
1047 | 1048 | |
1048 | 1049 | embedPlayer.ctrlBuilder.closeMenuOverlay(); |
| 1050 | + |
| 1051 | + // Close fullscreen if we are in fullscreen mode |
| 1052 | + if( _this.fullscreenMode ){ |
| 1053 | + _this.restoreWindowPlayer() |
| 1054 | + } |
| 1055 | + |
1049 | 1056 | embedPlayer.mediaElement.selectSource( source_id ); |
1050 | 1057 | |
1051 | 1058 | mw.EmbedTypes.players.setPlayerPreference( |
— | — | @@ -1444,7 +1451,7 @@ |
1445 | 1452 | .css({ |
1446 | 1453 | "position" : 'absolute', |
1447 | 1454 | "left" : '33px', |
1448 | | - "right" : ( (embedPlayer.getPlayerWidth() - ctrlObj.available_width) - 33) + 'px' |
| 1455 | + "right" : ( ( embedPlayer.getPlayerWidth() - ctrlObj.available_width ) - 33) + 'px' |
1449 | 1456 | }) |
1450 | 1457 | // Playhead binding |
1451 | 1458 | .slider( { |