From: Michael Dale Date: Fri, 31 Jul 2009 02:44:37 +0000 (+0000) Subject: * fixed IE bug with firefogg disabled loading js2 for upload page X-Git-Tag: 1.31.0-rc.0~40618 X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=bbbb1f6010885b013cf6533cfd512be15a8eaf1c;p=lhc%2Fweb%2Fwiklou.git * fixed IE bug with firefogg disabled loading js2 for upload page * added support for two-pass encoding (firefogg bzr trunk) * added support for setting in and out points --- diff --git a/js2/mwEmbed/example_usage/Firefogg_Make_Advanced.html b/js2/mwEmbed/example_usage/Firefogg_Make_Advanced.html index 669bf129f7..110024eef2 100644 --- a/js2/mwEmbed/example_usage/Firefogg_Make_Advanced.html +++ b/js2/mwEmbed/example_usage/Firefogg_Make_Advanced.html @@ -89,9 +89,9 @@ Make Ogg Video

Loading firefogg...
-
+
-
+
Built using firefogg, MwEmbed and jquery.ui. Supports ... diff --git a/js2/mwEmbed/jsScriptLoader.php b/js2/mwEmbed/jsScriptLoader.php index 1fc8da4048..e73612f396 100644 --- a/js2/mwEmbed/jsScriptLoader.php +++ b/js2/mwEmbed/jsScriptLoader.php @@ -273,7 +273,7 @@ class jsScriptLoader { $jmsg[$msgKey] = wfMsgNoTrans( $msgKey ); } //return the updated loadGM json with fixed new lines: - return 'loadGM( ' . ApiFormatJson::getJsonEncode( $jmsg ) . ')'; + return 'loadGM( ' . json_encode( $jmsg ) . ')'; } else { $this->error_msg.= "Could not parse JSON language msg in File:\n" . $this->cur_file . "\n"; diff --git a/js2/mwEmbed/libAddMedia/mvAdvFirefogg.js b/js2/mwEmbed/libAddMedia/mvAdvFirefogg.js index 410a996b9f..51a7c4da6d 100644 --- a/js2/mwEmbed/libAddMedia/mvAdvFirefogg.js +++ b/js2/mwEmbed/libAddMedia/mvAdvFirefogg.js @@ -5,14 +5,14 @@ //@@todo put all msg text into loadGM json loadGM({ - "help-sticky": "Help (Click to Keep Help on Screen)", + "help-sticky": "Help (Click to Stick)", "fogg-cg-preset": "Preset: $1", "fogg-cg-quality": "Basic Quality and Resolution Control", "fogg-cg-meta": "Meta Data for the Clip", + "fogg-cg-range" : "Encoding Range", "fogg-cg-advVideo": "Advanced Video Encoding Controls", "fogg-cg-advAudio": "Advanced Audio Encoding Controls", - "fogg-preset-custom": "Custom Settings" - + "fogg-preset-custom": "Custom Settings" }); var mvAdvFirefogg = function( iObj ){ @@ -20,7 +20,7 @@ var mvAdvFirefogg = function( iObj ){ } var default_mvAdvFirefogg_config = { //which config groups to include - 'config_groups' : ['preset', 'quality', 'meta', 'advVideo', 'advAudio'], + 'config_groups' : ['preset', 'range', 'quality', 'meta', 'advVideo', 'advAudio'], //if you want to load any custom presets must follow the mvAdvFirefogg.presetConf json outline below 'custom_presets' : {}, @@ -34,7 +34,7 @@ var default_mvAdvFirefogg_config = { mvAdvFirefogg.prototype = { //the global groupings and titles for for configuration options : - config_groups : [ 'preset','quality', 'meta' ,'advVideo', 'advAudio'], + config_groups : [ 'preset', 'range', 'quality', 'meta', 'advVideo', 'advAudio'], //list of pre-sets: //local instance encoder config: default_local_settings:{ @@ -71,6 +71,24 @@ mvAdvFirefogg.prototype = { 'group' : 'quality', 'help' : "Used to set the Visual Quality of the encoded video. (not used if you set bitrate in advanced controls below)" }, + 'twopass':{ + 't' : "Two Pass Encoding", + 'type' : "boolean", + 'group' : "quality", + 'help' : "Two Pass Encoding enables more consitant quality by making two passes over the video file" + }, + 'starttime':{ + 't' : "Start Second", + 'type' : "float", + 'group' : "range", + 'help' : "Only encode from time in seconds" + }, + 'endtime':{ + 't' : "End Second", + 'type' : "float", + 'group' : "range", + 'help' : "only encode to time in seconds" + }, 'audioQuality': { 'd' : 1, 't' : 'Audio Quality', @@ -350,7 +368,7 @@ mvAdvFirefogg.prototype = { ''; + ''; //if we don't value for this: var dv = ( this.default_encoder_config[cK].d ) ? this.default_encoder_config[cK].d : ''; //switch on the config type @@ -358,7 +376,9 @@ mvAdvFirefogg.prototype = { case 'string': case 'date': case 'int': - out+= '' ; + case 'float': + var size = ( cConf.type =='string' ||cConf.type == 'date' )?'14':'4'; + out+= '' ; break; case 'boolean': var checked_attr = (dv===true)?' checked="true"':''; @@ -472,10 +492,13 @@ mvAdvFirefogg.prototype = { case 'boolean': $j(_this.selector + ' ._'+cK).click(function(){ _this.updateLocalValue( _this.getClassId(this), $j(this).is(":checked") ); + _this.updatePresetSelection('custom'); }) break; case 'select': case 'string': + case 'int': + case 'float': //@@check if we have a validate function on the string $j(_this.selector + ' ._'+cK).change(function(){ $j(this).val( _this.updateLocalValue( diff --git a/js2/mwEmbed/mv_embed.js b/js2/mwEmbed/mv_embed.js index b6b3743b56..530b27e86d 100644 --- a/js2/mwEmbed/mv_embed.js +++ b/js2/mwEmbed/mv_embed.js @@ -921,11 +921,15 @@ function mv_jqueryBindings(){ } $.fn.baseUploadInterface = function(iObj){ - mvJsLoader.doLoad([ - 'mvBaseUploadInterface', - '$j.ui', + mvJsLoader.doLoadDepMode([ + [ + 'mvBaseUploadInterface', + '$j.ui', + ], + [ '$j.ui.progressbar', - '$j.ui.dialog' + '$j.ui.dialog' + ] ],function(){ myUp = new mvBaseUploadInterface( iObj ); myUp.setupForm(); diff --git a/js2/mwEmbed/php/languages/mwEmbed.i18n.php b/js2/mwEmbed/php/languages/mwEmbed.i18n.php index 5e2f1b50fe..e140a00cfd 100644 --- a/js2/mwEmbed/php/languages/mwEmbed.i18n.php +++ b/js2/mwEmbed/php/languages/mwEmbed.i18n.php @@ -10,51 +10,77 @@ # $messages['en'] = array( /* - * js file: /libTimedText/mvTextInterface.js + * js file: /libSequencer/mvSequencer.js */ - 'select_transcript_set' => 'Select Layers', - 'auto_scroll' => 'auto scroll', - 'close' => 'close', - 'improve_transcript' => 'Improve', + 'menu_clipedit' => 'Edit Media', + 'menu_transition' => 'Transitions & Effects', + 'menu_cliplib' => 'Add Media', + 'menu_resource_overview' => 'Resource Overview', + 'menu_options' => 'Options', + 'loading_timeline' => 'Loading TimeLine ...', + 'loading_user_rights' => 'Loading user rights ...', + 'no_edit_permissions' => 'You don\'t have permissions to save changes to this sequence', + 'edit_clip' => 'Edit Clip', + 'edit_save' => 'Save Sequence Changes', + 'saving_wait' => 'Save in Progress (please wait)', + 'save_done' => 'Save Done', + 'edit_cancel' => 'Cancel Sequence Edit', + 'edit_cancel_confirm' => 'Are you sure you want to cancel your edit. Changes will be lost', + 'zoom_in' => 'Zoom In', + 'zoom_out' => 'Zoom Out', + 'cut_clip' => 'Cut Clips', + 'expand_track' => 'Expand Track', + 'colapse_track' => 'Collapse Track', + 'play_from_position' => 'Play From Playline Position', + 'pixle2sec' => 'pixles to seconds', + 'rmclip' => 'Remove Clip', + 'clip_in' => 'clip in', + 'clip_out' => 'clip out', + 'mv_welcome_to_sequencer' => '

