Revision: 51126
Author: j
Date: 2009-05-28 17:33:11 +0000 (Thu, 28 May 2009)
Log Message:
-----------
4 space cleanup
Modified Paths:
--------------
branches/new-upload/phase3/js2/mwEmbed/example_usage/seeking_example.html
branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/mv_nativeEmbed.js
branches/new-upload/phase3/js2/mwEmbed/libSequencer/mvPlayList.js
Modified:
branches/new-upload/phase3/js2/mwEmbed/example_usage/seeking_example.html
===================================================================
--- branches/new-upload/phase3/js2/mwEmbed/example_usage/seeking_example.html
2009-05-28 17:26:36 UTC (rev 51125)
+++ branches/new-upload/phase3/js2/mwEmbed/example_usage/seeking_example.html
2009-05-28 17:33:11 UTC (rev 51126)
@@ -49,7 +49,7 @@
}
function seek() {
var seekTo = $j('#pos').val();
- document.getElementById('render_box').setCurrentTime(seekTo, function() {
alert('seeked'); });
+ document.getElementById('render_box').setCurrentTime(seekTo, function() {
js_log('seeked'); });
}
</script>
</head>
@@ -60,7 +60,7 @@
<div id="info" style="position: absolute; top:360px">
<button onclick="startRender()">Start</button>
<button onclick="stopRender()">Stop</button>
- position: <input type="text" id="pos" value="0.0" />
+ position: <input type="text" id="pos" value="6.6" />
<button onclick="seek()">seek</button>
<span id="status"></span><br>
</div>
Modified: branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/mv_nativeEmbed.js
===================================================================
--- branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/mv_nativeEmbed.js
2009-05-28 17:26:36 UTC (rev 51125)
+++ branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/mv_nativeEmbed.js
2009-05-28 17:33:11 UTC (rev 51126)
@@ -78,25 +78,24 @@
}
},
setCurrentTime: function(pos, callback){
- var _this = this;
+ var _this = this;
this.getVID();
if(!this.vid) {
- js_log('native:setCurrentTime: load video');
- this.load();
- var loaded = function(event) {
- js_log('native:setCurrentTime (after load): ' + pos + ' : dur: '
+ this.getDuration());
- _this.vid.currentTime = pos;
- var once = function(event) { callback();
_this.vid.removeEventListener('seeked', once, false) };
- _this.vid.addEventListener('seeked', once, false);
-
- _this.removeEventListener('loadedmetadata', loaded, false);
- };
- _this.addEventListener('loadedmetadata', loaded, false);
+ js_log('native:setCurrentTime: load video');
+ this.load();
+ var loaded = function(event) {
+ js_log('native:setCurrentTime (after load): ' + pos + ' :
dur: ' + this.getDuration());
+ _this.vid.currentTime = pos;
+ var once = function(event) { callback();
_this.vid.removeEventListener('seeked', once, false) };
+ _this.vid.addEventListener('seeked', once, false);
+ _this.removeEventListener('loadedmetadata', loaded, false);
+ };
+ _this.addEventListener('loadedmetadata', loaded, false);
} else {
- js_log('native:setCurrentTime: ' + pos + ' : ' +
this.supportsURLTimeEncoding() + ' dur: ' + this.getDuration() + ' sts:' +
this.seek_time_sec );
- _this.vid.currentTime = pos;
- var once = function(event) { callback();
_this.vid.removeEventListener('seeked', once, false) };
- _this.vid.addEventListener('seeked', once, false);
+ js_log('native:setCurrentTime: ' + pos + ' : ' +
this.supportsURLTimeEncoding() + ' dur: ' + this.getDuration() + ' sts:' +
this.seek_time_sec );
+ _this.vid.currentTime = pos;
+ var once = function(event) { callback();
_this.vid.removeEventListener('seeked', once, false) };
+ _this.vid.addEventListener('seeked', once, false);
}
},
monitor : function(){
Modified: branches/new-upload/phase3/js2/mwEmbed/libSequencer/mvPlayList.js
===================================================================
--- branches/new-upload/phase3/js2/mwEmbed/libSequencer/mvPlayList.js
2009-05-28 17:26:36 UTC (rev 51125)
+++ branches/new-upload/phase3/js2/mwEmbed/libSequencer/mvPlayList.js
2009-05-28 17:33:11 UTC (rev 51126)
@@ -783,16 +783,16 @@
if (currentOffset + nextTime > pos) {
//update the clip relative seek_time_sec
clipTime = pos - currentOffset;
- if (plObj.cur_clip.id != clip.id) {
- plObj.updateCurrentClip( clip );
- }
+ if (plObj.cur_clip.id != clip.id) {
+ plObj.updateCurrentClip( clip );
+ }
plObj.cur_clip.embed.setCurrentTime(clipTime, callback);
- plObj.currentTime = pos;
- plObj.doSmilActions();
+ plObj.currentTime = pos;
+ plObj.doSmilActions();
return '';
}
currentOffset += nextTime;
- }
+ }
},
//gets playlist controls large control height for sporting
//next prev button and more status display
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
