| Index: branches/new-upload/phase3/js2/mwEmbed/libSequencer/mvSequencer.js |
| — | — | @@ -5,10 +5,9 @@ |
| 6 | 6 | * for more info visit http://metavid.org/wiki/Code |
| 7 | 7 | * |
| 8 | 8 | * @author Michael Dale |
| 9 | | - * @email dale@ucsc.edu |
| 10 | | - * @url http://metavid.org |
| | 9 | + * @email mdale@wikimedia.org |
| 11 | 10 | * |
| 12 | | - * @further developed in open source collaboration with kaltura. |
| | 11 | + * further developed in open source development partnership with kaltura. |
| 13 | 12 | * more info at http://kaltura.com & http://kaltura.org |
| 14 | 13 | * |
| 15 | 14 | * mv_sequencer.js |
| — | — | @@ -19,7 +18,7 @@ |
| 20 | 19 | * exports back out to json or inline format |
| 21 | 20 | */ |
| 22 | 21 | |
| 23 | | -loadGM( { |
| | 22 | +loadGM({ |
| 24 | 23 | "menu_clipedit" : "Edit Selected Resource", |
| 25 | 24 | "menu_cliplib" : "Add Resource", |
| 26 | 25 | "menu_transition" : "Transitions Effects", |
| — | — | @@ -117,7 +116,11 @@ |
| 118 | 117 | edit_stack:new Array(), |
| 119 | 118 | disp_menu_item:null, |
| 120 | 119 | //trackObj used to payload playlist Track Object (when inline not present) |
| 121 | | - tracks:{} |
| | 120 | + tracks:{}, |
| | 121 | + |
| | 122 | + about_html:'Developed by <a href="http://kaltura.com">Kaltura, Inc.</a>' + |
| | 123 | + 'in partnership with the <a href="http://wikimediafoundation.org/wiki/Home">Wikimedia Foundation</a> ' + |
| | 124 | + '( <a href="#">more info</a> )' |
| 122 | 125 | } |
| 123 | 126 | var mvSequencer = function(iObj) { |
| 124 | 127 | return this.init(iObj); |
| — | — | @@ -230,6 +233,9 @@ |
| 231 | 234 | 'left:5px;bottom:0px;height:25px;">'+ |
| 232 | 235 | gM('loading_user_rights') + |
| 233 | 236 | '</div>'+ |
| | 237 | + '<div class="about_editor" style="position:absolute;right:5px;bottom:7px;">' + |
| | 238 | + this.about_html + |
| | 239 | + '</div>'+ |
| 234 | 240 | '<div id="'+this.sequence_tools_id+'" style="position:absolute;' + |
| 235 | 241 | 'left:0px;right:'+(this.video_width+15)+'px;top:0px;height:'+(this.video_height+23)+'px;"/>' |
| 236 | 242 | ); |
| — | — | @@ -269,8 +275,8 @@ |
| 270 | 276 | var _this = this; |
| 271 | 277 | if( this.sequenceEditToken ){ |
| 272 | 278 | $j(this.target_sequence_container+' .seq_save_cancel').html( |
| 273 | | - $j.btnHtml( gM('edit_cancel'), 'seq_edit_cancel', 'close') + ' ' + |
| 274 | | - $j.btnHtml( gM('edit_save'), 'seq_edit_save', 'close') |
| | 279 | + $j.btnHtml( gM('edit_save'), 'seq_edit_save', 'close') + ' ' + |
| | 280 | + $j.btnHtml( gM('edit_cancel'), 'seq_edit_cancel', 'close') |
| 275 | 281 | ); |
| 276 | 282 | }else{ |
| 277 | 283 | $j(this.target_sequence_container+' .seq_save_cancel').html( cancel_button + gM('no_edit_permissions') ); |
| — | — | @@ -325,13 +331,13 @@ |
| 326 | 332 | $j('#seq_save_dialog').html( gM('save_done') ); |
| 327 | 333 | $j('#seq_save_dialog').dialog('option', |
| 328 | 334 | 'buttons', { |
| 329 | | - "Done":function(){ |
| 330 | | - //close the editor if we can |
| 331 | | - $j(this).dialog("close"); |
| | 335 | + "Done":function(){ |
| | 336 | + //refresh the page? |
| | 337 | + window.location.reload(); |
| 332 | 338 | }, |
| 333 | 339 | "Do More Edits": function() { |
| 334 | 340 | $j(this).dialog("close"); |
| 335 | | - } |
| | 341 | + } |
| 336 | 342 | }); |
| 337 | 343 | }); |
| 338 | 344 | }, |
| — | — | @@ -625,7 +631,7 @@ |
| 626 | 632 | this.doFocusBindings(); |
| 627 | 633 | |
| 628 | 634 | //set up key bidnings |
| 629 | | - $j().keydown(function(e){ |
| | 635 | + $j(window).keydown(function(e){ |
| 630 | 636 | js_log('pushed down on:' + e.which); |
| 631 | 637 | if( e.which == 16 ) |
| 632 | 638 | _this.key_shift_down = true; |
| — | — | @@ -644,7 +650,7 @@ |
| 645 | 651 | _this.pasteClipBoardClips(); |
| 646 | 652 | |
| 647 | 653 | }); |
| 648 | | - $j().keyup(function(e){ |
| | 654 | + $j(window).keyup(function(e){ |
| 649 | 655 | js_log('key up on ' + e.which); |
| 650 | 656 | //user let go of "shift" turn off multi-select |
| 651 | 657 | if( e.which == 16 ) |
| — | — | @@ -1030,18 +1036,19 @@ |
| 1031 | 1037 | 'time':0 |
| 1032 | 1038 | }); |
| 1033 | 1039 | //render out edit button |
| 1034 | | - track_html+='<div class="clip_edit_button clip_edit_base clip_control"/>'; |
| | 1040 | + /*track_html+='<div class="clip_edit_button clip_edit_base clip_control"/>';*/ |
| 1035 | 1041 | |
| 1036 | 1042 | //render out transition edit box |
| 1037 | 1043 | track_html+='<div id="tb_' + base_id + '" style="" class="clip_trans_box"/>'; |
| 1038 | 1044 | |
| 1039 | 1045 | //render out adjustment text |
| 1040 | | - track_html+='<div id="' + base_id + '_adj' + '" class="mv_adj_text" style="top:'+ (this.track_clipThumb_height+10 )+'px;">'+ |
| | 1046 | + /*track_html+='<div id="' + base_id + '_adj' + '" class="mv_adj_text" style="top:'+ (this.track_clipThumb_height+10 )+'px;">'+ |
| 1041 | 1047 | '<span class="mv_adjust_click" onClick="'+this.instance_name+'.adjClipDur(' + track_id + ',' + j + ',\'-\')" /> - </span>'+ |
| 1042 | 1048 | ( (clip.getDuration() > 60 )? seconds2npt(clip.getDuration()): clip.getDuration() ) + |
| 1043 | 1049 | '<span class="mv_adjust_click" onClick="'+this.instance_name+'.adjClipDur(' + track_id + ',' + j + ',\'+\')" /> + </span>'+ |
| 1044 | | - '</div>'; |
| 1045 | | - track_html+='</span>'; |
| | 1050 | + '</div>'; |
| | 1051 | + */ |
| | 1052 | + track_html+='</span>'; |
| 1046 | 1053 | |
| 1047 | 1054 | } |
| 1048 | 1055 | //do timeline_mode rendering: |
| Index: branches/new-upload/phase3/js2/mwEmbed/libClipEdit/mvClipEdit.js |
| — | — | @@ -205,7 +205,9 @@ |
| 206 | 206 | $j(target).html ( o ); |
| 207 | 207 | //add update bindings |
| 208 | 208 | $j(target + ' .ic_tparam').change(function(){ |
| 209 | | - js_log("updated tparam" + $j(this).attr("name")); |
| | 209 | + js_log("updated tparam::" + $j(this).attr("name")); |
| | 210 | + //add wait |
| | 211 | + //re-parse template |
| 210 | 212 | }) |
| 211 | 213 | |
| 212 | 214 | //update doFocusBindings |
| Index: branches/new-upload/phase3/js2/mwEmbed/skins/mvpcf/styles.css |
| — | — | @@ -698,4 +698,4 @@ |
| 699 | 699 | |
| 700 | 700 | .ui-dialog .ui-dialog-buttonpane button { float: left !important; } |
| 701 | 701 | |
| 702 | | - |
| | 702 | +.ui-widget-content a { text-decoration: underline; } |