r54067 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r54066‎ | r54067 | r54068 >
Date:02:44, 31 July 2009
Author:dale
Status:deferred
Tags:
Comment:
* 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
Modified paths:
  • /trunk/phase3/js2/mwEmbed/example_usage/Firefogg_Make_Advanced.html (modified) (history)
  • /trunk/phase3/js2/mwEmbed/jsScriptLoader.php (modified) (history)
  • /trunk/phase3/js2/mwEmbed/libAddMedia/mvAdvFirefogg.js (modified) (history)
  • /trunk/phase3/js2/mwEmbed/mv_embed.js (modified) (history)
  • /trunk/phase3/js2/mwEmbed/php/languages/mwEmbed.i18n.php (modified) (history)

Diff [purge]

Index: trunk/phase3/js2/mwEmbed/example_usage/Firefogg_Make_Advanced.html
——@@ -89,9 +89,9 @@
9090 <br>
9191 <br>
9292 <div style="margin-right:auto;margin-left:auto;width:500px;" id="loadFogg">Loading firefogg<blink>...</blink></div>
93 - <div style="margin-right:auto;margin-left:auto;width:500px;height:250px" id="firefogg_app"></div>
 93+ <div style="margin-right:auto;margin-left:auto;width:500px;height:230px" id="firefogg_app"></div>
9494
95 - <div style="height:250px"></div>
 95+ <div style="height:265px"></div>