Welcome to the sequencer demo

very limited functionality right now. Not much documentation yet either', + 'no_selected_resource' => '

No Resource selected

Select a Clip to enable editing', + 'error_edit_multiple' => '

Multiple Resources Selected

Select a single clip to edit it', + 'mv_editor_options' => 'Editor options', + 'mv_editor_mode' => 'Editor mode', + 'mv_simple_editor_desc' => 'simple editor (iMovie style)', + 'mv_advanced_editor_desc' => 'advanced editor (Final Cut style)', + 'mv_other_options' => 'Other Options', + 'mv_contextmenu_opt' => 'Enable Context Menus', + 'mv_sequencer_credit_line' => 'Developed by Kaltura, Inc. in partnership with the Wikimedia Foundation ( more info )', /* - * js file: /libAddMedia/mvBaseUploadInterface.js + * js file: /libSequencer/mvTimedEffectsEdit.js */ - 'upload-transcode-in-progress' => 'Doing Transcode & Upload (do not close this window)', - 'upload-in-progress' => 'Upload in Progress (do not close this window)', - 'upload-transcoded-status' => 'Transcoded', - 'uploaded-status' => 'Uploaded', - 'wgfogg_wrong_version' => 'You have firefogg installed but its outdated, please upgrade ', - 'upload-stats-fileprogres' => '$1 of $2', - 'mv_upload_completed' => 'Your upload is complete', - 'mv_upload_done' => 'Your upload should be accessible here', - 'upload-unknown-size' => 'Unknown size', - 'mv-cancel-confim' => 'Are you sure you want to cancel?', - 'successfulupload' => 'Successful Upload', - 'uploaderror' => 'Upload error', - 'uploadwarning' => 'Upload warning', - 'unknown-error' => 'Unknown Error', - 'return-to-form' => 'Return to form', - 'file-exists-duplicate' => 'This file is a duplicate of the following file', - 'fileexists' => 'A file with this name exists already, please check $1 if you are not sure if you want to change it.', - 'fileexists-thumb' => '
Existing file
', - 'ignorewarning' => 'Ignore warning and save file anyway', - 'file-thumbnail-no' => 'The filename begins with $1', - 'go-to-resource' => 'Go to Resource Page', - 'wgfogg_waring_bad_extension' => 'You have selected a file with an unsuported extension (more information).', - 'cancel-button' => 'Cancel', - 'ok-button' => 'OK', + 'transition_in' => 'Transition In', + 'transition_out' => 'Transition Out', + 'effects' => 'Effects Stack', + 'remove_transition' => 'Remove Transition', + 'edit_transin' => 'Edit Transition Into Clip', + 'edit_transout' => 'Edit Transition Out of Clip', /* - * js file: /libAddMedia/mvAdvFirefogg.js + * js file: /libClipEdit/mvClipEdit.js */ - 'help-sticky' => 'Help (Click to Keep Help on Screen)', - 'fogg-cg-preset' => 'Preset: $1', - 'fogg-cg-quality' => 'Basic Quality and Resolution Control', - 'fogg-cg-meta' => 'Meta Data for the Clip', - 'fogg-cg-advVideo' => 'Advanced Video Encoding Controls', - 'fogg-cg-advAudio' => 'Advanced Audio Encoding Controls', - 'fogg-preset-custom' => 'Custom Settings', + 'mv_crop' => 'Crop Image', + 'mv_apply_crop' => 'Apply Crop to Image', + 'mv_reset_crop' => 'Rest Crop', + 'mv_insert_image_page' => 'Insert Into page', + 'mv_insert_into_sequence' => 'Insert Into Sequence', + 'mv_preview_insert' => 'Preview Insert', + 'mv_cancel_image_insert' => 'Cancel Insert', + 'sc_fileopts' => 'Clip Detail Edit', + 'sc_inoutpoints' => 'Set In-Out points', + 'sc_overlays' => 'Overlays', + 'sc_audio' => 'Audio Control', + 'sc_duration' => 'Duration', + 'mv_template_properties' => 'Template Properties', + 'mv_custom_title' => 'Custom Title', + 'mv_edit_properties' => 'Edit Properties', + 'mv_other_properties' => 'Other Properties', + 'mv_resource_page' => 'Resource Page:', + 'mv_set_in_out_points' => 'Set in-out points', + 'mv_start_time' => 'Start Time', + 'mv_end_time' => 'End Time', + 'mv_preview_inout' => 'Preview/Play In-out points', /* * js file: /libAddMedia/searchLibs/metavidSearch.js @@ -66,21 +92,6 @@ $messages['en'] = array( */ 'imported_from' => '$1 imported from [$2 $3]. See the original [$4 resource page] for more info', - /* - * js file: /libAddMedia/mvFirefogg.js - */ - 'fogg-select_file' => 'Select File', - 'fogg-select_new_file' => 'Select New File', - 'fogg-save_local_file' => 'Save Ogg', - 'fogg-check_for_fogg' => 'Checking for Firefogg ...', - 'fogg-installed' => 'Firefogg is Installed', - 'fogg-for_improved_uplods' => 'For Improved uploads: ', - 'fogg-please_install' => 'Install Firefogg. More about firefogg', - 'fogg-use_latest_fox' => 'Please first install Firefox 3.5. then revisit this page to install the firefogg extention', - 'fogg-passthrough_mode' => 'Your selected file is already ogg or not a video file', - 'fogg-transcoding' => 'Encoding Video to Ogg', - 'fogg-encoding-done' => 'Encoding Done', - /* * js file: /libAddMedia/remoteSearchDriver.js */ @@ -110,52 +121,69 @@ $messages['en'] = array( 'missing_desc_see_soruce' => 'This Asset is missing a description. Please see the [$1 orginal source] and help describe it', /* - * js file: /libSequencer/mvSequencer.js + * js file: /libAddMedia/mvFirefogg.js */ - 'menu_clipedit' => 'Edit Media', - 'menu_transition' => 'Transitions & Effects', - 'menu_cliplib' => 'Add Media', - 'menu_resource_overview' => 'Resource Overview', - 'menu_options' => 'Options', - 'loading_timeline' => 'Loading TimeLine ...', - 'loading_user_rights' => 'Loading user rights ...', - 'no_edit_permissions' => 'You don\'t have permissions to save changes to this sequence', - 'edit_clip' => 'Edit Clip', - 'edit_save' => 'Save Sequence Changes', - 'saving_wait' => 'Save in Progress (please wait)', - 'save_done' => 'Save Done', - 'edit_cancel' => 'Cancel Sequence Edit', - 'edit_cancel_confirm' => 'Are you sure you want to cancel your edit. Changes will be lost', - 'zoom_in' => 'Zoom In', - 'zoom_out' => 'Zoom Out', - 'cut_clip' => 'Cut Clips', - 'expand_track' => 'Expand Track', - 'colapse_track' => 'Collapse Track', - 'play_from_position' => 'Play From Playline Position', - 'pixle2sec' => 'pixles to seconds', - 'rmclip' => 'Remove Clip', - 'clip_in' => 'clip in', - 'clip_out' => 'clip out', - 'mv_welcome_to_sequencer' => '

