Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
d408d7ad
Commit
d408d7ad
authored
Oct 16, 2013
by
Valera Rozuvan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enabled 2nd disabled Jasmine test.
parent
deb36999
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
5 deletions
+14
-5
common/lib/xmodule/xmodule/js/spec/video/general_spec.js
+13
-4
common/lib/xmodule/xmodule/js/src/video/03_video_player.js
+1
-1
No files found.
common/lib/xmodule/xmodule/js/spec/video/general_spec.js
View file @
d408d7ad
...
...
@@ -206,20 +206,29 @@
state3
=
new
Video
(
'#example3'
);
});
x
it
(
'check for YT availability is performed only once'
,
function
()
{
it
(
'check for YT availability is performed only once'
,
function
()
{
var
numAjaxCalls
=
0
;
// Total ajax calls made.
numAjaxCalls
=
$
.
ajax
.
calls
.
length
;
// Subtract ajax calls to get captions.
// Subtract ajax calls to get captions via
// state.videoCaption.fetchCaption() function.
numAjaxCalls
-=
$
.
ajaxWithPrefix
.
calls
.
length
;
// Subtract ajax calls to get metadata for each video.
// Subtract ajax calls to get metadata for each video via
// state.getVideoMetadata() function.
numAjaxCalls
-=
3
;
// Subtract ajax calls to log event 'pause_video' via
// state.videoPlayer.log() function.
numAjaxCalls
-=
3
;
// This should leave just one call. It was made to check
// for YT availability.
// for YT availability. This is done in state.initialize()
// function. SPecifically, with the statement
//
// this.youtubeXhr = this.getVideoMetadata();
expect
(
numAjaxCalls
).
toBe
(
1
);
});
});
...
...
common/lib/xmodule/xmodule/js/src/video/03_video_player.js
View file @
d408d7ad
...
...
@@ -420,7 +420,7 @@ function (HTML5Video) {
this
.
videoPlayer
.
player
.
setPlaybackRate
(
this
.
speed
);
}
/* The following has been commented out to make sure autoplay is
/* The following has been commented out to make sure autoplay is
disabled for students.
if (
!onTouchBasedDevice() &&
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment