| Index: branches/js2-work/phase3/js/mwEmbed/tests/Player_Themable.html |
| — | — | @@ -22,8 +22,7 @@ |
| 23 | 23 | To play with dynamic Themes install <a href="http://jqueryui.com/themeroller/developertool/">Themeroller</a><p><p> |
| 24 | 24 | |
| 25 | 25 | <div style="width:450px;float:left"> |
| 26 | | -<video |
| 27 | | - class="kskin" |
| | 26 | +<video |
| 28 | 27 | style="width:400px;height:300px" |
| 29 | 28 | src="http://localhost/lucky.ogv" |
| 30 | 29 | poster="http://upload.wikimedia.org/wikipedia/commons/thumb/2/29/Charles_Lindbergh_flight_to_Brussels.ogg/mid-Charles_Lindbergh_flight_to_Brussels.ogg.jpg" |
| Index: branches/js2-work/phase3/js/mwEmbed/includes/noMediaWikiConfig.php |
| — | — | @@ -58,7 +58,7 @@ |
| 59 | 59 | require_once( realpath( dirname( __FILE__ ) ) . '/library/JSMin.php' ); |
| 60 | 60 | |
| 61 | 61 | // Get the messages file: |
| 62 | | -require_once( realpath( dirname( __FILE__ ) ) . '../languages/mwEmbed.i18n.php' ); |
| | 62 | +require_once( realpath( dirname( __FILE__ ) ) . '/../languages/mwEmbed.i18n.php' ); |
| 63 | 63 | |
| 64 | 64 | function wfDebug() { |
| 65 | 65 | return false; |
| Index: branches/js2-work/phase3/js/mwEmbed/languages/mwEmbed.i18n.php |
| — | — | @@ -12,22 +12,67 @@ |
| 13 | 13 | |
| 14 | 14 | $messages['en'] = array( |
| 15 | 15 | /* |
| 16 | | - * js file: /skins/kskin/kskinConfig.js |
| | 16 | + * js file: /modules/EmbedPlayer/mw.EmbedPlayer.js |
| 17 | 17 | */ |
| 18 | | - 'mwe-credit-title' => 'Title: $1', |
| | 18 | + 'mwe-loading_plugin' => 'loading plugin ...', |
| | 19 | + 'mwe-select_playback' => 'Set playback preference', |
| | 20 | + 'mwe-link_back' => 'Link back', |
| | 21 | + 'mwe-error_swap_vid' => 'Error: mwEmbed was unable to swap the video tag for the mwEmbed interface', |
| | 22 | + 'mwe-add_to_end_of_sequence' => 'Add to end of sequence', |
| | 23 | + 'mwe-missing_video_stream' => 'The video file for this stream is missing', |
| | 24 | + 'mwe-play_clip' => 'Play clip', |
| | 25 | + 'mwe-pause_clip' => 'Pause clip', |
| | 26 | + 'mwe-volume_control' => 'Volume control', |
| | 27 | + 'mwe-player_options' => 'Player options', |
| | 28 | + 'mwe-timed_text' => 'Timed text', |
| | 29 | + 'mwe-player_fullscreen' => 'Fullscreen', |
| | 30 | + 'mwe-next_clip_msg' => 'Play next clip', |
| | 31 | + 'mwe-prev_clip_msg' => 'Play previous clip', |
| | 32 | + 'mwe-current_clip_msg' => 'Continue playing this clip', |
| | 33 | + 'mwe-seek_to' => 'Seek $1', |
| | 34 | + 'mwe-paused' => 'paused', |
| | 35 | + 'mwe-download_segment' => 'Download selection:', |
| | 36 | + 'mwe-download_full' => 'Download full video file:', |
| | 37 | + 'mwe-download_right_click' => 'To download, right click and select <i>Save link as...</i>', |
| | 38 | + 'mwe-download_clip' => 'Download video', |
| | 39 | + 'mwe-download_text' => 'Download text (<a style="color:white" title="cmml" href="http://wiki.xiph.org/index.php/CMML">CMML</a> xml):', |
| | 40 | + 'mwe-download' => 'Download', |
| | 41 | + 'mwe-share' => 'Share', |
| | 42 | + 'mwe-credits' => 'Credits', |
| | 43 | + 'mwe-clip_linkback' => 'Clip source page', |
| | 44 | + 'mwe-chose_player' => 'Choose video player', |
| | 45 | + 'mwe-no-player' => 'No player available for $1', |
| | 46 | + 'mwe-share_this_video' => 'Share this video', |
| | 47 | + 'mwe-video_credits' => 'Video credits', |
| | 48 | + 'mwe-kaltura-platform-title' => 'Kaltura open source video platform', |
| | 49 | + 'mwe-menu_btn' => 'Menu', |
| | 50 | + 'mwe-close_btn' => 'Close', |
| | 51 | + 'mwe-ogg-player-vlc-player' => 'VLC player', |
| | 52 | + 'mwe-ogg-player-oggNative' => 'HTML5 ogg player', |
| | 53 | + 'mwe-ogg-player-h264Native' => 'HTML5 h.264 player', |
| | 54 | + 'mwe-ogg-player-oggPlugin' => 'Generic Ogg plugin', |
| | 55 | + 'mwe-ogg-player-quicktime-mozilla' => 'QuickTime plugin', |
| | 56 | + 'mwe-ogg-player-quicktime-activex' => 'QuickTime ActiveX', |
| | 57 | + 'mwe-ogg-player-cortado' => 'Java Cortado', |
| | 58 | + 'mwe-ogg-player-flowplayer' => 'Flowplayer', |
| | 59 | + 'mwe-ogg-player-kplayer' => 'Kaltura player', |
| | 60 | + 'mwe-ogg-player-selected' => '(selected)', |
| | 61 | + 'mwe-ogg-player-omtkplayer' => 'OMTK Flash Vorbis', |
| | 62 | + 'mwe-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 />', |
| | 63 | + 'mwe-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>', |
| | 64 | + 'mwe-do_not_warn_again' => 'Dismiss for now.', |
| | 65 | + 'mwe-playerSelect' => 'Players', |
| | 66 | + 'mwe-read_before_embed' => '<a href="http://mediawiki.org/wiki/Security_Notes_on_Remote_Embedding" target="_new">Read this</a> before embedding.', |
| | 67 | + 'mwe-embed_site_or_blog' => 'Embed on a page', |
| | 68 | + 'mwe-related_videos' => 'Related videos', |
| | 69 | + 'mwe-seeking' => 'seeking', |
| | 70 | + 'mwe-copy-code' => 'Copy code', |
| | 71 | + 'mwe-video-h264' => 'H.264 video', |
| | 72 | + 'mwe-video-flv' => 'Flash video', |
| | 73 | + 'mwe-video-ogg' => 'Ogg video', |
| | 74 | + 'mwe-video-audio' => 'Ogg audio', |
| 19 | 75 | |
| 20 | 76 | /* |
| 21 | | - * js file: /modules/Sequencer/mw.TimedEffectsEdit.js |
| 22 | | - */ |
| 23 | | - 'mwe-transition_in' => 'Transition in', |
| 24 | | - 'mwe-transition_out' => 'Transition out', |
| 25 | | - 'mwe-effects' => 'Effects stack', |
| 26 | | - 'mwe-remove_transition' => 'Remove transition', |
| 27 | | - 'mwe-edit_transin' => 'Edit transition into clip', |
| 28 | | - 'mwe-edit_transout' => 'Edit transition out of clip', |
| 29 | | - 'mwe-add-transition' => 'Add a transition', |
| 30 | | - |
| 31 | | - /* |
| 32 | 77 | * js file: /modules/Sequencer/mw.Sequencer.js |
| 33 | 78 | */ |
| 34 | 79 | 'mwe-menu_clipedit' => 'Edit media', |
| — | — | @@ -66,12 +111,65 @@ |
| 67 | 112 | 'mwe-sequencer_credit_line' => 'Developed by <a href="http://kaltura.com">Kaltura, Inc.</a> in partnership with the <a href="http://wikimediafoundation.org/wiki/Home">Wikimedia Foundation</a> (<a href="#">more information</a>).', |
| 68 | 113 | |
| 69 | 114 | /* |
| | 115 | + * js file: /modules/Sequencer/mw.TimedEffectsEdit.js |
| | 116 | + */ |
| | 117 | + 'mwe-transition_in' => 'Transition in', |
| | 118 | + 'mwe-transition_out' => 'Transition out', |
| | 119 | + 'mwe-effects' => 'Effects stack', |
| | 120 | + 'mwe-remove_transition' => 'Remove transition', |
| | 121 | + 'mwe-edit_transin' => 'Edit transition into clip', |
| | 122 | + 'mwe-edit_transout' => 'Edit transition out of clip', |
| | 123 | + 'mwe-add-transition' => 'Add a transition', |
| | 124 | + |
| | 125 | + /* |
| 70 | 126 | * js file: /modules/Sequencer/remotes/RemoteMwSequencer.js |
| 71 | 127 | */ |
| 72 | 128 | 'mwe-no-sequence-create' => 'No sequence exists named $1, You can $2', |
| 73 | 129 | 'mwe-sequence-create-one' => 'start a sequence', |
| 74 | 130 | |
| 75 | 131 | /* |
| | 132 | + * js file: /modules/ClipEdit/mw.ClipEdit.js |
| | 133 | + */ |
| | 134 | + 'mwe-crop' => 'Crop image', |
| | 135 | + 'mwe-apply_crop' => 'Apply crop to image', |
| | 136 | + 'mwe-reset_crop' => 'Reset crop', |
| | 137 | + 'mwe-insert_image_page' => 'Insert into page', |
| | 138 | + 'mwe-insert_into_sequence' => 'Insert into sequence', |
| | 139 | + 'mwe-preview_insert' => 'Preview insert', |
| | 140 | + 'mwe-cancel_image_insert' => 'Cancel insert', |
| | 141 | + 'mwe-sc_attributes' => 'Clip detail edit', |
| | 142 | + 'mwe-sc_inoutpoints' => 'Set in-out points', |
| | 143 | + 'mwe-sc_overlays' => 'Overlays', |
| | 144 | + 'mwe-sc_audio' => 'Audio control', |
| | 145 | + 'mwe-sc_duration' => 'Duration', |
| | 146 | + 'mwe-template_properties' => 'Template properties', |
| | 147 | + 'mwe-custom_title' => 'Custom title', |
| | 148 | + 'mwe-edit_properties' => 'Edit properties', |
| | 149 | + 'mwe-other_properties' => 'Other properties', |
| | 150 | + 'mwe-resource_page' => 'Resource page:', |
| | 151 | + 'mwe-set_in_out_points' => 'Set in-out points', |
| | 152 | + 'mwe-start_time' => 'Start time', |
| | 153 | + 'mwe-end_time' => 'End time', |
| | 154 | + 'mwe-preview_inout' => 'Preview in-out points', |
| | 155 | + 'mwe-edit-tools' => 'Edit tools', |
| | 156 | + 'mwe-inline-description' => 'Caption', |
| | 157 | + 'mwe-edit-video-tools' => 'Edit video tools:', |
| | 158 | + 'mwe-duration' => 'Duration:', |
| | 159 | + 'mwe-layout' => 'Layout', |
| | 160 | + 'mwe-layout_right' => 'Right side image layout', |
| | 161 | + 'mwe-layout_left' => 'Left side image layout', |
| | 162 | + |
| | 163 | + /* |
| | 164 | + * js file: /modules/ApiProxy/mw.ApiProxy.js |
| | 165 | + */ |
| | 166 | + 'mwe-setting-up-proxy' => 'Setting up proxy...', |
| | 167 | + 'mwe-re-try' => 'Retry API request', |
| | 168 | + 'mwe-re-trying' => 'Retrying API request...', |
| | 169 | + 'mwe-proxy-not-ready' => 'Proxy is not configured', |
| | 170 | + 'mwe-please-login' => 'You are not <a target="_new" href="$1">logged in</a> on $2 or mwEmbed has not been enabled. Resolve the issue, and then retry the request.', |
| | 171 | + 'mwe-remember-loging' => 'General security reminder: Only login to web sites when your address bar displays that site\'s address.', |
| | 172 | + |
| | 173 | + /* |
| 76 | 174 | * js file: /modules/TimedText/mw.TimedTextEdit.js |
| 77 | 175 | */ |
| 78 | 176 | 'mew-timedtext-editor' => 'Timed text editor', |
| — | — | @@ -130,66 +228,84 @@ |
| 131 | 229 | 'mwe-language-no-subtitles-for-clip' => 'No $1 subtitles where found for clip: $2', |
| 132 | 230 | |
| 133 | 231 | /* |
| 134 | | - * js file: /modules/EmbedPlayer/mw.EmbedPlayer.js |
| | 232 | + * js file: /modules/AddMedia/mw.RemoteSearchDriver.js |
| 135 | 233 | */ |
| 136 | | - 'mwe-loading_plugin' => 'loading plugin ...', |
| 137 | | - 'mwe-select_playback' => 'Set playback preference', |
| 138 | | - 'mwe-link_back' => 'Link back', |
| 139 | | - 'mwe-error_swap_vid' => 'Error: mwEmbed was unable to swap the video tag for the mwEmbed interface', |
| 140 | | - 'mwe-add_to_end_of_sequence' => 'Add to end of sequence', |
| 141 | | - 'mwe-missing_video_stream' => 'The video file for this stream is missing', |
| 142 | | - 'mwe-play_clip' => 'Play clip', |
| 143 | | - 'mwe-pause_clip' => 'Pause clip', |
| 144 | | - 'mwe-volume_control' => 'Volume control', |
| 145 | | - 'mwe-player_options' => 'Player options', |
| 146 | | - 'mwe-timed_text' => 'Timed text', |
| 147 | | - 'mwe-player_fullscreen' => 'Fullscreen', |
| 148 | | - 'mwe-next_clip_msg' => 'Play next clip', |
| 149 | | - 'mwe-prev_clip_msg' => 'Play previous clip', |
| 150 | | - 'mwe-current_clip_msg' => 'Continue playing this clip', |
| 151 | | - 'mwe-seek_to' => 'Seek $1', |
| 152 | | - 'mwe-paused' => 'paused', |
| 153 | | - 'mwe-download_segment' => 'Download selection:', |
| 154 | | - 'mwe-download_full' => 'Download full video file:', |
| 155 | | - 'mwe-download_right_click' => 'To download, right click and select <i>Save link as...</i>', |
| 156 | | - 'mwe-download_clip' => 'Download video', |
| 157 | | - 'mwe-download_text' => 'Download text (<a style="color:white" title="cmml" href="http://wiki.xiph.org/index.php/CMML">CMML</a> xml):', |
| 158 | | - 'mwe-download' => 'Download', |
| 159 | | - 'mwe-share' => 'Share', |
| 160 | | - 'mwe-credits' => 'Credits', |
| 161 | | - 'mwe-clip_linkback' => 'Clip source page', |
| 162 | | - 'mwe-chose_player' => 'Choose video player', |
| 163 | | - 'mwe-no-player' => 'No player available for $1', |
| 164 | | - 'mwe-share_this_video' => 'Share this video', |
| 165 | | - 'mwe-video_credits' => 'Video credits', |
| 166 | | - 'mwe-kaltura-platform-title' => 'Kaltura open source video platform', |
| 167 | | - 'mwe-menu_btn' => 'Menu', |
| 168 | | - 'mwe-close_btn' => 'Close', |
| 169 | | - 'mwe-ogg-player-vlc-player' => 'VLC player', |
| 170 | | - 'mwe-ogg-player-videoElement' => 'Native Ogg video', |
| 171 | | - 'mwe-ogg-player-oggPlugin' => 'Generic Ogg plugin', |
| 172 | | - 'mwe-ogg-player-quicktime-mozilla' => 'QuickTime plugin', |
| 173 | | - 'mwe-ogg-player-quicktime-activex' => 'QuickTime ActiveX', |
| 174 | | - 'mwe-ogg-player-cortado' => 'Java Cortado', |
| 175 | | - 'mwe-ogg-player-flowplayer' => 'Flowplayer', |
| 176 | | - 'mwe-ogg-player-kplayer' => 'Kaltura player', |
| 177 | | - 'mwe-ogg-player-selected' => '(selected)', |
| 178 | | - 'mwe-ogg-player-omtkplayer' => 'OMTK Flash Vorbis', |
| 179 | | - 'mwe-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 />', |
| 180 | | - 'mwe-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>', |
| 181 | | - 'mwe-do_not_warn_again' => 'Dismiss for now.', |
| 182 | | - 'mwe-playerSelect' => 'Players', |
| 183 | | - 'mwe-read_before_embed' => '<a href="http://mediawiki.org/wiki/Security_Notes_on_Remote_Embedding" target="_new">Read this</a> before embedding.', |
| 184 | | - 'mwe-embed_site_or_blog' => 'Embed on a page', |
| 185 | | - 'mwe-related_videos' => 'Related videos', |
| 186 | | - 'mwe-seeking' => 'seeking', |
| 187 | | - 'mwe-copy-code' => 'Copy code', |
| 188 | | - 'mwe-video-h264' => 'H.264 video', |
| 189 | | - 'mwe-video-flv' => 'Flash video', |
| 190 | | - 'mwe-video-ogg' => 'Ogg video', |
| 191 | | - 'mwe-video-audio' => 'Ogg audio', |
| | 234 | + 'mwe-add_media_wizard' => 'Add media wizard', |
| | 235 | + 'mwe-media_search' => 'Media search', |
| | 236 | + 'rsd_box_layout' => 'Box layout', |
| | 237 | + 'rsd_list_layout' => 'List layout', |
| | 238 | + 'rsd_results_desc' => 'Results $1 to $2', |
| | 239 | + 'rsd_results_desc_total' => 'Results $1 to $2 of $3', |
| | 240 | + 'rsd_results_next' => 'next', |
| | 241 | + 'rsd_results_prev' => 'previous', |
| | 242 | + 'rsd_no_results' => 'No search results for <b>$1</b>', |
| | 243 | + 'mwe-upload_tab' => 'Upload', |
| | 244 | + 'rsd_layout' => 'Layout:', |
| | 245 | + 'rsd_resource_edit' => 'Edit resource: $1', |
| | 246 | + 'mwe-resource_description_page' => 'Resource description page', |
| | 247 | + 'mwe-link' => 'link', |
| | 248 | + 'rsd_do_insert' => 'Do insert', |
| | 249 | + 'mwe-cc_title' => 'Creative Commons', |
| | 250 | + 'mwe-cc_by_title' => 'Attribution', |
| | 251 | + 'mwe-cc_nc_title' => 'Noncommercial', |
| | 252 | + 'mwe-cc_nd_title' => 'No Derivative Works', |
| | 253 | + 'mwe-cc_sa_title' => 'Share Alike', |
| | 254 | + 'mwe-cc_pd_title' => 'Public Domain', |
| | 255 | + 'mwe-unknown_license' => 'Unknown license', |
| | 256 | + 'mwe-no-import-by-url' => 'This user or wiki <b>cannot</b> import assets from remote URLs.<p>Do you need to login?</p><p>Is upload_by_url permission set for you?<br />Does the wiki have $1 enabled?</p>', |
| | 257 | + 'mwe-no-import-by-url-linktext' => '$wgAllowCopyUploads', |
| | 258 | + 'mwe-results_from' => 'Results from <a href="$1" target="_new" >$2</a>', |
| | 259 | + 'mwe-missing_desc_see_source' => 'This asset is missing a description. Please see the [$1 original source] and help describe it.', |
| | 260 | + 'rsd_config_error' => 'Add media wizard configuration error: $1', |
| | 261 | + 'mwe-your_recent_uploads' => 'Your recent uploads to $1', |
| | 262 | + 'mwe-no_recent_uploads' => 'No recent uploads', |
| | 263 | + 'mwe-upload_a_file' => 'Upload a new file to $1', |
| | 264 | + 'mwe-resource_page_desc' => 'Resource page description:', |
| | 265 | + 'mwe-edit_resource_desc' => 'Edit wiki text resource description:', |
| | 266 | + 'mwe-local_resource_title' => 'Local resource title:', |
| | 267 | + 'mwe-watch_this_page' => 'Watch this page', |
| | 268 | + 'mwe-do_import_resource' => 'Import resource', |
| | 269 | + 'mwe-update_preview' => 'Update resource page preview', |
| | 270 | + 'mwe-return-search-results' => 'Return to search results', |
| | 271 | + 'mwe-importing_asset' => 'Importing asset', |
| | 272 | + 'mwe-preview_insert_resource' => 'Preview insert of resource: $1', |
| | 273 | + 'mwe-do-more-modification' => 'Do More Modification', |
| | 274 | + 'mwe-checking-resource' => 'Checking for resource', |
| | 275 | + 'mwe-resource-needs-import' => 'Resource $1 needs to be imported to $2', |
| | 276 | + 'mwe-ftype-svg' => 'SVG vector file', |
| | 277 | + 'mwe-ftype-jpg' => 'JPEG image file', |
| | 278 | + 'mwe-ftype-png' => 'PNG image file', |
| | 279 | + 'mwe-ftype-oga' => 'Ogg audio file', |
| | 280 | + 'mwe-ftype-ogg' => 'Ogg video file', |
| | 281 | + 'mwe-ftype-unk' => 'Unknown file format', |
| | 282 | + 'rsd-wiki_commons-title' => 'Wikimedia Commons', |
| | 283 | + 'rsd-wiki_commons' => 'Wikimedia Commons, an archive of freely-licensed educational media content (images, sound and video clips)', |
| | 284 | + 'rsd-kaltura-title' => 'All Sources', |
| | 285 | + 'rsd-kaltura' => 'Kaltura agragated search for free-licensed media across multiple search providers', |
| | 286 | + 'rsd-this_wiki-title' => 'This wiki', |
| | 287 | + 'rsd-this_wiki-desc' => 'The local wiki install', |
| | 288 | + 'rsd-archive_org-title' => 'Archive.org', |
| | 289 | + 'rsd-archive_org-desc' => 'The Internet Archive, a digital library of cultural artifacts', |
| | 290 | + 'rsd-flickr-title' => 'Flickr.com', |
| | 291 | + 'rsd-flickr-desc' => 'Flickr.com, a online photo sharing site', |
| | 292 | + 'rsd-metavid-title' => 'Metavid.org', |
| | 293 | + 'rsd-metavid-desc' => 'Metavid.org, a community archive of US House and Senate floor proceedings', |
| | 294 | + 'rsd-search-timeout' => 'The search request did not complete. The server may be down experiencing heavy load. You can try again later', |
| 192 | 295 | |
| 193 | 296 | /* |
| | 297 | + * js file: /modules/AddMedia/jquery.simpleUploadForm.js |
| | 298 | + */ |
| | 299 | + 'mwe-select_file' => 'Select file', |
| | 300 | + 'mwe-select_ownwork' => 'I am uploading entirely my own work, and licensing it under:', |
| | 301 | + 'mwe-license_cc-by-sa' => 'Creative Commons Share Alike (3.0)', |
| | 302 | + 'mwe-upload' => 'Upload file', |
| | 303 | + 'mwe-destfilename' => 'Destination filename:', |
| | 304 | + 'mwe-summary' => 'Summary', |
| | 305 | + 'mwe-error_not_loggedin' => 'You do not appear to be logged in or do not have upload privileges.', |
| | 306 | + 'mwe-watch-this-file' => 'Watch this file', |
| | 307 | + 'mwe-ignore-any-warnings' => 'Ignore any warnings', |
| | 308 | + |
| | 309 | + /* |
| 194 | 310 | * js file: /modules/AddMedia/mw.UploadHandler.js |
| 195 | 311 | */ |
| 196 | 312 | 'mwe-upload-in-progress' => 'Upload in progress (do not close this window)', |
| — | — | @@ -220,11 +336,54 @@ |
| 221 | 337 | 'filesource' => 'Source:', |
| 222 | 338 | |
| 223 | 339 | /* |
| 224 | | - * js file: /modules/AddMedia/loader.js |
| | 340 | + * js file: /modules/AddMedia/mw.Firefogg.js |
| 225 | 341 | */ |
| 226 | | - 'mwe-loading-add-media-wiz' => 'Loading add media wizard', |
| | 342 | + 'mwe-upload-transcode-in-progress' => 'Transcode and upload in progress (do not close this window)', |
| | 343 | + 'fogg-transcoding' => 'Encoding video to ogg', |
| | 344 | + 'fogg-select_file' => 'Select file', |
| | 345 | + 'fogg-select_new_file' => 'Select new file', |
| | 346 | + 'fogg-select_url' => 'Select URL', |
| | 347 | + 'fogg-check_for_firefogg' => 'Checking for Firefogg...', |
| | 348 | + 'fogg-installed' => 'Firefogg is installed,', |
| | 349 | + 'fogg-not-installed' => 'Firefogg is not installed', |
| | 350 | + 'fogg-for_improved_uploads' => 'For improved uploads:', |
| | 351 | + 'fogg-please-install' => '$1. More $2', |
| | 352 | + 'fogg-please-install-install-linktext' => 'Install firefogg', |
| | 353 | + 'fogg-please-install-about-linktext' => 'about firefogg', |
| | 354 | + 'fogg-use_latest_firefox' => 'Please first install <a href="http://www.mozilla.com/en-US/firefox/upgrade.html?from=firefogg">Firefox 3.5</a> (or later). <i>Then revisit this page to install the <b>Firefogg</b> extension.</i>', |
| | 355 | + 'fogg-passthrough_mode' => 'Your selected file is already ogg or not a video file', |
| | 356 | + 'fogg-encoding-done' => 'Encoding complete', |
| | 357 | + 'fogg-badtoken' => 'Token is not valid', |
| | 358 | + 'fogg-preview' => 'Preview video', |
| | 359 | + 'fogg-hidepreview' => 'Hide preview', |
| | 360 | + 'fogg-warning-firebug' => '<b>Firebug</b> can cause conflicts with <i>Firefogg</i>. Please disable <b>Firebug</b> for this page.', |
| 227 | 361 | |
| 228 | 362 | /* |
| | 363 | + * js file: /modules/AddMedia/searchLibs/metavidSearch.js |
| | 364 | + */ |
| | 365 | + 'mwe-stream_title' => '$1 $2 to $3', |
| | 366 | + |
| | 367 | + /* |
| | 368 | + * js file: /modules/AddMedia/searchLibs/kalturaSearch.js |
| | 369 | + */ |
| | 370 | + 'rsd-media-filter-title' => 'Media', |
| | 371 | + 'rsd-media-filter-videos' => 'Videos', |
| | 372 | + 'rsd-media-filter-images' => 'Images', |
| | 373 | + 'rsd-provider-filter-title' => 'Providers', |
| | 374 | + |
| | 375 | + /* |
| | 376 | + * js file: /modules/AddMedia/searchLibs/baseRemoteSearch.js |
| | 377 | + */ |
| | 378 | + 'mwe-imported_from' => '$1 imported from [$2 $3]. See the original [$4 resource page] for more information.', |
| | 379 | + 'mwe-import-description' => '$1, imported from $2', |
| | 380 | + |
| | 381 | + /* |
| | 382 | + * js file: /modules/AddMedia/jquery.dragDropFile.js |
| | 383 | + */ |
| | 384 | + 'mwe-upload-multi' => 'Upload {{PLURAL:$1|file|files}}', |
| | 385 | + 'mwe-review-upload' => 'Review file {{PLURAL:$1|upload|uploads}}', |
| | 386 | + |
| | 387 | + /* |
| 229 | 388 | * js file: /modules/AddMedia/mw.FirefoggGUI.js |
| 230 | 389 | */ |
| 231 | 390 | 'fogg-save_local_file' => 'Save Ogg', |
| — | — | @@ -292,174 +451,11 @@ |
| 293 | 452 | 'fogg-contact-help' => 'Contact link', |
| 294 | 453 | |
| 295 | 454 | /* |
| 296 | | - * js file: /modules/AddMedia/searchLibs/metavidSearch.js |
| | 455 | + * js file: /modules/AddMedia/loader.js |
| 297 | 456 | */ |
| 298 | | - 'mwe-stream_title' => '$1 $2 to $3', |
| | 457 | + 'mwe-loading-add-media-wiz' => 'Loading add media wizard', |
| 299 | 458 | |
| 300 | 459 | /* |
| 301 | | - * js file: /modules/AddMedia/searchLibs/kalturaSearch.js |
| 302 | | - */ |
| 303 | | - 'rsd-media-filter-title' => 'Media', |
| 304 | | - 'rsd-media-filter-videos' => 'Videos', |
| 305 | | - 'rsd-media-filter-images' => 'Images', |
| 306 | | - 'rsd-provider-filter-title' => 'Providers', |
| 307 | | - |
| 308 | | - /* |
| 309 | | - * js file: /modules/AddMedia/searchLibs/baseRemoteSearch.js |
| 310 | | - */ |
| 311 | | - 'mwe-imported_from' => '$1 imported from [$2 $3]. See the original [$4 resource page] for more information.', |
| 312 | | - 'mwe-import-description' => '$1, imported from $2', |
| 313 | | - |
| 314 | | - /* |
| 315 | | - * js file: /modules/AddMedia/jquery.simpleUploadForm.js |
| 316 | | - */ |
| 317 | | - 'mwe-select_file' => 'Select file', |
| 318 | | - 'mwe-select_ownwork' => 'I am uploading entirely my own work, and licensing it under:', |
| 319 | | - 'mwe-license_cc-by-sa' => 'Creative Commons Share Alike (3.0)', |
| 320 | | - 'mwe-upload' => 'Upload file', |
| 321 | | - 'mwe-destfilename' => 'Destination filename:', |
| 322 | | - 'mwe-summary' => 'Summary', |
| 323 | | - 'mwe-error_not_loggedin' => 'You do not appear to be logged in or do not have upload privileges.', |
| 324 | | - 'mwe-watch-this-file' => 'Watch this file', |
| 325 | | - 'mwe-ignore-any-warnings' => 'Ignore any warnings', |
| 326 | | - |
| 327 | | - /* |
| 328 | | - * js file: /modules/AddMedia/mw.RemoteSearchDriver.js |
| 329 | | - */ |
| 330 | | - 'mwe-add_media_wizard' => 'Add media wizard', |
| 331 | | - 'mwe-media_search' => 'Media search', |
| 332 | | - 'rsd_box_layout' => 'Box layout', |
| 333 | | - 'rsd_list_layout' => 'List layout', |
| 334 | | - 'rsd_results_desc' => 'Results $1 to $2', |
| 335 | | - 'rsd_results_desc_total' => 'Results $1 to $2 of $3', |
| 336 | | - 'rsd_results_next' => 'next', |
| 337 | | - 'rsd_results_prev' => 'previous', |
| 338 | | - 'rsd_no_results' => 'No search results for <b>$1</b>', |
| 339 | | - 'mwe-upload_tab' => 'Upload', |
| 340 | | - 'rsd_layout' => 'Layout:', |
| 341 | | - 'rsd_resource_edit' => 'Edit resource: $1', |
| 342 | | - 'mwe-resource_description_page' => 'Resource description page', |
| 343 | | - 'mwe-link' => 'link', |
| 344 | | - 'rsd_do_insert' => 'Do insert', |
| 345 | | - 'mwe-cc_title' => 'Creative Commons', |
| 346 | | - 'mwe-cc_by_title' => 'Attribution', |
| 347 | | - 'mwe-cc_nc_title' => 'Noncommercial', |
| 348 | | - 'mwe-cc_nd_title' => 'No Derivative Works', |
| 349 | | - 'mwe-cc_sa_title' => 'Share Alike', |
| 350 | | - 'mwe-cc_pd_title' => 'Public Domain', |
| 351 | | - 'mwe-unknown_license' => 'Unknown license', |
| 352 | | - 'mwe-no-import-by-url' => 'This user or wiki <b>cannot</b> import assets from remote URLs.<p>Do you need to login?</p><p>Is upload_by_url permission set for you?<br />Does the wiki have $1 enabled?</p>', |
| 353 | | - 'mwe-no-import-by-url-linktext' => '$wgAllowCopyUploads', |
| 354 | | - 'mwe-results_from' => 'Results from <a href="$1" target="_new" >$2</a>', |
| 355 | | - 'mwe-missing_desc_see_source' => 'This asset is missing a description. Please see the [$1 original source] and help describe it.', |
| 356 | | - 'rsd_config_error' => 'Add media wizard configuration error: $1', |
| 357 | | - 'mwe-your_recent_uploads' => 'Your recent uploads to $1', |
| 358 | | - 'mwe-no_recent_uploads' => 'No recent uploads', |
| 359 | | - 'mwe-upload_a_file' => 'Upload a new file to $1', |
| 360 | | - 'mwe-resource_page_desc' => 'Resource page description:', |
| 361 | | - 'mwe-edit_resource_desc' => 'Edit wiki text resource description:', |
| 362 | | - 'mwe-local_resource_title' => 'Local resource title:', |
| 363 | | - 'mwe-watch_this_page' => 'Watch this page', |
| 364 | | - 'mwe-do_import_resource' => 'Import resource', |
| 365 | | - 'mwe-update_preview' => 'Update resource page preview', |
| 366 | | - 'mwe-return-search-results' => 'Return to search results', |
| 367 | | - 'mwe-importing_asset' => 'Importing asset', |
| 368 | | - 'mwe-preview_insert_resource' => 'Preview insert of resource: $1', |
| 369 | | - 'mwe-do-more-modification' => 'Do More Modification', |
| 370 | | - 'mwe-checking-resource' => 'Checking for resource', |
| 371 | | - 'mwe-resource-needs-import' => 'Resource $1 needs to be imported to $2', |
| 372 | | - 'mwe-ftype-svg' => 'SVG vector file', |
| 373 | | - 'mwe-ftype-jpg' => 'JPEG image file', |
| 374 | | - 'mwe-ftype-png' => 'PNG image file', |
| 375 | | - 'mwe-ftype-oga' => 'Ogg audio file', |
| 376 | | - 'mwe-ftype-ogg' => 'Ogg video file', |
| 377 | | - 'mwe-ftype-unk' => 'Unknown file format', |
| 378 | | - 'rsd-wiki_commons-title' => 'Wikimedia Commons', |
| 379 | | - 'rsd-wiki_commons' => 'Wikimedia Commons, an archive of freely-licensed educational media content (images, sound and video clips)', |
| 380 | | - 'rsd-kaltura-title' => 'All Sources', |
| 381 | | - 'rsd-kaltura' => 'Kaltura agragated search for free-licensed media across multiple search providers', |
| 382 | | - 'rsd-this_wiki-title' => 'This wiki', |
| 383 | | - 'rsd-this_wiki-desc' => 'The local wiki install', |
| 384 | | - 'rsd-archive_org-title' => 'Archive.org', |
| 385 | | - 'rsd-archive_org-desc' => 'The Internet Archive, a digital library of cultural artifacts', |
| 386 | | - 'rsd-flickr-title' => 'Flickr.com', |
| 387 | | - 'rsd-flickr-desc' => 'Flickr.com, a online photo sharing site', |
| 388 | | - 'rsd-metavid-title' => 'Metavid.org', |
| 389 | | - 'rsd-metavid-desc' => 'Metavid.org, a community archive of US House and Senate floor proceedings', |
| 390 | | - 'rsd-search-timeout' => 'The search request did not complete. The server may be down experiencing heavy load. You can try again later', |
| 391 | | - |
| 392 | | - /* |
| 393 | | - * js file: /modules/AddMedia/mw.Firefogg.js |
| 394 | | - */ |
| 395 | | - 'mwe-upload-transcode-in-progress' => 'Transcode and upload in progress (do not close this window)', |
| 396 | | - 'fogg-transcoding' => 'Encoding video to ogg', |
| 397 | | - 'fogg-select_file' => 'Select file', |
| 398 | | - 'fogg-select_new_file' => 'Select new file', |
| 399 | | - 'fogg-select_url' => 'Select URL', |
| 400 | | - 'fogg-check_for_firefogg' => 'Checking for Firefogg...', |
| 401 | | - 'fogg-installed' => 'Firefogg is installed,', |
| 402 | | - 'fogg-not-installed' => 'Firefogg is not installed', |
| 403 | | - 'fogg-for_improved_uploads' => 'For improved uploads:', |
| 404 | | - 'fogg-please-install' => '$1. More $2', |
| 405 | | - 'fogg-please-install-install-linktext' => 'Install firefogg', |
| 406 | | - 'fogg-please-install-about-linktext' => 'about firefogg', |
| 407 | | - 'fogg-use_latest_firefox' => 'Please first install <a href="http://www.mozilla.com/en-US/firefox/upgrade.html?from=firefogg">Firefox 3.5</a> (or later). <i>Then revisit this page to install the <b>Firefogg</b> extension.</i>', |
| 408 | | - 'fogg-passthrough_mode' => 'Your selected file is already ogg or not a video file', |
| 409 | | - 'fogg-encoding-done' => 'Encoding complete', |
| 410 | | - 'fogg-badtoken' => 'Token is not valid', |
| 411 | | - 'fogg-preview' => 'Preview video', |
| 412 | | - 'fogg-hidepreview' => 'Hide preview', |
| 413 | | - 'fogg-warning-firebug' => '<b>Firebug</b> can cause conflicts with <i>Firefogg</i>. Please disable <b>Firebug</b> for this page.', |
| 414 | | - |
| 415 | | - /* |
| 416 | | - * js file: /modules/AddMedia/jquery.dragDropFile.js |
| 417 | | - */ |
| 418 | | - 'mwe-upload-multi' => 'Upload {{PLURAL:$1|file|files}}', |
| 419 | | - 'mwe-review-upload' => 'Review file {{PLURAL:$1|upload|uploads}}', |
| 420 | | - |
| 421 | | - /* |
| 422 | | - * js file: /modules/ClipEdit/mw.ClipEdit.js |
| 423 | | - */ |
| 424 | | - 'mwe-crop' => 'Crop image', |
| 425 | | - 'mwe-apply_crop' => 'Apply crop to image', |
| 426 | | - 'mwe-reset_crop' => 'Reset crop', |
| 427 | | - 'mwe-insert_image_page' => 'Insert into page', |
| 428 | | - 'mwe-insert_into_sequence' => 'Insert into sequence', |
| 429 | | - 'mwe-preview_insert' => 'Preview insert', |
| 430 | | - 'mwe-cancel_image_insert' => 'Cancel insert', |
| 431 | | - 'mwe-sc_attributes' => 'Clip detail edit', |
| 432 | | - 'mwe-sc_inoutpoints' => 'Set in-out points', |
| 433 | | - 'mwe-sc_overlays' => 'Overlays', |
| 434 | | - 'mwe-sc_audio' => 'Audio control', |
| 435 | | - 'mwe-sc_duration' => 'Duration', |
| 436 | | - 'mwe-template_properties' => 'Template properties', |
| 437 | | - 'mwe-custom_title' => 'Custom title', |
| 438 | | - 'mwe-edit_properties' => 'Edit properties', |
| 439 | | - 'mwe-other_properties' => 'Other properties', |
| 440 | | - 'mwe-resource_page' => 'Resource page:', |
| 441 | | - 'mwe-set_in_out_points' => 'Set in-out points', |
| 442 | | - 'mwe-start_time' => 'Start time', |
| 443 | | - 'mwe-end_time' => 'End time', |
| 444 | | - 'mwe-preview_inout' => 'Preview in-out points', |
| 445 | | - 'mwe-edit-tools' => 'Edit tools', |
| 446 | | - 'mwe-inline-description' => 'Caption', |
| 447 | | - 'mwe-edit-video-tools' => 'Edit video tools:', |
| 448 | | - 'mwe-duration' => 'Duration:', |
| 449 | | - 'mwe-layout' => 'Layout', |
| 450 | | - 'mwe-layout_right' => 'Right side image layout', |
| 451 | | - 'mwe-layout_left' => 'Left side image layout', |
| 452 | | - |
| 453 | | - /* |
| 454 | | - * js file: /modules/ApiProxy/mw.ApiProxy.js |
| 455 | | - */ |
| 456 | | - 'mwe-setting-up-proxy' => 'Setting up proxy...', |
| 457 | | - 'mwe-re-try' => 'Retry API request', |
| 458 | | - 'mwe-re-trying' => 'Retrying API request...', |
| 459 | | - 'mwe-proxy-not-ready' => 'Proxy is not configured', |
| 460 | | - 'mwe-please-login' => 'You are not <a target="_new" href="$1">logged in</a> on $2 or mwEmbed has not been enabled. Resolve the issue, and then retry the request.', |
| 461 | | - 'mwe-remember-loging' => 'General security reminder: Only login to web sites when your address bar displays that site\'s address.', |
| 462 | | - |
| 463 | | - /* |
| 464 | 460 | * js file: /mwEmbed.js |
| 465 | 461 | */ |
| 466 | 462 | 'mwe-loading_txt' => 'Loading ...', |
| — | — | @@ -476,6 +472,11 @@ |
| 477 | 473 | 'mwe-enable-gadget-done' => 'mwEmbed gadget has been enabled', |
| 478 | 474 | 'mwe-must-login-gadget' => 'To enable gadget you must <a target="_new" href="$1">login</a>', |
| 479 | 475 | 'mwe-test-plural' => 'I ran {{PLURAL:$1|$1 test|$1 tests}}', |
| | 476 | + |
| | 477 | + /* |
| | 478 | + * js file: /skins/kskin/kskinConfig.js |
| | 479 | + */ |
| | 480 | + 'mwe-credit-title' => 'Title: $1', |
| 480 | 481 | ); |
| 481 | 482 | |
| 482 | 483 | /** Afrikaans (Afrikaans) |
| Index: branches/js2-work/phase3/js/mwEmbed/skins/ctrlBuilder.js |
| — | — | @@ -533,7 +533,8 @@ |
| 534 | 534 | 'width' : 250, |
| 535 | 535 | 'position' : 'absolute', |
| 536 | 536 | 'left' : '10px', |
| 537 | | - 'top': '10px', |
| | 537 | + 'top': '15px', |
| | 538 | + 'overflow' : 'auto', |
| 538 | 539 | 'padding' : '4px', |
| 539 | 540 | 'z-index' : 1 |
| 540 | 541 | }) |
| — | — | @@ -744,9 +745,10 @@ |
| 745 | 746 | var $textList = $j( '<ul />' ); |
| 746 | 747 | $j.each( embedPlayer.mediaElement.getSources(), function( index, source ) { |
| 747 | 748 | if( source.getSrc() ) { |
| | 749 | + mw.log("add src: " + source.getTitle() ); |
| 748 | 750 | var $dl_line = $j( '<li />').append( |
| 749 | 751 | $j('<a />') |
| 750 | | - .attr( 'href', source.getSrc()) |
| | 752 | + .attr( 'href', source.getSrc() ) |
| 751 | 753 | .text( source.getTitle() ) |
| 752 | 754 | ); |
| 753 | 755 | // Add link to correct "bucket" |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/EmbedPlayer/kplayerEmbed.js |
| — | — | @@ -8,11 +8,11 @@ |
| 9 | 9 | |
| 10 | 10 | // List of supported features: |
| 11 | 11 | supports: { |
| 12 | | - 'play_head':true, |
| | 12 | + 'playHead':true, |
| 13 | 13 | 'pause':true, |
| 14 | 14 | 'stop':true, |
| 15 | | - 'time_display':true, |
| 16 | | - 'volume_control':true, |
| | 15 | + 'timeDisplay':true, |
| | 16 | + 'volumeControl':true, |
| 17 | 17 | 'overlay':false, |
| 18 | 18 | 'fullscreen':false |
| 19 | 19 | }, |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/EmbedPlayer/mw.EmbedPlayer.js |
| — | — | @@ -43,7 +43,8 @@ |
| 44 | 44 | "mwe-menu_btn" : "Menu", |
| 45 | 45 | "mwe-close_btn" : "Close", |
| 46 | 46 | "mwe-ogg-player-vlc-player" : "VLC player", |
| 47 | | - "mwe-ogg-player-videoElement" : "Native Ogg video", |
| | 47 | + "mwe-ogg-player-oggNative" : "HTML5 ogg player", |
| | 48 | + "mwe-ogg-player-h264Native" : "HTML5 h.264 player", |
| 48 | 49 | "mwe-ogg-player-oggPlugin" : "Generic Ogg plugin", |
| 49 | 50 | "mwe-ogg-player-quicktime-mozilla" : "QuickTime plugin", |
| 50 | 51 | "mwe-ogg-player-quicktime-activex" : "QuickTime ActiveX", |
| — | — | @@ -659,7 +660,7 @@ |
| 660 | 661 | * Sets the duration and sets the end time if unset |
| 661 | 662 | * @param {Float} duration: in seconds |
| 662 | 663 | */ |
| 663 | | - setDuration:function ( duration ) { |
| | 664 | + setDuration: function ( duration ) { |
| 664 | 665 | this.duration = duration; |
| 665 | 666 | if ( !this.end_npt ) { |
| 666 | 667 | this.end_npt = mw.seconds2npt( this.startOffset + duration ); |
| — | — | @@ -670,7 +671,10 @@ |
| 671 | 672 | * MIME type accessor function. |
| 672 | 673 | * @return {String} the MIME type of the source. |
| 673 | 674 | */ |
| 674 | | - getMIMEType : function() { |
| | 675 | + getMIMEType: function() { |
| | 676 | + if( this.mime_type ) |
| | 677 | + return this.mime_type; |
| | 678 | + this.mime_type = this.detectType( this.src ); |
| 675 | 679 | return this.mime_type; |
| 676 | 680 | }, |
| 677 | 681 | |
| — | — | @@ -699,12 +703,13 @@ |
| 700 | 704 | * @return Title of the source. |
| 701 | 705 | * @type String |
| 702 | 706 | */ |
| 703 | | - getTitle : function() { |
| 704 | | - if( this.title ) |
| | 707 | + getTitle : function() { |
| | 708 | + if( this.title ){ |
| 705 | 709 | return this.title; |
| | 710 | + } |
| 706 | 711 | |
| 707 | 712 | // Return a Title based on mime type: |
| 708 | | - switch( this.mime_type ) { |
| | 713 | + switch( this.getMIMEType() ) { |
| 709 | 714 | case 'video/h264' : |
| 710 | 715 | return gM( 'mwe-video-h264' ); |
| 711 | 716 | break; |
| — | — | @@ -773,6 +778,7 @@ |
| 774 | 779 | var end_inx = ( uri.indexOf( '?' ) != -1 ) ? uri.indexOf( '?' ) : uri.length; |
| 775 | 780 | var no_param_uri = uri.substr( 0, end_inx ); |
| 776 | 781 | switch( no_param_uri.substr( no_param_uri.lastIndexOf( '.' ), 4 ).toLowerCase() ) { |
| | 782 | + case '.m4v': |
| 777 | 783 | case '.mp4': |
| 778 | 784 | return 'video/h264'; |
| 779 | 785 | break; |
| — | — | @@ -2911,8 +2917,10 @@ |
| 2912 | 2918 | var cortadoPlayer = new mediaPlayer( 'cortado', ['video/ogg', 'audio/ogg', 'application/ogg'], 'java' ); |
| 2913 | 2919 | |
| 2914 | 2920 | // Native html5 player |
| 2915 | | -var videoElementPlayer = new mediaPlayer( 'videoElement', ['video/ogg', 'audio/ogg', 'application/ogg'], 'native' ); |
| | 2921 | +var oggNativePlayer = new mediaPlayer( 'oggNative', ['video/ogg', 'audio/ogg', 'application/ogg'], 'native' ); |
| 2916 | 2922 | |
| | 2923 | +var h264NativePlayer = new mediaPlayer( 'h264Native', ['video/h264'], 'native' ); |
| | 2924 | + |
| 2917 | 2925 | // VLC player |
| 2918 | 2926 | var vlcMineList = ['video/ogg', 'audio/ogg', 'application/ogg', 'video/x-flv', 'video/mp4', 'video/h264']; |
| 2919 | 2927 | var vlcPlayer = new mediaPlayer( 'vlc-player', vlcMineList, 'vlc' ); |
| — | — | @@ -2960,7 +2968,7 @@ |
| 2961 | 2969 | |
| 2962 | 2970 | // set up default players order for each library type |
| 2963 | 2971 | this.default_players['video/x-flv'] = ['kplayer', 'vlc']; |
| 2964 | | - this.default_players['video/h264'] = ['kplayer', 'vlc']; |
| | 2972 | + this.default_players['video/h264'] = ['native', 'kplayer', 'vlc']; |
| 2965 | 2973 | |
| 2966 | 2974 | this.default_players['video/ogg'] = ['native', 'vlc', 'java', 'generic']; |
| 2967 | 2975 | this.default_players['application/ogg'] = ['native', 'vlc', 'java', 'generic']; |
| — | — | @@ -3190,27 +3198,27 @@ |
| 3191 | 3199 | // <video> element |
| 3192 | 3200 | if ( typeof HTMLVideoElement == 'object' // Firefox, Safari |
| 3193 | 3201 | || typeof HTMLVideoElement == 'function' ) // Opera |
| 3194 | | - { |
| 3195 | | - // do another test for safari: |
| 3196 | | - if ( $j.browser.safari ) { |
| 3197 | | - try { |
| 3198 | | - var dummyvid = document.createElement( "video" ); |
| 3199 | | - if ( dummyvid.canPlayType && dummyvid.canPlayType( "video/ogg;codecs=\"theora,vorbis\"" ) == "probably" ) |
| 3200 | | - { |
| 3201 | | - this.players.addPlayer( videoElementPlayer ); |
| 3202 | | - } else if ( this.supportedMimeType( 'video/ogg' ) ) { |
| 3203 | | - /* older versions of safari do not support canPlayType, |
| 3204 | | - but xiph qt registers mimetype via quicktime plugin */ |
| 3205 | | - this.players.addPlayer( videoElementPlayer ); |
| 3206 | | - } else { |
| 3207 | | - // NOTE: add some user nagging to install the xiph qt |
| 3208 | | - } |
| 3209 | | - } catch ( e ) { |
| 3210 | | - mw.log( 'could not run canPlayType in safari' ); |
| | 3202 | + { |
| | 3203 | + // Test what codecs the native player supports: |
| | 3204 | + try { |
| | 3205 | + var dummyvid = document.createElement( "video" ); |
| | 3206 | + // Test for h264: |
| | 3207 | + if ( dummyvid.canPlayType && dummyvid.canPlayType('video/mp4; codecs="avc1.42E01E, mp4a.40.2"' ) == "probably" ){ |
| | 3208 | + this.players.addPlayer( h264NativePlayer ); |
| 3211 | 3209 | } |
| 3212 | | - } else { |
| 3213 | | - this.players.addPlayer( videoElementPlayer ); |
| 3214 | | - } |
| | 3210 | + // Test for ogg |
| | 3211 | + if ( dummyvid.canPlayType && dummyvid.canPlayType( "video/ogg;codecs=\"theora,vorbis\"" ) == "probably" ) |
| | 3212 | + { |
| | 3213 | + this.players.addPlayer( oggNativePlayer ); |
| | 3214 | + |
| | 3215 | + // older versions of safari do not support canPlayType, |
| | 3216 | + // but xiph qt registers mimetype via quicktime plugin |
| | 3217 | + } else if ( this.supportedMimeType( 'video/ogg' ) ) { |
| | 3218 | + this.players.addPlayer( oggNativePlayer ); |
| | 3219 | + } |
| | 3220 | + } catch ( e ) { |
| | 3221 | + mw.log( 'could not run canPlayType ' + e ); |
| | 3222 | + } |
| 3215 | 3223 | } |
| 3216 | 3224 | |
| 3217 | 3225 | // "navigator" plugins |
| Index: branches/js2-work/phase3/js/mwEmbed/jsScriptLoader.php |
| — | — | @@ -82,7 +82,7 @@ |
| 83 | 83 | |
| 84 | 84 | // Load the ExtensionMessagesFiles |
| 85 | 85 | $wgExtensionMessagesFiles[ 'mwEmbed' ] = realpath( dirname( __FILE__ ) ) . |
| 86 | | - '/includes/languages/mwEmbed.i18n.php'; |
| | 86 | + '/languages/mwEmbed.i18n.php'; |
| 87 | 87 | |
| 88 | 88 | // Load the javascript class paths: |
| 89 | 89 | require_once( realpath( dirname( __FILE__ ) ) . "/includes/jsClassLoader.php"); |
| — | — | @@ -206,7 +206,7 @@ |
| 207 | 207 | // Write the grouped javascript to a temporary file: |
| 208 | 208 | // ( closure compiler does not support reading from standard in ) |
| 209 | 209 | $td = wfTempDir(); |
| 210 | | - $jsFileName = $td . '/' . $requestKey . '.tmp.js'; |
| | 210 | + $jsFileName = $td . '/' . md5( $requestKey ) . '.tmp.js'; |
| 211 | 211 | file_put_contents( $jsFileName, $js_string ); |
| 212 | 212 | $retval = ''; |
| 213 | 213 | $cmd = $wgJavaPath . ' -jar ' . $wgClosureCompilerPath; |