Welcome to the sequencer demo

very limited functionality right now. Not much documentation yet either', - 'no_selected_resource' => '

No Resource selected

Select a Clip to enable editing', - 'error_edit_multiple' => '

Multiple Resources Selected

Select a single clip to edit it', - 'mv_editor_options' => 'Editor options', - 'mv_editor_mode' => 'Editor mode', - 'mv_simple_editor_desc' => 'simple editor (iMovie style)', - 'mv_advanced_editor_desc' => 'advanced editor (Final Cut style)', - 'mv_other_options' => 'Other Options', - 'mv_contextmenu_opt' => 'Enable Context Menus', - 'mv_sequencer_credit_line' => 'Developed by Kaltura, Inc. in partnership with the Wikimedia Foundation ( more info )', + 'fogg-select_file' => 'Select File', + 'fogg-select_new_file' => 'Select New File', + 'fogg-save_local_file' => 'Save Ogg', + 'fogg-check_for_fogg' => 'Checking for Firefogg ...', + 'fogg-installed' => 'Firefogg is Installed', + 'fogg-for_improved_uplods' => 'For Improved uploads: ', + 'fogg-please_install' => 'Install Firefogg. More about firefogg', + 'fogg-use_latest_fox' => 'Please first install Firefox 3.5 (or later). then revisit this page to install the firefogg extention', + 'fogg-passthrough_mode' => 'Your selected file is already ogg or not a video file', + 'fogg-transcoding' => 'Encoding Video to Ogg', + 'fogg-encoding-done' => 'Encoding Done', /* - * js file: /libSequencer/mvTimedEffectsEdit.js + * js file: /libAddMedia/mvBaseUploadInterface.js */ - 'transition_in' => 'Transition In', - 'transition_out' => 'Transition Out', - 'effects' => 'Effects Stack', - 'remove_transition' => 'Remove Transition', - 'edit_transin' => 'Edit Transition Into Clip', - 'edit_transout' => 'Edit Transition Out of Clip', + 'upload-transcode-in-progress' => 'Doing Transcode & Upload (do not close this window)', + 'upload-in-progress' => 'Upload in Progress (do not close this window)', + 'upload-transcoded-status' => 'Transcoded', + 'uploaded-status' => 'Uploaded', + 'wgfogg_wrong_version' => 'You have firefogg installed but its outdated, please upgrade ', + 'upload-stats-fileprogres' => '$1 of $2', + 'mv_upload_completed' => 'Your upload is complete', + 'mv_upload_done' => 'Your upload should be accessible here', + 'upload-unknown-size' => 'Unknown size', + 'mv-cancel-confim' => 'Are you sure you want to cancel?', + 'successfulupload' => 'Successful Upload', + 'uploaderror' => 'Upload error', + 'uploadwarning' => 'Upload warning', + 'unknown-error' => 'Unknown Error', + 'return-to-form' => 'Return to form', + 'file-exists-duplicate' => 'This file is a duplicate of the following file', + 'fileexists' => 'A file with this name exists already, please check $1 if you are not sure if you want to change it.', + 'fileexists-thumb' => '
Existing file
', + 'ignorewarning' => 'Ignore warning and save file anyway', + 'file-thumbnail-no' => 'The filename begins with $1', + 'go-to-resource' => 'Go to Resource Page', + 'wgfogg_waring_bad_extension' => 'You have selected a file with an unsuported extension (more information).', + 'cancel-button' => 'Cancel', + 'ok-button' => 'OK', + + /* + * js file: /libAddMedia/mvAdvFirefogg.js + */ + 'help-sticky' => 'Help (Click to Stick)', + 'fogg-cg-preset' => 'Preset: $1', + 'fogg-cg-quality' => 'Basic Quality and Resolution Control', + 'fogg-cg-meta' => 'Meta Data for the Clip', + 'fogg-cg-range' => 'Encoding Range', + 'fogg-cg-advVideo' => 'Advanced Video Encoding Controls', + 'fogg-cg-advAudio' => 'Advanced Audio Encoding Controls', + 'fogg-preset-custom' => 'Custom Settings', + + /* + * js file: /mv_embed.js + */ + 'loading_txt' => 'loading ...', + 'loading_title' => 'Loading...', + 'size-gigabytes' => '$1 GB', + 'size-megabytes' => '$1 MB', + 'size-kilobytes' => '$1 K', + 'size-bytes' => '$1 B', /* * js file: /libEmbedVideo/embedVideo.js @@ -197,40 +225,5 @@ $messages['en'] = array( 'mv_generic_missing_plugin' => 'You browser does not appear to support playback type: $1
visit the Playback Methods page to download a player
', 'mv_for_best_experience' => 'For a better video playback experience we recommend Firefox 3.5', 'mv_do_not_warn_again' => 'Do not warn me again.', - - /* - * js file: /libClipEdit/mvClipEdit.js - */ - 'mv_crop' => 'Crop Image', - 'mv_apply_crop' => 'Apply Crop to Image', - 'mv_reset_crop' => 'Rest Crop', - 'mv_insert_image_page' => 'Insert Into page', - 'mv_insert_into_sequence' => 'Insert Into Sequence', - 'mv_preview_insert' => 'Preview Insert', - 'mv_cancel_image_insert' => 'Cancel Insert', - 'sc_fileopts' => 'Clip Detail Edit', - 'sc_inoutpoints' => 'Set In-Out points', - 'sc_overlays' => 'Overlays', - 'sc_audio' => 'Audio Control', - 'sc_duration' => 'Duration', - 'mv_template_properties' => 'Template Properties', - 'mv_custom_title' => 'Custom Title', - 'mv_edit_properties' => 'Edit Properties', - 'mv_other_properties' => 'Other Properties', - 'mv_resource_page' => 'Resource Page:', - 'mv_set_in_out_points' => 'Set in-out points', - 'mv_start_time' => 'Start Time', - 'mv_end_time' => 'End Time', - 'mv_preview_inout' => 'Preview/Play In-out points', - - /* - * js file: /mv_embed.js - */ - 'loading_txt' => 'loading ...', - 'loading_title' => 'Loading...', - 'size-gigabytes' => '$1 GB', - 'size-megabytes' => '$1 MB', - 'size-kilobytes' => '$1 K', - 'size-bytes' => '$1 B', ); # \ No newline at end of file