| Index: branches/MwEmbedStandAlone/modules/EmbedPlayer/loader.js |
| — | — | @@ -7,13 +7,7 @@ |
| 8 | 8 | */ |
| 9 | 9 | ( function( mw ) { |
| 10 | 10 | |
| 11 | | - mw.setDefaultConfig( { |
| 12 | | - // If the Timed Text interface should be displayed: |
| 13 | | - // 'always' Displays link and call to contribute always |
| 14 | | - // 'auto' Looks for child timed text elements or "apiTitleKey" & load interface |
| 15 | | - // 'off' Does not display the timed text interface |
| 16 | | - "textInterface" : "auto", |
| 17 | | - |
| | 11 | + mw.setDefaultConfig( { |
| 18 | 12 | // If the player controls should be overlaid on top of the video ( if supported by playback method) |
| 19 | 13 | // can be set to false per embed player via overlayControls attribute |
| 20 | 14 | 'EmbedPlayer.OverlayControls' : true, |
| Index: branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayer.js |
| — | — | @@ -7,65 +7,11 @@ |
| 8 | 8 | * mw.PlayerControlBuilder Handles skinning of the player controls |
| 9 | 9 | */ |
| 10 | 10 | |
| 11 | | -mw.addMessages( { |
| 12 | | - "mwe-embedplayer-loading_plugin" : "Loading plugin ...", |
| 13 | | - "mwe-embedplayer-select_playback" : "Set playback preference", |
| 14 | | - "mwe-embedplayer-link_back" : "Link back", |
| 15 | | - "mwe-embedplayer-error_swap_vid" : "Error: mwEmbed was unable to swap the video tag for the mwEmbed interface", |
| 16 | | - "mwe-embedplayer-add_to_end_of_sequence" : "Add to end of sequence", |
| 17 | | - "mwe-embedplayer-missing_video_stream" : "The video file for this stream is missing", |
| 18 | | - "mwe-embedplayer-play_clip" : "Play clip", |
| 19 | | - "mwe-embedplayer-pause_clip" : "Pause clip", |
| 20 | | - "mwe-embedplayer-volume_control" : "Volume control", |
| 21 | | - "mwe-embedplayer-player_options" : "Player options", |
| 22 | | - "mwe-embedplayer-timed_text" : "Timed text", |
| 23 | | - "mwe-embedplayer-player_fullscreen" : "Fullscreen", |
| 24 | | - "mwe-embedplayer-next_clip_msg" : "Play next clip", |
| 25 | | - "mwe-embedplayer-prev_clip_msg" : "Play previous clip", |
| 26 | | - "mwe-embedplayer-current_clip_msg" : "Continue playing this clip", |
| 27 | | - "mwe-embedplayer-seek_to" : "Seek $1", |
| 28 | | - "mwe-embedplayer-paused" : "paused", |
| 29 | | - "mwe-embedplayer-download_segment" : "Download selection:", |
| 30 | | - "mwe-embedplayer-download_full" : "Download full video file:", |
| 31 | | - "mwe-embedplayer-download_right_click" : "To download, right click and select <i>Save link as...<\/i>", |
| 32 | | - "mwe-embedplayer-download_clip" : "Download video", |
| 33 | | - "mwe-embedplayer-download_text" : "Download text", |
| 34 | | - "mwe-embedplayer-download" : "Download", |
| 35 | | - "mwe-embedplayer-share" : "Share", |
| 36 | | - "mwe-embedplayer-credits" : "Credits", |
| 37 | | - "mwe-embedplayer-clip_linkback" : "Clip source page", |
| 38 | | - "mwe-embedplayer-choose_player" : "Choose video player", |
| 39 | | - "mwe-embedplayer-no-player" : "No player available for $1", |
| 40 | | - "mwe-embedplayer-share_this_video" : "Share this video", |
| 41 | | - "mwe-embedplayer-video_credits" : "Video credits", |
| 42 | | - "mwe-embedplayer-kaltura-platform-title" : "Kaltura open source video platform", |
| 43 | | - "mwe-embedplayer-menu_btn" : "Menu", |
| 44 | | - "mwe-embedplayer-close_btn" : "Close", |
| 45 | | - "mwe-embedplayer-ogg-player-vlc-player" : "VLC player", |
| 46 | | - "mwe-embedplayer-ogg-player-oggNative" : "HTML5 Ogg player", |
| 47 | | - "mwe-embedplayer-ogg-player-h264Native" : "HTML5 H.264 player", |
| 48 | | - "mwe-embedplayer-ogg-player-oggPlugin" : "Generic Ogg plugin", |
| 49 | | - "mwe-embedplayer-ogg-player-quicktime-mozilla" : "QuickTime plugin", |
| 50 | | - "mwe-embedplayer-ogg-player-quicktime-activex" : "QuickTime ActiveX", |
| 51 | | - "mwe-embedplayer-ogg-player-cortado" : "Java Cortado", |
| 52 | | - "mwe-embedplayer-ogg-player-flowplayer" : "Flowplayer", |
| 53 | | - "mwe-embedplayer-ogg-player-kplayer" : "Kaltura player", |
| 54 | | - "mwe-embedplayer-ogg-player-selected" : "(selected)", |
| 55 | | - "mwe-embedplayer-generic_missing_plugin" : "You browser does not appear to support the following playback type: <b>$1<\/b><br \/>Visit the <a href=\"http:\/\/commons.wikimedia.org\/wiki\/Commons:Media_help\">Playback methods<\/a> page to download a player.<br \/>", |
| 56 | | - "mwe-embedplayer-missing-source" : "No source video was found. Check that your embed code includes a valid source or API key", |
| 57 | | - "mwe-embedplayer-for_best_experience" : "For a better video playback experience we recommend the <b><a href=\"http:\/\/www.mozilla.com\/en-US\/firefox\/upgrade.html?from=mwEmbed\">latest Firefox<\/a>.<\/b>", |
| 58 | | - "mwe-embedplayer-do_not_warn_again" : "Dismiss for now.", |
| 59 | | - "mwe-embedplayer-playerSelect" : "Players", |
| 60 | | - "mwe-embedplayer-read_before_embed" : "<a href=\"http:\/\/mediawiki.org\/wiki\/Security_Notes_on_Remote_Embedding\" target=\"_new\">Read this<\/a> before embedding.", |
| 61 | | - "mwe-embedplayer-embed_site_or_blog" : "Embed on a page", |
| 62 | | - "mwe-embedplayer-related_videos" : "Related videos", |
| 63 | | - "mwe-embedplayer-seeking" : "seeking", |
| 64 | | - "mwe-embedplayer-copy-code" : "Copy code", |
| 65 | | - "mwe-embedplayer-video-h264" : "H.264 video", |
| 66 | | - "mwe-embedplayer-video-flv" : "Flash video", |
| 67 | | - "mwe-embedplayer-video-ogg" : "Ogg video", |
| 68 | | - "mwe-embedplayer-video-audio" : "Ogg audio" |
| 69 | | -} ); |
| | 11 | +/** |
| | 12 | + * Add the messages text: |
| | 13 | + */ |
| | 14 | + |
| | 15 | +mw.includeAllModuleMessages(); |
| 70 | 16 | |
| 71 | 17 | /* |
| 72 | 18 | * The default video attributes supported by embedPlayer |
| — | — | @@ -1758,7 +1704,7 @@ |
| 1759 | 1705 | // Hide / remove track container |
| 1760 | 1706 | _this.$interface.find( '.track' ).remove(); |
| 1761 | 1707 | // We have to re-bind hoverIntent ( has to happen in this scope ) |
| 1762 | | - if( _this.controls && _this.controlBuilder.checkEmbedPlayer.OverlayControls() ){ |
| | 1708 | + if( _this.controls && _this.controlBuilder.checkOverlayControls() ){ |
| 1763 | 1709 | _this.controlBuilder.showControlBar(); |
| 1764 | 1710 | _this.$interface.hoverIntent({ |
| 1765 | 1711 | 'sensitivity': 4, |
| Index: branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/mvpcf/mw.style.PlayerSkinMvpcf.css |
| — | — | @@ -127,7 +127,7 @@ |
| 128 | 128 | width:10px; |
| 129 | 129 | height:15px; |
| 130 | 130 | margin-left:-5px; |
| 131 | | - margin-top: -1px; |
| | 131 | + margin-top: -0px; |
| 132 | 132 | z-index: 2; |
| 133 | 133 | } |
| 134 | 134 | |
| Index: branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayerNative.js |
| — | — | @@ -78,7 +78,7 @@ |
| 79 | 79 | * Get the native player embed code. |
| 80 | 80 | * |
| 81 | 81 | * @param {object} playerAttribtues Attributes to be override in function call |
| 82 | | - * @return {object} jQuery player code object |
| | 82 | + * @return {object} cssSet css to apply to the player |
| 83 | 83 | */ |
| 84 | 84 | getNativePlayerHtml: function( playerAttribtues, cssSet ){ |
| 85 | 85 | if( !playerAttribtues) { |