| Index: trunk/phase3/js2/mwEmbed/libAddMedia/seqRemoteSearchDriver.js |
| — | — | @@ -31,13 +31,14 @@ |
| 32 | 32 | if(!this.pSeq.parent_do_refresh_timeline){ |
| 33 | 33 | this.pSeq.parent_do_refresh_timeline = this.pSeq.do_refresh_timeline; |
| 34 | 34 | this.pSeq.do_refresh_timeline = function(){ |
| 35 | | - js_log("seqRs refresh chain::" + _this.pSeq.disp_menu_item); |
| | 35 | + js_log("seqRemoteSearchDriver::" + _this.pSeq.disp_menu_item); |
| 36 | 36 | //call the parent |
| 37 | 37 | _this.pSeq.parent_do_refresh_timeline(); |
| 38 | 38 | //add our local bindings if our window is 'active' |
| 39 | 39 | if(_this.pSeq.disp_menu_item == 'cliplib'){ |
| 40 | 40 | _this.addResultBindings(); |
| 41 | 41 | } |
| | 42 | + return true; |
| 42 | 43 | } |
| 43 | 44 | } |
| 44 | 45 | }, |
| — | — | @@ -70,7 +71,7 @@ |
| 71 | 72 | $j(".mv_clip_drag").droppable( 'destroy' ).droppable({ |
| 72 | 73 | accept: '.rsd_res_item', |
| 73 | 74 | over:function(event, ui){ |
| 74 | | - js_log("over : mv_clip_drag: " + $j(this).attr('id') ); |
| | 75 | + //js_log("over : mv_clip_drag: " + $j(this).attr('id') ); |
| 75 | 76 | $j(this).css('border-right', 'solid thick red'); |
| 76 | 77 | }, |
| 77 | 78 | out:function(event, ui){ |
| Index: trunk/phase3/js2/mwEmbed/libAddMedia/remoteSearchDriver.js |
| — | — | @@ -356,9 +356,11 @@ |
| 357 | 357 | if( $j(this.target_invocation).length==0 ){ |
| 358 | 358 | js_log("RemoteSearchDriver:: no target invocation provided (will have to run your own doInitDisplay() )"); |
| 359 | 359 | }else{ |
| 360 | | - $j(this.target_invocation).css('cursor','pointer').attr('title', gM('add_media_wizard')).click(function(){ |
| 361 | | - _this.doInitDisplay(); |
| 362 | | - }); |
| | 360 | + if(this.target_invocation){ |
| | 361 | + $j(this.target_invocation).css('cursor','pointer').attr('title', gM('add_media_wizard')).click(function(){ |
| | 362 | + _this.doInitDisplay(); |
| | 363 | + }); |
| | 364 | + } |
| 363 | 365 | } |
| 364 | 366 | }, |
| 365 | 367 | doInitDisplay:function(){ |
| — | — | @@ -445,7 +447,7 @@ |
| 446 | 448 | js_log('closed modal'); |
| 447 | 449 | $j(this).parents('.ui-dialog').fadeOut('slow'); |
| 448 | 450 | } |
| 449 | | - }).css({'height':'100%'}).parent('.ui-dialog').css( _this.dmodalCss ) |
| | 451 | + }).parent('.ui-dialog').css( _this.dmodalCss ) |
| 450 | 452 | //@@bind on resize to disable css dialog to update dmodelCss |
| 451 | 453 | .bind('resizestart', function(event, ui) { |
| 452 | 454 | _this.dmodalCss = {}; |
| — | — | @@ -974,7 +976,7 @@ |
| 975 | 977 | var overflow_style = ( mediaType =='video' )?'':'overflow:auto;'; |
| 976 | 978 | //append to the top level of model window: |
| 977 | 979 | $j( _this.target_container ).append('<div id="rsd_resource_edit" '+ |
| 978 | | - 'style="position:absolute;top:0px;left:0px;bottom:75px;right:4px;background-color:#FFF;">' + |
| | 980 | + 'style="position:absolute;top:0px;left:0px;bottom:5px;right:4px;background-color:#FFF;">' + |
| 979 | 981 | '<div id="clip_edit_disp" style="position:absolute;' + overflow_style + 'width:100%;height:100%;padding:5px;'+ |
| 980 | 982 | 'width:' + (maxWidth) + 'px;" >' + |
| 981 | 983 | mv_get_loading_img('position:absolute;top:30px;left:30px') + |
| Index: trunk/phase3/js2/mwEmbed/libSequencer/mvPlayList.js |
| — | — | @@ -203,9 +203,11 @@ |
| 204 | 204 | } |
| 205 | 205 | } |
| 206 | 206 | }, |
| 207 | | - doNativeWarningCheck:function(){ |
| | 207 | + doNativeWarningCheck:function(){ |
| 208 | 208 | var clip = this.default_track.clips[0]; |
| 209 | | - return clip.embed.doNativeWarningCheck(); |
| | 209 | + if(clip){ |
| | 210 | + return clip.embed.doNativeWarningCheck(); |
| | 211 | + } |
| 210 | 212 | }, |
| 211 | 213 | doWhenParseDone:function(){ |
| 212 | 214 | js_log('f:doWhenParseDone'); |
| — | — | @@ -511,7 +513,7 @@ |
| 512 | 514 | }, |
| 513 | 515 | updateBaseStatus:function(){ |
| 514 | 516 | var _this = this; |
| 515 | | - js_log('f:updateBaseStatus'); |
| | 517 | + js_log('Playlist:updateBaseStatus'); |
| 516 | 518 | $j('#ptitle_'+this.id).html(''+ |
| 517 | 519 | '<b>' + this.title + '</b> '+ |
| 518 | 520 | this.getClipCount()+' clips, <i>'+ |
| Index: trunk/phase3/js2/mwEmbed/libSequencer/mvSequencer.js |
| — | — | @@ -1418,13 +1418,13 @@ |
| 1419 | 1419 | } |
| 1420 | 1420 | }, |
| 1421 | 1421 | //renders cnt_time |
| 1422 | | - render_playheadhead_seeker:function(){ |
| | 1422 | + render_playheadhead_seeker:function(){ |
| | 1423 | + js_log('render_playheadhead_seeker'); |
| 1423 | 1424 | //render out time stamps and time "jump" links |
| 1424 | 1425 | //first get total width |
| 1425 | 1426 | |
| 1426 | 1427 | //remove the old one if its still there |
| 1427 | | - $j('#'+this.timeline_id +'_pl_control').remove(); |
| 1428 | | - js_log('output controls to: ' + this.target_sequence_container); |
| | 1428 | + $j('#'+this.timeline_id +'_pl_control').remove(); |
| 1429 | 1429 | //render out a playlist clip wide and all the way to the right (only playhead and play button) (outside of timeline) |
| 1430 | 1430 | $j(this.target_sequence_container).append('<div id="'+ this.timeline_id +'_pl_control"'+ |
| 1431 | 1431 | ' style="position:absolute;top:' + (this.plObj.height) +'px;'+ |
| — | — | @@ -1479,7 +1479,8 @@ |
| 1480 | 1480 | this.do_refresh_timeline(); |
| 1481 | 1481 | js_log('zoom out: '+this.timeline_scale); |
| 1482 | 1482 | }, |
| 1483 | | - do_refresh_timeline:function( preserve_selection ){ |
| | 1483 | + do_refresh_timeline:function( preserve_selection ){ |
| | 1484 | + js_log('Sequencer:do_refresh_timeline()'); |
| 1484 | 1485 | //@@todo should "lock" interface while refreshing timeline |
| 1485 | 1486 | var pSelClips = []; |
| 1486 | 1487 | if(preserve_selection){ |
| Index: trunk/phase3/js2/mwEmbed/mv_embed.js |
| — | — | @@ -777,7 +777,7 @@ |
| 778 | 778 | '$j.ui.tabs', |
| 779 | 779 | '$j.ui.sortable' |
| 780 | 780 | ] |
| 781 | | - ], function(){ |
| | 781 | + ], function(){ |
| 782 | 782 | iObj['instance_name']= 'rsdMVRS'; |
| 783 | 783 | _global['rsdMVRS'] = new remoteSearchDriver( iObj ); |
| 784 | 784 | if( callback ){ |
| Index: trunk/phase3/js2/editPage.js |
| — | — | @@ -23,7 +23,7 @@ |
| 24 | 24 | var mwEditPageHelper = { |
| 25 | 25 | init:function(){ |
| 26 | 26 | var _this = this; |
| 27 | | - //@@todo check for new version of toolbar and add properly: |
| | 27 | + //@@todo check for new version of toolbar and via toolbar api: |
| 28 | 28 | if(typeof $j.fn.toolbar == 'undefined'){ |
| 29 | 29 | //add the add-media-wizard button for old toolbar: |
| 30 | 30 | $j('#toolbar').append('<img style="cursor:pointer" id="btn-add-media-wiz" src="' + mv_skin_img_path + 'Button_add_media.png">'); |