9696 <center><span style="font:size:80%">Built using <a href="http://firefogg.org">firefogg</a>, <a href="http://www.mediawiki.org/wiki/Media_Projects_Overview#MwEmbed">MwEmbed</a> and <a href="http://jqueryui.com/">jquery.ui</a>. Supports
9797 <a href="#" id="doThemeRoller">...</a>
9898 </span>
Index: trunk/phase3/js2/mwEmbed/libAddMedia/mvAdvFirefogg.js
——@@ -5,14 +5,14 @@
66 //@@todo put all msg text into loadGM json
77
88 loadGM({
9 - "help-sticky": "Help (Click to Keep Help on Screen)",
 9+ "help-sticky": "Help (Click to Stick)",
1010 "fogg-cg-preset": "Preset: <strong>$1</strong>",
1111 "fogg-cg-quality": "Basic Quality and Resolution Control",
1212 "fogg-cg-meta": "Meta Data for the Clip",
 13+ "fogg-cg-range" : "Encoding Range",
1314 "fogg-cg-advVideo": "Advanced Video Encoding Controls",
1415 "fogg-cg-advAudio": "Advanced Audio Encoding Controls",
15 - "fogg-preset-custom": "Custom Settings"
16 -
 16+ "fogg-preset-custom": "Custom Settings"
1717 });
1818
1919 var mvAdvFirefogg = function( iObj ){
——@@ -20,7 +20,7 @@
2121 }
2222 var default_mvAdvFirefogg_config = {
2323 //which config groups to include
24 - 'config_groups' : ['preset', 'quality', 'meta', 'advVideo', 'advAudio'],
 24+ 'config_groups' : ['preset', 'range', 'quality', 'meta', 'advVideo', 'advAudio'],
2525
2626 //if you want to load any custom presets must follow the mvAdvFirefogg.presetConf json outline below
2727 'custom_presets' : {},
——@@ -34,7 +34,7 @@
3535
3636 mvAdvFirefogg.prototype = {
3737 //the global groupings and titles for for configuration options :
38 - config_groups : [ 'preset','quality', 'meta' ,'advVideo', 'advAudio'],
 38+ config_groups : [ 'preset', 'range', 'quality', 'meta', 'advVideo', 'advAudio'],
3939 //list of pre-sets:
4040 //local instance encoder config:
4141 default_local_settings:{
——@@ -71,6 +71,24 @@
7272 'group' : 'quality',
7373 'help' : "Used to set the <i>Visual Quality</i> of the encoded video. (not used if you set bitrate in advanced controls below)"
7474 },
 75+ 'twopass':{
 76+ 't' : "Two Pass Encoding",
 77+ 'type' : "boolean",
 78+ 'group' : "quality",
 79+ 'help' : "Two Pass Encoding enables more consitant quality by making two passes over the video file"
 80+ },
 81+ 'starttime':{
 82+ 't' : "Start Second",
 83+ 'type' : "float",
 84+ 'group' : "range",
 85+ 'help' : "Only encode from time in seconds"
 86+ },
 87+ 'endtime':{
 88+ 't' : "End Second",
 89+ 'type' : "float",
 90+ 'group' : "range",
 91+ 'help' : "only encode to time in seconds"
 92+ },
7593 'audioQuality': {
7694 'd' : 1,
7795 't' : 'Audio Quality',
——@@ -350,7 +368,7 @@
351369 '<label for="_' + cK + '">' +
352370 cConf.t + ':' +
353371 '<span title="' + gM('help-sticky') + '" class="help_'+ cK + ' ui-icon ui-icon-info" style="float:left"></span>'+
354 - '</label></td><td>';
 372+ '</label></td><td valign="top">';
355373 //if we don't value for this:
356374 var dv = ( this.default_encoder_config[cK].d ) ? this.default_encoder_config[cK].d : '';
357375 //switch on the config type
——@@ -358,7 +376,9 @@
359377 case 'string':
360378 case 'date':
361379 case 'int':
362 - out+= '<input type="text" class="_' + cK + ' text ui-widget-content ui-corner-all" value="' + dv + '" >' ;
 380+ case 'float':
 381+ var size = ( cConf.type =='string' ||cConf.type == 'date' )?'14':'4';
 382+ out+= '<input size="' + size + '" type="text" class="_' + cK + ' text ui-widget-content ui-corner-all" value="' + dv + '" >' ;
363383 break;
364384 case 'boolean':
365385 var checked_attr = (dv===true)?' checked="true"':'';
——@@ -472,10 +492,13 @@
473493 case 'boolean':
474494 $j(_this.selector + ' ._'+cK).click(function(){
475495 _this.updateLocalValue( _this.getClassId(this), $j(this).is(":checked") );
 496+ _this.updatePresetSelection('custom');
476497 })
477498 break;
478499 case 'select':
479500 case 'string':
 501+ case 'int':
 502+ case 'float':
480503 //@@check if we have a validate function on the string
481504 $j(_this.selector + ' ._'+cK).change(function(){
482505 $j(this).val( _this.updateLocalValue(
Index: trunk/phase3/js2/mwEmbed/php/languages/mwEmbed.i18n.php
——@@ -10,51 +10,77 @@
1111 #<JAVASCRIPT EN REPLACE>
1212 $messages['en'] = array(
1313 /*
14 - * js file: /libTimedText/mvTextInterface.js
 14+ * js file: /libSequencer/mvSequencer.js
1515 */
16 - 'select_transcript_set' => 'Select Layers',
17 - 'auto_scroll' => 'auto scroll',
18 - 'close' => 'close',
19 - 'improve_transcript' => 'Improve',
 16+ 'menu_clipedit' => 'Edit Media',
 17+ 'menu_transition' => 'Transitions & Effects',
 18+ 'menu_cliplib' => 'Add Media',
 19+ 'menu_resource_overview' => 'Resource Overview',
 20+ 'menu_options' => 'Options',
 21+ 'loading_timeline' => 'Loading TimeLine <blink>...</blink>',
 22+ 'loading_user_rights' => 'Loading user rights <blink>...</blink>',
 23+ 'no_edit_permissions' => 'You don\'t have permissions to save changes to this sequence',
 24+ 'edit_clip' => 'Edit Clip',
 25+ 'edit_save' => 'Save Sequence Changes',
 26+ 'saving_wait' => 'Save in Progress (please wait)',
 27+ 'save_done' => 'Save Done',
 28+ 'edit_cancel' => 'Cancel Sequence Edit',
 29+ 'edit_cancel_confirm' => 'Are you sure you want to cancel your edit. Changes will be lost',
 30+ 'zoom_in' => 'Zoom In',
 31+ 'zoom_out' => 'Zoom Out',
 32+ 'cut_clip' => 'Cut Clips',
 33+ 'expand_track' => 'Expand Track',
 34+ 'colapse_track' => 'Collapse Track',
 35+ 'play_from_position' => 'Play From Playline Position',
 36+ 'pixle2sec' => 'pixles to seconds',
 37+ 'rmclip' => 'Remove Clip',
 38+ 'clip_in' => 'clip in',
 39+ 'clip_out' => 'clip out',
 40+ 'mv_welcome_to_sequencer' => '<h3>Welcome to the sequencer demo</h3> very <b>limited</b> functionality right now. Not much documentation yet either',
 41+ 'no_selected_resource' => '<h3>No Resource selected</h3> Select a Clip to enable editing',
 42+ 'error_edit_multiple' => '<h3>Multiple Resources Selected</h3> Select a single clip to edit it',
 43+ 'mv_editor_options' => 'Editor options',
 44+ 'mv_editor_mode' => 'Editor mode',
 45+ 'mv_simple_editor_desc' => 'simple editor (iMovie style)',
 46+ 'mv_advanced_editor_desc' => 'advanced editor (Final Cut style)',
 47+ 'mv_other_options' => 'Other Options',
 48+ 'mv_contextmenu_opt' => 'Enable Context Menus',
 49+ 'mv_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 info</a> )',
2050
2151 /*
22 - * js file: /libAddMedia/mvBaseUploadInterface.js
 52+ * js file: /libSequencer/mvTimedEffectsEdit.js
2353 */
24 - 'upload-transcode-in-progress' => 'Doing Transcode & Upload (do not close this window)',
25 - 'upload-in-progress' => 'Upload in Progress (do not close this window)',
26 - 'upload-transcoded-status' => 'Transcoded',
27 - 'uploaded-status' => 'Uploaded',
28 - 'wgfogg_wrong_version' => 'You have firefogg installed but its outdated, <a href="http://firefogg.org">please upgrade</a> ',
29 - 'upload-stats-fileprogres' => '$1 of $2',
30 - 'mv_upload_completed' => 'Your upload is complete',
31 - 'mv_upload_done' => 'Your upload <i>should be</i> accessible <a href="$1">here</a>',
32 - 'upload-unknown-size' => 'Unknown size',
33 - 'mv-cancel-confim' => 'Are you sure you want to cancel?',
34 - 'successfulupload' => 'Successful Upload',
35 - 'uploaderror' => 'Upload error',
36 - 'uploadwarning' => 'Upload warning',
37 - 'unknown-error' => 'Unknown Error',
38 - 'return-to-form' => 'Return to form',
39 - 'file-exists-duplicate' => 'This file is a duplicate of the following file',
40 - 'fileexists' => 'A file with this name exists already, please check <b><tt>$1</tt></b> if you are not sure if you want to change it.',
41 - 'fileexists-thumb' => '<center><b>Existing file</b></center>',
42 - 'ignorewarning' => 'Ignore warning and save file anyway',
43 - 'file-thumbnail-no' => 'The filename begins with <b><tt>$1</tt></b>',
44 - 'go-to-resource' => 'Go to Resource Page',
45 - 'wgfogg_waring_bad_extension' => 'You have selected a file with an unsuported extension (<a href="http://commons.wikimedia.org/wiki/Commons:Firefogg#Supported_File_Types">more information</a>).',
46 - 'cancel-button' => 'Cancel',
47 - 'ok-button' => 'OK',
 54+ 'transition_in' => 'Transition In',
 55+ 'transition_out' => 'Transition Out',
 56+ 'effects' => 'Effects Stack',
 57+ 'remove_transition' => 'Remove Transition',
 58+ 'edit_transin' => 'Edit Transition Into Clip',
 59+ 'edit_transout' => 'Edit Transition Out of Clip',
4860
4961 /*
50 - * js file: /libAddMedia/mvAdvFirefogg.js
 62+ * js file: /libClipEdit/mvClipEdit.js
5163 */
52 - 'help-sticky' => 'Help (Click to Keep Help on Screen)',
53 - 'fogg-cg-preset' => 'Preset: <strong>$1</strong>',
54 - 'fogg-cg-quality' => 'Basic Quality and Resolution Control',
55 - 'fogg-cg-meta' => 'Meta Data for the Clip',
56 - 'fogg-cg-advVideo' => 'Advanced Video Encoding Controls',
57 - 'fogg-cg-advAudio' => 'Advanced Audio Encoding Controls',
58 - 'fogg-preset-custom' => 'Custom Settings',
 64+ 'mv_crop' => 'Crop Image',
 65+ 'mv_apply_crop' => 'Apply Crop to Image',
 66+ 'mv_reset_crop' => 'Rest Crop',
 67+ 'mv_insert_image_page' => 'Insert Into page',
 68+ 'mv_insert_into_sequence' => 'Insert Into Sequence',
 69+ 'mv_preview_insert' => 'Preview Insert',
 70+ 'mv_cancel_image_insert' => 'Cancel Insert',
 71+ 'sc_fileopts' => 'Clip Detail Edit',
 72+ 'sc_inoutpoints' => 'Set In-Out points',
 73+ 'sc_overlays' => 'Overlays',
 74+ 'sc_audio' => 'Audio Control',
 75+ 'sc_duration' => 'Duration',
 76+ 'mv_template_properties' => 'Template Properties',
 77+ 'mv_custom_title' => 'Custom Title',
 78+ 'mv_edit_properties' => 'Edit Properties',
 79+ 'mv_other_properties' => 'Other Properties',
 80+ 'mv_resource_page' => 'Resource Page:',
 81+ 'mv_set_in_out_points' => 'Set in-out points',
 82+ 'mv_start_time' => 'Start Time',
 83+ 'mv_end_time' => 'End Time',
 84+ 'mv_preview_inout' => 'Preview/Play In-out points',
5985
6086 /*
6187 * js file: /libAddMedia/searchLibs/metavidSearch.js
——@@ -67,21 +93,6 @@
6894 'imported_from' => '$1 imported from [$2 $3]. See the original [$4 resource page] for more info',
6995
7096 /*
71 - * js file: /libAddMedia/mvFirefogg.js
72 - */
73 - 'fogg-select_file' => 'Select File',
74 - 'fogg-select_new_file' => 'Select New File',
75 - 'fogg-save_local_file' => 'Save Ogg',
76 - 'fogg-check_for_fogg' => 'Checking for Firefogg <blink>...</blink>',
77 - 'fogg-installed' => 'Firefogg is Installed',
78 - 'fogg-for_improved_uplods' => 'For Improved uploads: ',
79 - 'fogg-please_install' => '<a href="$1">Install Firefogg</a>. More <a href="http://commons.wikimedia.org/wiki/Commons:Firefogg">about firefogg</a>',
80 - 'fogg-use_latest_fox' => 'Please first install <a href="http://www.mozilla.com/en-US/firefox/upgrade.html?from=firefogg">Firefox 3.5</a>. <i>then revisit this page to install the <b>firefogg</b> extention</i>',
81 - 'fogg-passthrough_mode' => 'Your selected file is already ogg or not a video file',
82 - 'fogg-transcoding' => 'Encoding Video to Ogg',
83 - 'fogg-encoding-done' => 'Encoding Done',
84 -
85 - /*
8697 * js file: /libAddMedia/remoteSearchDriver.js
8798 */
8899 'add_media_wizard' => 'Add Media Wizard',
——@@ -110,54 +121,71 @@
111122 'missing_desc_see_soruce' => 'This Asset is missing a description. Please see the [$1 orginal source] and help describe it',
112123
113124 /*
114 - * js file: /libSequencer/mvSequencer.js
 125+ * js file: /libAddMedia/mvFirefogg.js
115126 */
116 - 'menu_clipedit' => 'Edit Media',
117 - 'menu_transition' => 'Transitions & Effects',
118 - 'menu_cliplib' => 'Add Media',
119 - 'menu_resource_overview' => 'Resource Overview',
120 - 'menu_options' => 'Options',
121 - 'loading_timeline' => 'Loading TimeLine <blink>...</blink>',
122 - 'loading_user_rights' => 'Loading user rights <blink>...</blink>',
123 - 'no_edit_permissions' => 'You don\'t have permissions to save changes to this sequence',
124 - 'edit_clip' => 'Edit Clip',
125 - 'edit_save' => 'Save Sequence Changes',
126 - 'saving_wait' => 'Save in Progress (please wait)',
127 - 'save_done' => 'Save Done',
128 - 'edit_cancel' => 'Cancel Sequence Edit',
129 - 'edit_cancel_confirm' => 'Are you sure you want to cancel your edit. Changes will be lost',
130 - 'zoom_in' => 'Zoom In',
131 - 'zoom_out' => 'Zoom Out',
132 - 'cut_clip' => 'Cut Clips',
133 - 'expand_track' => 'Expand Track',
134 - 'colapse_track' => 'Collapse Track',
135 - 'play_from_position' => 'Play From Playline Position',
136 - 'pixle2sec' => 'pixles to seconds',
137 - 'rmclip' => 'Remove Clip',
138 - 'clip_in' => 'clip in',
139 - 'clip_out' => 'clip out',
140 - 'mv_welcome_to_sequencer' => '<h3>Welcome to the sequencer demo</h3> very <b>limited</b> functionality right now. Not much documentation yet either',
141 - 'no_selected_resource' => '<h3>No Resource selected</h3> Select a Clip to enable editing',
142 - 'error_edit_multiple' => '<h3>Multiple Resources Selected</h3> Select a single clip to edit it',
143 - 'mv_editor_options' => 'Editor options',
144 - 'mv_editor_mode' => 'Editor mode',
145 - 'mv_simple_editor_desc' => 'simple editor (iMovie style)',
146 - 'mv_advanced_editor_desc' => 'advanced editor (Final Cut style)',
147 - 'mv_other_options' => 'Other Options',
148 - 'mv_contextmenu_opt' => 'Enable Context Menus',
149 - 'mv_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 info</a> )',
 127+ 'fogg-select_file' => 'Select File',
 128+ 'fogg-select_new_file' => 'Select New File',
 129+ 'fogg-save_local_file' => 'Save Ogg',
 130+ 'fogg-check_for_fogg' => 'Checking for Firefogg <blink>...</blink>',
 131+ 'fogg-installed' => 'Firefogg is Installed',
 132+ 'fogg-for_improved_uplods' => 'For Improved uploads: ',
 133+ 'fogg-please_install' => '<a href="$1">Install Firefogg</a>. More <a href="http://commons.wikimedia.org/wiki/Commons:Firefogg">about firefogg</a>',
 134+ 'fogg-use_latest_fox' => '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> extention</i>',
 135+ 'fogg-passthrough_mode' => 'Your selected file is already ogg or not a video file',
 136+ 'fogg-transcoding' => 'Encoding Video to Ogg',
 137+ 'fogg-encoding-done' => 'Encoding Done',
150138
151139 /*
152 - * js file: /libSequencer/mvTimedEffectsEdit.js
 140+ * js file: /libAddMedia/mvBaseUploadInterface.js
153141 */
154 - 'transition_in' => 'Transition In',
155 - 'transition_out' => 'Transition Out',
156 - 'effects' => 'Effects Stack',
157 - 'remove_transition' => 'Remove Transition',
158 - 'edit_transin' => 'Edit Transition Into Clip',
159 - 'edit_transout' => 'Edit Transition Out of Clip',
 142+ 'upload-transcode-in-progress' => 'Doing Transcode & Upload (do not close this window)',
 143+ 'upload-in-progress' => 'Upload in Progress (do not close this window)',
 144+ 'upload-transcoded-status' => 'Transcoded',
 145+ 'uploaded-status' => 'Uploaded',
 146+ 'wgfogg_wrong_version' => 'You have firefogg installed but its outdated, <a href="http://firefogg.org">please upgrade</a> ',
 147+ 'upload-stats-fileprogres' => '$1 of $2',
 148+ 'mv_upload_completed' => 'Your upload is complete',
 149+ 'mv_upload_done' => 'Your upload <i>should be</i> accessible <a href="$1">here</a>',
 150+ 'upload-unknown-size' => 'Unknown size',
 151+ 'mv-cancel-confim' => 'Are you sure you want to cancel?',
 152+ 'successfulupload' => 'Successful Upload',
 153+ 'uploaderror' => 'Upload error',
 154+ 'uploadwarning' => 'Upload warning',
 155+ 'unknown-error' => 'Unknown Error',
 156+ 'return-to-form' => 'Return to form',
 157+ 'file-exists-duplicate' => 'This file is a duplicate of the following file',
 158+ 'fileexists' => 'A file with this name exists already, please check <b><tt>$1</tt></b> if you are not sure if you want to change it.',
 159+ 'fileexists-thumb' => '<center><b>Existing file</b></center>',
 160+ 'ignorewarning' => 'Ignore warning and save file anyway',
 161+ 'file-thumbnail-no' => 'The filename begins with <b><tt>$1</tt></b>',
 162+ 'go-to-resource' => 'Go to Resource Page',
 163+ 'wgfogg_waring_bad_extension' => 'You have selected a file with an unsuported extension (<a href="http://commons.wikimedia.org/wiki/Commons:Firefogg#Supported_File_Types">more information</a>).',
 164+ 'cancel-button' => 'Cancel',
 165+ 'ok-button' => 'OK',
160166
161167 /*
 168+ * js file: /libAddMedia/mvAdvFirefogg.js
 169+ */
 170+ 'help-sticky' => 'Help (Click to Stick)',
 171+ 'fogg-cg-preset' => 'Preset: <strong>$1</strong>',
 172+ 'fogg-cg-quality' => 'Basic Quality and Resolution Control',
 173+ 'fogg-cg-meta' => 'Meta Data for the Clip',
 174+ 'fogg-cg-range' => 'Encoding Range',
 175+ 'fogg-cg-advVideo' => 'Advanced Video Encoding Controls',
 176+ 'fogg-cg-advAudio' => 'Advanced Audio Encoding Controls',
 177+ 'fogg-preset-custom' => 'Custom Settings',
 178+
 179+ /*
 180+ * js file: /mv_embed.js
 181+ */
 182+ 'loading_txt' => 'loading <blink>...</blink>',
 183+ 'loading_title' => 'Loading...',
 184+ 'size-gigabytes' => '$1 GB',
 185+ 'size-megabytes' => '$1 MB',
 186+ 'size-kilobytes' => '$1 K',
 187+ 'size-bytes' => '$1 B',
 188+
 189+ /*
162190 * js file: /libEmbedVideo/embedVideo.js
163191 */
164192 'loading_plugin' => 'loading plugin<blink>...</blink>',
——@@ -197,40 +225,5 @@
198226 'mv_generic_missing_plugin' => 'You browser does not appear to support 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>',
199227 'mv_for_best_experience' => 'For a better video playback experience we recommend <b><a href="http://www.mozilla.com/en-US/firefox/upgrade.html?from=mv_embed">Firefox 3.5</a></b>',
200228 'mv_do_not_warn_again' => 'Do not warn me again.',
201 -
202 - /*
203 - * js file: /libClipEdit/mvClipEdit.js
204 - */
205 - 'mv_crop' => 'Crop Image',
206 - 'mv_apply_crop' => 'Apply Crop to Image',
207 - 'mv_reset_crop' => 'Rest Crop',
208 - 'mv_insert_image_page' => 'Insert Into page',
209 - 'mv_insert_into_sequence' => 'Insert Into Sequence',
210 - 'mv_preview_insert' => 'Preview Insert',
211 - 'mv_cancel_image_insert' => 'Cancel Insert',
212 - 'sc_fileopts' => 'Clip Detail Edit',
213 - 'sc_inoutpoints' => 'Set In-Out points',
214 - 'sc_overlays' => 'Overlays',
215 - 'sc_audio' => 'Audio Control',
216 - 'sc_duration' => 'Duration',
217 - 'mv_template_properties' => 'Template Properties',
218 - 'mv_custom_title' => 'Custom Title',
219 - 'mv_edit_properties' => 'Edit Properties',
220 - 'mv_other_properties' => 'Other Properties',
221 - 'mv_resource_page' => 'Resource Page:',
222 - 'mv_set_in_out_points' => 'Set in-out points',
223 - 'mv_start_time' => 'Start Time',
224 - 'mv_end_time' => 'End Time',
225 - 'mv_preview_inout' => 'Preview/Play In-out points',
226 -
227 - /*
228 - * js file: /mv_embed.js
229 - */
230 - 'loading_txt' => 'loading <blink>...</blink>',
231 - 'loading_title' => 'Loading...',
232 - 'size-gigabytes' => '$1 GB',
233 - 'size-megabytes' => '$1 MB',
234 - 'size-kilobytes' => '$1 K',
235 - 'size-bytes' => '$1 B',
236229 );
237230 #</JAVASCRIPT EN REPLACE>
\ No newline at end of file
Index: trunk/phase3/js2/mwEmbed/mv_embed.js
——@@ -921,11 +921,15 @@
922922 }
923923
924924 $.fn.baseUploadInterface = function(iObj){
925 - mvJsLoader.doLoad([
926 - 'mvBaseUploadInterface',
927 - '$j.ui',
 925+ mvJsLoader.doLoadDepMode([
 926+ [
 927+ 'mvBaseUploadInterface',
 928+ '$j.ui',
 929+ ],
 930+ [
928931 '$j.ui.progressbar',
929 - '$j.ui.dialog'
 932+ '$j.ui.dialog'
 933+ ]
930934 ],function(){
931935 myUp = new mvBaseUploadInterface( iObj );
932936 myUp.setupForm();
Index: trunk/phase3/js2/mwEmbed/jsScriptLoader.php
——@@ -273,7 +273,7 @@
274274 $jmsg[$msgKey] = wfMsgNoTrans( $msgKey );
275275 }
276276 //return the updated loadGM json with fixed new lines:
277 - return 'loadGM( ' . ApiFormatJson::getJsonEncode( $jmsg ) . ')';
 277+ return 'loadGM( ' . json_encode( $jmsg ) . ')';
278278 } else {
279279 $this->error_msg.= "Could not parse JSON language msg in File:\n" .
280280 $this->cur_file . "\n";

Status & tagging log