http://www.mediawiki.org/wiki/Special:Code/MediaWiki/82861
Revision: 82861
Author: dale
Date: 2011-02-26 16:59:29 +0000 (Sat, 26 Feb 2011)
Log Message:
-----------
added support for tool tip about pressing f11 when going into fullscreen mode
updated message for ( do not display this warning in the future ) to match more
common language
Modified Paths:
--------------
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/MwEmbedSupport.php
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/mwEmbedSupport.js
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/EmbedPlayer.config.php
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/EmbedPlayer.i18n.php
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
Modified:
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/MwEmbedSupport.php
===================================================================
---
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/MwEmbedSupport.php
2011-02-26 16:45:35 UTC (rev 82860)
+++
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/MwEmbedSupport.php
2011-02-26 16:59:29 UTC (rev 82861)
@@ -26,7 +26,8 @@
'redmond' =>
'skins/jquery.ui.themes/redmond/jquery-ui-1.7.2.css',
'start' =>
'skins/jquery.ui.themes/start/jquery-ui-1.7.2.css',
'sunny' =>
'skins/jquery.ui.themes/sunny/jquery-ui-1.7.2.css',
- )
+ ),
+ 'messageFile' => 'MwEmbedSupport.i18n.php',
),
'mediawiki.language.parser' => array( 'scripts'=>
'mediawiki.language.parser.js' ),
'jquery.menu' => array(
Modified:
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/mwEmbedSupport.js
===================================================================
---
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/mwEmbedSupport.js
2011-02-26 16:45:35 UTC (rev 82860)
+++
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/mwEmbedSupport.js
2011-02-26 16:59:29 UTC (rev 82861)
@@ -536,6 +536,10 @@
$j( '#mweDialog' ).dialog( 'destroy' ).remove();
};
+ mw.isMobileDevice = function(){
+ return ( mw.isIphone() || mw.isIpod() || mw.isIpad() ||
mw.isAndroid2() )
+ },
+
// MOVE TO jquery.client
// move to jquery.client
mw.isIphone = function(){
Modified:
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/EmbedPlayer.config.php
===================================================================
---
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/EmbedPlayer.config.php
2011-02-26 16:45:35 UTC (rev 82860)
+++
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/EmbedPlayer.config.php
2011-02-26 16:59:29 UTC (rev 82861)
@@ -46,6 +46,9 @@
// Set the browser player warning flag displays warning
for non optimal playback
"EmbedPlayer.ShowNativeWarning" => true,
+ // If a fullscreen tip to press f11 should be displayed
when entering fullscreen
+ "EmbedPlayer.FullscreenTip" => true,
+
// if the browser should display a warning for direct
file links:
"EmbedPlayer.DirectFileLinkWarning" => false,
Modified:
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/EmbedPlayer.i18n.php
===================================================================
---
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/EmbedPlayer.i18n.php
2011-02-26 16:45:35 UTC (rev 82860)
+++
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/EmbedPlayer.i18n.php
2011-02-26 16:59:29 UTC (rev 82861)
@@ -61,7 +61,8 @@
'mwe-embedplayer-ogg-player-omtkplayer' => 'OMTK Flash Vorbis',
'mwe-embedplayer-for_best_experience' => 'For a better video playback
experience we recommend the <b>[$1 latest Firefox].</b>',
'mwe-embedplayer-download-warn' => 'No compatible in browser player was
detected, for in browser playback please download the [$1 latest Firefox]',
- 'mwe-embedplayer-do_not_warn_again' => 'Dismiss for now.',
+ 'mwe-embedplayer-fullscreen-tip' => 'Press <b>F11</b> toggle <i>web
browser</i> fullscreen',
+ 'mwe-embedplayer-do_not_warn_again' => 'In the future, do not show this
message',
'mwe-embedplayer-playerSelect' => 'Players',
'mwe-embedplayer-read_before_embed' => '<a
href="http://mediawiki.org/wiki/Security_Notes_on_Remote_Embedding";
target="_new">Read this</a> before embedding.',
'mwe-embedplayer-embed_site_or_blog' => 'Embed on a page',
@@ -82,6 +83,8 @@
*/
$messages['qqq'] = array(
'mwe-embedplayer-playerSelect' => '{{Identical|Player}}',
+ 'mwe-embedplayer-do_not_warn_again' => 'Standard messge for dissabling
+future identical warnings messages',
);
/** Afrikaans (Afrikaans) */
Modified:
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
===================================================================
---
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
2011-02-26 16:45:35 UTC (rev 82860)
+++
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
2011-02-26 16:59:29 UTC (rev 82861)
@@ -407,6 +407,9 @@
'width' : $( window ).width(),
'height' : $( window ).height()
}, true, function(){
+ // display fullscreen f11 tip
+ _this.displayFullscreenTip();
+
// Trigger the enter fullscreen event
$( _this.embedPlayer ).trigger( 'onOpenFullScreen' );
});
@@ -468,7 +471,39 @@
}
} );
},
+ // display a fullscreen tip if configured to do and the browser
supports it.
+ displayFullscreenTip: function(){
+ var _this = this;
+ // Mobile devices don't have f11 key
+ if( mw.isMobileDevice() ){
+ return ;
+ }
+ var $targetTip = this.doWarningBindinng(
'EmbedPlayer.FullscreenTip',
+ $('<h3/>').html( gM( 'mwe-embedplayer-fullscreen-tip') )
+ )
+
+ // Display the target warning:
+ $targetTip.show();
+
+ var hideTip = function(){
+ mw.setConfig('EmbedPlayer.FullscreenTip', false );
+ $targetWarning.fadeOut('fast');
+ };
+
+ // Hide fullscreen tip if:
+ // We leave fullscreen,
+ $( this.embedPlayer ).bind( 'onCloseFullScreen', hideTip );
+ // After 5 seconds,
+ setTimeout( hideTip, 5000 );
+ // or if we catch an f11 button press
+ $(document).keyup( function( event ){
+ if( event.keyCode == 122 ){
+ hideTip();
+ }
+ return true;
+ })
+ },
/**
* Resize the player to a target size keeping aspect ratio
*/
@@ -882,12 +917,61 @@
// Set up local pointer to the embedPlayer
var embedPlayer = this.embedPlayer;
var _this = this;
-
// make sure the player is large enough
if( embedPlayer.getWidth() < 200 ){
return false;
}
-
+ // Add the targetWarning:
+ $targetWarning = $('<div />')
+ .attr( {
+ 'id': "warningOverlay_" + embedPlayer.id
+ } )
+ .addClass( 'ui-state-highlight ui-corner-all' )
+ .css({
+ 'position' : 'absolute',
+ 'display' : 'none',
+ 'background' : '#FFF',
+ 'color' : '#111',
+ 'top' : '10px',
+ 'left' : '10px',
+ 'right' : '10px',
+ 'padding' : '4px'
+ })
+ .html( warningMsg )
+
+ $( embedPlayer ).append(
+ $targetWarning
+ );
+
+ $targetWarning.append(
+ $('<br />')
+ );
+
+ $targetWarning.append(
+ $( '<input />' )
+ .attr({
+ 'id' : 'ffwarn_' + embedPlayer.id,
+ 'type' : "checkbox",
+ 'name' : 'ffwarn_' + embedPlayer.id
+ })
+ .click( function() {
+ mw.log("WarningBindinng:: set " + preferenceId
+ ' to hidewarning ' );
+ // Set up a cookie for 30 days:
+ $j.cookie( preferenceId, 'hidewarning', {
expires: 30 } );
+ // Set the current instance
+ mw.setConfig( preferenceId, false );
+ $( '#warningOverlay_' + embedPlayer.id
).fadeOut( 'slow' );
+ // set the local prefrence to false
+ _this.addWarningFlag = false;
+ } )
+ );
+ $targetWarning.append(
+ $('<label />')
+ .text( gM( 'mwe-embedplayer-do_not_warn_again' ) )
+ .attr( 'for', 'ffwarn_' + embedPlayer.id )
+ );
+ $targetWarning.hide();
+
$( embedPlayer ).hoverIntent({
'timeout': 2000,
'over': function() {
@@ -895,66 +979,18 @@
if( embedPlayer.isPlaying() ){
return ;
}
- if ( $( '#warningOverlay_' + embedPlayer.id
).length == 0 ) {
- $( this ).append(
- $('<div />')
- .attr( {
- 'id': "warningOverlay_"
+ embedPlayer.id
- } )
- .addClass( 'ui-state-highlight
ui-corner-all' )
- .css({
- 'position' : 'absolute',
- 'display' : 'none',
- 'background' : '#FFF',
- 'color' : '#111',
- 'top' : '10px',
- 'left' : '10px',
- 'right' : '10px',
- 'padding' : '4px'
- })
- .html( warningMsg )
- );
-
- $targetWarning = $( '#warningOverlay_'
+ embedPlayer.id );
-
- $targetWarning.append(
- $('<br />')
- );
-
- $targetWarning.append(
- $( '<input />' )
- .attr({
- 'id' : 'ffwarn_' +
embedPlayer.id,
- 'type' : "checkbox",
- 'name' : 'ffwarn_' +
embedPlayer.id
- })
- .click( function() {
-
mw.log("WarningBindinng:: set " + preferenceId + ' to hidewarning ' );
- // Set up a cookie for
30 days:
- $j.cookie(
preferenceId, 'hidewarning', { expires: 30 } );
- // Set the current
instance
- mw.setConfig(
preferenceId, false );
- $( '#warningOverlay_' +
embedPlayer.id ).fadeOut( 'slow' );
- // set the local
prefrence to false
- _this.addWarningFlag =
false;
- } )
- );
- $targetWarning.append(
- $('<label />')
- .text( gM(
'mwe-embedplayer-do_not_warn_again' ) )
- .attr( 'for', 'ffwarn_' +
embedPlayer.id )
- );
- }
+
// Check the global config before showing the
warning
if ( mw.getConfig( preferenceId ) === true &&
$j.cookie( preferenceId ) != 'hidewarning' ){
mw.log("WarningBindinng:: show warning
" + mw.getConfig( preferenceId ) + ' cookie: '+ $j.cookie( preferenceId ) +
'typeof:' + typeof $j.cookie( preferenceId ));
- $( '#warningOverlay_' + embedPlayer.id
).fadeIn( 'slow' );
+ $targetWarning.fadeIn( 'slow' );
};
},
'out': function() {
- $( '#warningOverlay_' + embedPlayer.id
).fadeOut( 'slow' );
+ $targetWarning.fadeOut( 'slow' );
}
});
+ return $targetWarning;
},
/**
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
