Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update variable names for video module

Browse Source
This commit is contained in:
ataki
2015-03-05 16:59:21 -08:00
parent 5917ed063d
commit 27d3d0344d
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/lib/xmodule/xmodule/js/src/video/03_video_player.js
View File

@@ -815,18 +815,18 @@ function (HTML5Video, Resizer) {
function updatePlayTime(time, skip_seek) {
var videoPlayer = this.videoPlayer,
duration = this.videoPlayer.duration(),
endTime = this.videoPlayer.duration(),
youTubeId;
if (this.config.endTime !== null) {
duration = Math.min(this.config.endTime, duration);
endTime = Math.min(this.config.endTime, endTime);
}
this.trigger(
'videoProgressSlider.updatePlayTime',
{
time: time,
duration: duration
duration: endTime
}
);
@@ -834,7 +834,7 @@ function (HTML5Video, Resizer) {
'videoControl.updateVcrVidTime',
{
time: time,
duration: duration
duration: endTime
}
);

6
common/lib/xmodule/xmodule/js/src/video/04_video_control.js
View File

@@ -296,10 +296,10 @@ function () {
}
function updateVcrVidTime(params) {
var duration = (this.config.endTime !== null) ? this.config.endTime : params.duration;
var endTime = (this.config.endTime !== null) ? this.config.endTime : params.duration;
// in case endTime is accidentally specified as being greater than the video
duration = Math.min(duration, params.duration);
this.videoControl.vidTimeEl.html(Time.format(params.time) + ' / ' + Time.format(duration));
endTime = Math.min(endTime, params.duration);
this.videoControl.vidTimeEl.html(Time.format(params.time) + ' / ' + Time.format(endTime));
}
});

14
common/lib/xmodule/xmodule/js/src/video/06_video_progress_slider.js
View File

@@ -164,10 +164,10 @@ function () {
function onSlide(event, ui) {
var time = ui.value,
duration = this.videoPlayer.duration();
endTime = this.videoPlayer.duration();
if (this.config.endTime !== null) {
duration = Math.min(this.config.endTime, duration);
endTime = Math.min(this.config.endTime, endTime);
}
this.videoProgressSlider.frozen = true;
@@ -180,7 +180,7 @@ function () {
'videoControl.updateVcrVidTime',
{
time: time,
duration: duration
duration: endTime
}
);
@@ -226,10 +226,10 @@ function () {
// params.duration could accidentally be construed as a floating
// point double. Since we're displaying this number, round down
// to nearest second
var duration = Math.floor(params.duration);
var endTime = Math.floor(params.duration);
if (this.config.endTime !== null) {
duration = Math.min(this.config.endTime, duration);
endTime = Math.min(this.config.endTime, endTime);
}
if (
@@ -237,13 +237,13 @@ function () {
!this.videoProgressSlider.frozen
) {
this.videoProgressSlider.slider
.slider('option', 'max', duration)
.slider('option', 'max', endTime)
.slider('option', 'value', time);
}
// Update aria values.
this.videoProgressSlider.handle.attr({
'aria-valuemax': duration,
'aria-valuemax': endTime,
'aria-valuenow': time
});
}