Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
edx-platform-release
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Hsin-Yu Chien
edx-platform-release
Commits
91ec617c
Commit
91ec617c
authored
11 years ago
by
Valera Rozuvan
Browse files
Options
Downloads
Patches
Plain Diff
Addressing review comments from jmclaus.
parent
c667c013
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
common/lib/xmodule/xmodule/js/src/video/03_video_player.js
+8
-8
8 additions, 8 deletions
common/lib/xmodule/xmodule/js/src/video/03_video_player.js
common/lib/xmodule/xmodule/js/src/video/06_video_progress_slider.js
+1
-1
1 addition, 1 deletion
.../xmodule/xmodule/js/src/video/06_video_progress_slider.js
with
9 additions
and
9 deletions
common/lib/xmodule/xmodule/js/src/video/03_video_player.js
+
8
−
8
View file @
91ec617c
...
...
@@ -305,10 +305,10 @@ function (HTML5Video, Resizer) {
this
.
videoPlayer
.
updatePlayTime
(
this
.
videoPlayer
.
currentTime
);
// We need to pause the video if current time is smaller (or equal)
// than end
time. Also, we must make sure that this is only done
// than end
-
time. Also, we must make sure that this is only done
// once per video playing from start to end.
if
(
this
.
videoPlayer
.
stopAtEndTime
===
true
&&
this
.
videoPlayer
.
stopAtEndTime
&&
this
.
videoPlayer
.
endTime
!==
null
&&
this
.
videoPlayer
.
endTime
<=
this
.
videoPlayer
.
currentTime
)
{
...
...
@@ -648,7 +648,7 @@ function (HTML5Video, Resizer) {
savedVideoPosition
=
this
.
config
.
savedVideoPosition
,
youTubeId
,
startTime
,
endTime
;
if
(
duration
>
0
&&
videoPlayer
.
goToStartTime
===
true
)
{
if
(
duration
>
0
&&
videoPlayer
.
goToStartTime
)
{
videoPlayer
.
goToStartTime
=
false
;
videoPlayer
.
startTime
=
this
.
config
.
startTime
;
...
...
@@ -716,14 +716,14 @@ function (HTML5Video, Resizer) {
if
(
time
>
0
)
{
// After a bug came up (BLD-708: "In Firefox YouTube video with
// start
time plays from 00:00:00") the video refused to play
// from start
time, and only played from the beginning.
// start
-
time plays from 00:00:00") the video refused to play
// from start
-
time, and only played from the beginning.
//
// It turned out that for some reason if Firefox you couldn't
// seek beyond some amount of time before the video loaded.
// Very strange, but in Chrome there is no such bug.
//
// HTML5 video sources play fine from start
time in both Chrome
// HTML5 video sources play fine from start
-
time in both Chrome
// and Firefox.
if
(
this
.
browserIsFirefox
&&
this
.
videoType
===
'
youtube
'
)
{
if
(
this
.
currentPlayerMode
===
'
flash
'
)
{
...
...
@@ -734,7 +734,7 @@ function (HTML5Video, Resizer) {
// When we will call cueVideoById() for some strange reason
// an ENDED event will be fired. It really does no damage
// except for the fact that the end
time is reset to null.
// except for the fact that the end
-
time is reset to null.
// We do not want this.
//
// The flag `skipOnEndedStartEndReset` will notify the
...
...
@@ -808,7 +808,7 @@ function (HTML5Video, Resizer) {
// Sometimes the YouTube API doesn't finish instantiating all of it's
// methods, but the execution point arrives here.
//
// This happens when you have start and end
time
s
set, and click "Edit"
// This happens when you have start
-time
and end
-
time set, and click "Edit"
// in Studio, and then "Save". The Video editor dialog closes, the
// video reloads, but the start-end range is not visible.
if
(
this
.
videoPlayer
.
player
.
getDuration
)
{
...
...
This diff is collapsed.
Click to expand it.
common/lib/xmodule/xmodule/js/src/video/06_video_progress_slider.js
+
1
−
1
View file @
91ec617c
...
...
@@ -101,7 +101,7 @@ function () {
}
// Rebuild the slider start-end range (if it doesn't take up the
// whole slider). Remember that endTime === null means the end
time
// whole slider). Remember that endTime === null means the end
-
time
// is set to the end of video by default.
function
updateStartEndTimeRegion
(
params
)
{
var
isFlashMode
=
this
.
currentPlayerMode
===
'
flash
'
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment