Revision: 51674
Author: dale
Date: 2009-06-10 01:51:40 +0000 (Wed, 10 Jun 2009)
Log Message:
-----------
sequencer style updates
Modified Paths:
--------------
branches/new-upload/phase3/js2/mwEmbed/libClipEdit/mvClipEdit.js
branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/embedVideo.js
branches/new-upload/phase3/js2/mwEmbed/libSequencer/mvPlayList.js
branches/new-upload/phase3/js2/mwEmbed/libSequencer/mvSequencer.js
branches/new-upload/phase3/js2/mwEmbed/mv_embed.js
branches/new-upload/phase3/js2/mwEmbed/skins/mvpcf/styles.css
Modified: branches/new-upload/phase3/js2/mwEmbed/libClipEdit/mvClipEdit.js
===================================================================
--- branches/new-upload/phase3/js2/mwEmbed/libClipEdit/mvClipEdit.js
2009-06-10 01:47:58 UTC (rev 51673)
+++ branches/new-upload/phase3/js2/mwEmbed/libClipEdit/mvClipEdit.js
2009-06-10 01:51:40 UTC (rev 51674)
@@ -25,7 +25,7 @@
"mv_custom_title":"Custom Title",
"mv_edit_properties":"Edit Properties",
"mv_other_properties":"Other Properties",
- "mv_resource_page":"Resource Page",
+ "mv_resource_page" : "Resource Page:",
"mv_set_in_out_points": "Set in-out points",
"mv_start_time": "Start Time",
@@ -100,7 +100,9 @@
'media':['image','template'],
'doEdit':function(target, _this ){
//do clock mouse scroll duration editor
- $j(target).html('cur dur: ' + _this.rObj.dur );
+ $j(target).html(
+ _this.getInput
+ );
}
},
'inoutpoints':{
Modified: branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/embedVideo.js
===================================================================
--- branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/embedVideo.js
2009-06-10 01:47:58 UTC (rev 51673)
+++ branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/embedVideo.js
2009-06-10 01:51:40 UTC (rev 51674)
@@ -159,28 +159,17 @@
}
if(loadPlaylistLib){
mvJsLoader.doLoad([
- 'mvPlayList'
+ 'mvPlayList',
+ '$j.ui', //include dialog for pop-ing up
thigns
+ '$j.ui.dialog'
], function(){
- $j('playlist').each(function(){
- //check if we are in sequence mode load
sequence libs (if not already loaded)
- if( $j(this).attr('sequencer')=="true"
){
- var pl_element = this;
- //load the mv_sequencer and the
json util lib:
- mvJsLoader.doLoad([
- 'mvSeqPlayList'
- ],function(){
- var seqObj =
new mvSeqPlayList( pl_element );
-
mvEmbed.swapEmbedVideoElement( pl_element, seqObj );
- }
- );
- }else{
- //create new playlist interface:
- var plObj = new mvPlayList(
this );
-
mvEmbed.swapEmbedVideoElement(this, plObj);
- var added_height =
plObj.pl_layout.title_bar_height + plObj.pl_layout.control_height;
- //move into a blocking display
container with height + controls + title height:
- $j('#'+plObj.id).wrap('<div
style="display:block;height:' + (plObj.height + added_height) + 'px;"></div>');
- }
+ $j('playlist').each(function(){
+ //create new playlist interface:
+ var plObj = new mvPlayList( this );
+ mvEmbed.swapEmbedVideoElement(this,
plObj);
+ var added_height =
plObj.pl_layout.title_bar_height + plObj.pl_layout.control_height;
+ //move into a blocking display
container with height + controls + title height:
+ $j('#'+plObj.id).wrap('<div
style="display:block;height:' + (plObj.height + added_height) + 'px;"></div>');
});
});
}
@@ -389,8 +378,10 @@
if(embedObj.userSlide){
embedObj.userSlide=false;
embedObj.seeking=true;
- //stop the monitor timer:
- embedObj.stopMonitor();
+ //stop the monitor timer (if we can)
+ if(embedObj.stopMonitor)
+ embedObj.stopMonitor();
+
var perc = ui.value/1000;
//set seek time (in case we have to do
a url seek)
embedObj.seek_time_sec = npt2seconds(
embedObj.jump_time, true );
Modified: branches/new-upload/phase3/js2/mwEmbed/libSequencer/mvPlayList.js
===================================================================
--- branches/new-upload/phase3/js2/mwEmbed/libSequencer/mvPlayList.js
2009-06-10 01:47:58 UTC (rev 51673)
+++ branches/new-upload/phase3/js2/mwEmbed/libSequencer/mvPlayList.js
2009-06-10 01:51:40 UTC (rev 51674)
@@ -116,21 +116,35 @@
//pulls up the video editor inline
doEditor:function(){
//black out the page:
- $j('body').append('<div id="modalbox" class="modal_editor">' +
'<div id="mv_overlay"/> ');
-
- $j('#modalbox').html('loading editor<blink>...</blink>');
- var _this=this;
- js_log("calling sequence with url:" + _this.src);
+ //$j('body').append('<div id="ui-widget-overlay"/> <div
id="modalbox" class="ui-widget ui-widget-content ui-corner-all modal_editor">'
);
- //clone the playlist (to make for easy cancel)
+ $j('body').append('<div id="sequencer_target"
style="position:aboslute;top:10px;left:10px;right:10px;bottom:10px" title="' +
gM('loading_title') + '" ></div>');
+ $j('#sequencer_target').dialog({
+ bgiframe: true,
+ autoOpen: true,
+ modal: true,
+ buttons: {
+ 'Cancel': function() {
+ $j(this).dialog('close');
+ }
+ },
+ }).css({
+ 'width':'auto',
+ 'height':'auto',
+ 'top' : '10px',
+ 'left' : '10px',
+ 'right' : '10px',
+ 'bottom': '10px'
+ });
+ //@@todo clone the playlist (for faster startup)
/*var this_plObj_Clone = $j('#'+this.id).get(0).cloneNode(true);
- this_plObj_Clone.sequencer=true;
- this_plObj_Clone.id= 'seq_plobj';
- debugger;
+ this_plObj_Clone.sequencer=true;
+ this_plObj_Clone.id= 'seq_plobj';
+ debugger;
*/
//load sequencer:
- $j("#modalbox").sequencer({
- "mv_pl_src":this.src
+ $j("#sequencer_target").sequencer({
+ "mv_pl_src" : this.src
});
},
Modified: branches/new-upload/phase3/js2/mwEmbed/libSequencer/mvSequencer.js
===================================================================
--- branches/new-upload/phase3/js2/mwEmbed/libSequencer/mvSequencer.js
2009-06-10 01:47:58 UTC (rev 51673)
+++ branches/new-upload/phase3/js2/mwEmbed/libSequencer/mvSequencer.js
2009-06-10 01:51:40 UTC (rev 51674)
@@ -331,7 +331,7 @@
var tLibSet = mvTransLib['type'][ i ];
for(var j in tLibSet){
trans_name=base_trans_name+'_'+j;
- js_log('tname: ' + trans_name);
+ js_log('adding tname: ' + trans_name);
o+='<img style="float:left;padding:10px;" '+
'src="'+mv_embed_path
+'/skins/'+mv_skin_name+'/transition_images/'+ trans_name + '.png">';
}
Modified: branches/new-upload/phase3/js2/mwEmbed/mv_embed.js
===================================================================
--- branches/new-upload/phase3/js2/mwEmbed/mv_embed.js 2009-06-10 01:47:58 UTC
(rev 51673)
+++ branches/new-upload/phase3/js2/mwEmbed/mv_embed.js 2009-06-10 01:51:40 UTC
(rev 51674)
@@ -743,13 +743,15 @@
'mvSequencer'
];
var secondLoadSet =[];
- var uiDepLibs = ['$j.ui.dialog',
+ var uiDepLibs = [
+ '$j.ui.dialog',
'$j.ui.droppable',
'$j.ui.draggable',
'$j.ui.sortable',
'$j.ui.resizable',
'$j.ui.slider',
- '$j.ui.tabs'];
+ '$j.ui.tabs'
+ ];
if($j.browser.msie || $j.browser.safari){
for(var i=0;i<uiDepLibs.length;i++)
secondLoadSet.push( uiDepLibs[i]);
Modified: branches/new-upload/phase3/js2/mwEmbed/skins/mvpcf/styles.css
===================================================================
--- branches/new-upload/phase3/js2/mwEmbed/skins/mvpcf/styles.css
2009-06-10 01:47:58 UTC (rev 51673)
+++ branches/new-upload/phase3/js2/mwEmbed/skins/mvpcf/styles.css
2009-06-10 01:51:40 UTC (rev 51674)
@@ -10,14 +10,13 @@
}
.modal_editor {
- background:#AAA none repeat scroll 0 0;
- border:3px solid #666666;
- left:2px;
- top:2px;
- right:2px;
- position:fixed;
- width:99%;
- height:99%;
+ /*background:#AAA none repeat scroll 0 0;
+ border:3px solid #666666;*/
+ left:10px;
+ top:10px;
+ right:10px;
+ bottom:10px;
+ position:fixed;
z-index:100;
}
.mv_track {
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
