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
4a53f781
Commit
4a53f781
authored
Jun 10, 2016
by
clrux
Committed by
GitHub
Jun 10, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #12676 from edx/clrux/ac-473
AC-473 fixing width of closed captions in fullscreen
parents
1ff0a3b4
c1942467
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
2 deletions
+21
-2
common/lib/xmodule/xmodule/css/video/display.scss
+7
-0
common/lib/xmodule/xmodule/js/src/video/04_video_full_screen.js
+14
-2
No files found.
common/lib/xmodule/xmodule/css/video/display.scss
View file @
4a53f781
...
...
@@ -744,6 +744,13 @@
}
}
}
&
.video-fullscreen
{
.closed-captions
{
width
:
60%
;
}
}
.subtitles
{
@include
float
(
left
);
...
...
common/lib/xmodule/xmodule/js/src/video/04_video_full_screen.js
View file @
4a53f781
...
...
@@ -133,7 +133,8 @@ define('video/04_video_full_screen.js', [], function () {
}
function
exit
()
{
var
fullScreenClassNameEl
=
this
.
el
.
add
(
document
.
documentElement
);
var
fullScreenClassNameEl
=
this
.
el
.
add
(
document
.
documentElement
),
closedCaptionsEl
=
this
.
el
.
find
(
'.closed-captions'
);
this
.
videoFullScreen
.
fullScreenState
=
this
.
isFullScreen
=
false
;
fullScreenClassNameEl
.
removeClass
(
'video-fullscreen'
);
...
...
@@ -146,10 +147,16 @@ define('video/04_video_full_screen.js', [], function () {
.
text
(
gettext
(
'Fill browser'
));
this
.
el
.
trigger
(
'fullscreen'
,
[
this
.
isFullScreen
]);
$
(
closedCaptionsEl
).
css
({
'top'
:
'70%'
,
'left'
:
'5%'
});
}
function
enter
()
{
var
fullScreenClassNameEl
=
this
.
el
.
add
(
document
.
documentElement
);
var
fullScreenClassNameEl
=
this
.
el
.
add
(
document
.
documentElement
),
closedCaptionsEl
=
this
.
el
.
find
(
'.closed-captions'
);
this
.
scrollPos
=
$
(
window
).
scrollTop
();
$
(
window
).
scrollTop
(
0
);
...
...
@@ -163,6 +170,11 @@ define('video/04_video_full_screen.js', [], function () {
.
text
(
gettext
(
'Exit full browser'
));
this
.
el
.
trigger
(
'fullscreen'
,
[
this
.
isFullScreen
]);
$
(
closedCaptionsEl
).
css
({
'top'
:
'70%'
,
'left'
:
'5%'
});
}
/** Toggle fullscreen mode. */
...
...
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