| Index: branches/new-upload/phase3/js2/mwEmbed/libSequencer/mvPlayList.js |
| — | — | @@ -116,21 +116,35 @@ |
| 117 | 117 | //pulls up the video editor inline |
| 118 | 118 | doEditor:function(){ |
| 119 | 119 | //black out the page: |
| 120 | | - $j('body').append('<div id="modalbox" class="modal_editor">' + '<div id="mv_overlay"/> '); |
| 121 | | - |
| 122 | | - $j('#modalbox').html('loading editor<blink>...</blink>'); |
| 123 | | - var _this=this; |
| 124 | | - js_log("calling sequence with url:" + _this.src); |
| | 120 | + //$j('body').append('<div id="ui-widget-overlay"/> <div id="modalbox" class="ui-widget ui-widget-content ui-corner-all modal_editor">' ); |
| 125 | 121 | |
| 126 | | - //clone the playlist (to make for easy cancel) |
| | 122 | + $j('body').append('<div id="sequencer_target" style="position:aboslute;top:10px;left:10px;right:10px;bottom:10px" title="' + gM('loading_title') + '" ></div>'); |
| | 123 | + $j('#sequencer_target').dialog({ |
| | 124 | + bgiframe: true, |
| | 125 | + autoOpen: true, |
| | 126 | + modal: true, |
| | 127 | + buttons: { |
| | 128 | + 'Cancel': function() { |
| | 129 | + $j(this).dialog('close'); |
| | 130 | + } |
| | 131 | + }, |
| | 132 | + }).css({ |
| | 133 | + 'width':'auto', |
| | 134 | + 'height':'auto', |
| | 135 | + 'top' : '10px', |
| | 136 | + 'left' : '10px', |
| | 137 | + 'right' : '10px', |
| | 138 | + 'bottom': '10px' |
| | 139 | + }); |
| | 140 | + //@@todo clone the playlist (for faster startup) |
| 127 | 141 | /*var this_plObj_Clone = $j('#'+this.id).get(0).cloneNode(true); |
| 128 | | - this_plObj_Clone.sequencer=true; |
| 129 | | - this_plObj_Clone.id= 'seq_plobj'; |
| 130 | | - debugger; |
| | 142 | + this_plObj_Clone.sequencer=true; |
| | 143 | + this_plObj_Clone.id= 'seq_plobj'; |
| | 144 | + debugger; |
| 131 | 145 | */ |
| 132 | 146 | //load sequencer: |
| 133 | | - $j("#modalbox").sequencer({ |
| 134 | | - "mv_pl_src":this.src |
| | 147 | + $j("#sequencer_target").sequencer({ |
| | 148 | + "mv_pl_src" : this.src |
| 135 | 149 | }); |
| 136 | 150 | |
| 137 | 151 | }, |
| Index: branches/new-upload/phase3/js2/mwEmbed/libSequencer/mvSequencer.js |
| — | — | @@ -331,7 +331,7 @@ |
| 332 | 332 | var tLibSet = mvTransLib['type'][ i ]; |
| 333 | 333 | for(var j in tLibSet){ |
| 334 | 334 | trans_name=base_trans_name+'_'+j; |
| 335 | | - js_log('tname: ' + trans_name); |
| | 335 | + js_log('adding tname: ' + trans_name); |
| 336 | 336 | o+='<img style="float:left;padding:10px;" '+ |
| 337 | 337 | 'src="'+mv_embed_path +'/skins/'+mv_skin_name+'/transition_images/'+ trans_name + '.png">'; |
| 338 | 338 | } |
| Index: branches/new-upload/phase3/js2/mwEmbed/libClipEdit/mvClipEdit.js |
| — | — | @@ -25,7 +25,7 @@ |
| 26 | 26 | "mv_custom_title":"Custom Title", |
| 27 | 27 | "mv_edit_properties":"Edit Properties", |
| 28 | 28 | "mv_other_properties":"Other Properties", |
| 29 | | - "mv_resource_page":"Resource Page", |
| | 29 | + "mv_resource_page" : "Resource Page:", |
| 30 | 30 | |
| 31 | 31 | "mv_set_in_out_points": "Set in-out points", |
| 32 | 32 | "mv_start_time": "Start Time", |
| — | — | @@ -100,7 +100,9 @@ |
| 101 | 101 | 'media':['image','template'], |
| 102 | 102 | 'doEdit':function(target, _this ){ |
| 103 | 103 | //do clock mouse scroll duration editor |
| 104 | | - $j(target).html('cur dur: ' + _this.rObj.dur ); |
| | 104 | + $j(target).html( |
| | 105 | + _this.getInput |
| | 106 | + ); |
| 105 | 107 | } |
| 106 | 108 | }, |
| 107 | 109 | 'inoutpoints':{ |
| Index: branches/new-upload/phase3/js2/mwEmbed/skins/mvpcf/styles.css |
| — | — | @@ -10,14 +10,13 @@ |
| 11 | 11 | } |
| 12 | 12 | |
| 13 | 13 | .modal_editor { |
| 14 | | - background:#AAA none repeat scroll 0 0; |
| 15 | | - border:3px solid #666666; |
| 16 | | - left:2px; |
| 17 | | - top:2px; |
| 18 | | - right:2px; |
| 19 | | - position:fixed; |
| 20 | | - width:99%; |
| 21 | | - height:99%; |
| | 14 | + /*background:#AAA none repeat scroll 0 0; |
| | 15 | + border:3px solid #666666;*/ |
| | 16 | + left:10px; |
| | 17 | + top:10px; |
| | 18 | + right:10px; |
| | 19 | + bottom:10px; |
| | 20 | + position:fixed; |
| 22 | 21 | z-index:100; |
| 23 | 22 | } |
| 24 | 23 | .mv_track { |
| Index: branches/new-upload/phase3/js2/mwEmbed/mv_embed.js |
| — | — | @@ -743,13 +743,15 @@ |
| 744 | 744 | 'mvSequencer' |
| 745 | 745 | ]; |
| 746 | 746 | var secondLoadSet =[]; |
| 747 | | - var uiDepLibs = ['$j.ui.dialog', |
| | 747 | + var uiDepLibs = [ |
| | 748 | + '$j.ui.dialog', |
| 748 | 749 | '$j.ui.droppable', |
| 749 | 750 | '$j.ui.draggable', |
| 750 | 751 | '$j.ui.sortable', |
| 751 | 752 | '$j.ui.resizable', |
| 752 | 753 | '$j.ui.slider', |
| 753 | | - '$j.ui.tabs']; |
| | 754 | + '$j.ui.tabs' |
| | 755 | + ]; |
| 754 | 756 | if($j.browser.msie || $j.browser.safari){ |
| 755 | 757 | for(var i=0;i<uiDepLibs.length;i++) |
| 756 | 758 | secondLoadSet.push( uiDepLibs[i]); |
| Index: branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/embedVideo.js |
| — | — | @@ -159,28 +159,17 @@ |
| 160 | 160 | } |
| 161 | 161 | if(loadPlaylistLib){ |
| 162 | 162 | mvJsLoader.doLoad([ |
| 163 | | - 'mvPlayList' |
| | 163 | + 'mvPlayList', |
| | 164 | + '$j.ui', //include dialog for pop-ing up thigns |
| | 165 | + '$j.ui.dialog' |
| 164 | 166 | ], function(){ |
| 165 | | - $j('playlist').each(function(){ |
| 166 | | - //check if we are in sequence mode load sequence libs (if not already loaded) |
| 167 | | - if( $j(this).attr('sequencer')=="true" ){ |
| 168 | | - var pl_element = this; |
| 169 | | - //load the mv_sequencer and the json util lib: |
| 170 | | - mvJsLoader.doLoad([ |
| 171 | | - 'mvSeqPlayList' |
| 172 | | - ],function(){ |
| 173 | | - var seqObj = new mvSeqPlayList( pl_element ); |
| 174 | | - mvEmbed.swapEmbedVideoElement( pl_element, seqObj ); |
| 175 | | - } |
| 176 | | - ); |
| 177 | | - }else{ |
| 178 | | - //create new playlist interface: |
| 179 | | - var plObj = new mvPlayList( this ); |
| 180 | | - mvEmbed.swapEmbedVideoElement(this, plObj); |
| 181 | | - var added_height = plObj.pl_layout.title_bar_height + plObj.pl_layout.control_height; |
| 182 | | - //move into a blocking display container with height + controls + title height: |
| 183 | | - $j('#'+plObj.id).wrap('<div style="display:block;height:' + (plObj.height + added_height) + 'px;"></div>'); |
| 184 | | - } |
| | 167 | + $j('playlist').each(function(){ |
| | 168 | + //create new playlist interface: |
| | 169 | + var plObj = new mvPlayList( this ); |
| | 170 | + mvEmbed.swapEmbedVideoElement(this, plObj); |
| | 171 | + var added_height = plObj.pl_layout.title_bar_height + plObj.pl_layout.control_height; |
| | 172 | + //move into a blocking display container with height + controls + title height: |
| | 173 | + $j('#'+plObj.id).wrap('<div style="display:block;height:' + (plObj.height + added_height) + 'px;"></div>'); |
| 185 | 174 | }); |
| 186 | 175 | }); |
| 187 | 176 | } |
| — | — | @@ -389,8 +378,10 @@ |
| 390 | 379 | if(embedObj.userSlide){ |
| 391 | 380 | embedObj.userSlide=false; |
| 392 | 381 | embedObj.seeking=true; |
| 393 | | - //stop the monitor timer: |
| 394 | | - embedObj.stopMonitor(); |
| | 382 | + //stop the monitor timer (if we can) |
| | 383 | + if(embedObj.stopMonitor) |
| | 384 | + embedObj.stopMonitor(); |
| | 385 | + |
| 395 | 386 | var perc = ui.value/1000; |
| 396 | 387 | //set seek time (in case we have to do a url seek) |
| 397 | 388 | embedObj.seek_time_sec = npt2seconds( embedObj.jump_time, true ); |