Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
officejs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
officejs
Commits
184b6211
Commit
184b6211
authored
Jul 21, 2014
by
Xiaowu Zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add panel control when fullscreen
parent
8ee6a35a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
9 deletions
+16
-9
dev/audioplayer_control/control.css
dev/audioplayer_control/control.css
+1
-1
dev/audioplayer_control/control.js
dev/audioplayer_control/control.js
+5
-2
src/audioplayer_control/control.js
src/audioplayer_control/control.js
+7
-3
src/audioplayer_control/control.less
src/audioplayer_control/control.less
+3
-3
No files found.
dev/audioplayer_control/control.css
View file @
184b6211
button
.loop
{
width
:
10em
}
#visualizer
{
text-align
:
center
}
#video
{
text-align
:
center
}
video
#videoControl
{
width
:
50%
;
height
:
20%
}
canvas
#can
{
width
:
50%
;
height
:
20%
}
video
::-webkit-media-controls-enclosure
{
display
:
none
!important
}
progress
.bar
{
position
:
inherit
;
display
:
block
;
height
:
1em
;
width
:
100%
;
-moz-border-radius
:
.5em
;
-webkit-border-radius
:
.5em
;
border-radius
:
.5em
;
-moz-box-shadow
:
0
.1em
.5em
#000
inset
,
0
.1em
0
#444
;
-webkit-box-shadow
:
0
.1em
.5em
#000
inset
,
0
.1em
0
#444
;
box-shadow
:
0
.1em
.5em
#000
inset
,
0
.1em
0
#444
}
\ No newline at end of file
button
.loop
{
width
:
10em
}
#visualizer
{
text-align
:
center
}
#video
{
text-align
:
center
}
video
#videoControl
{
width
:
50%
;
height
:
20%
}
canvas
#can
{
width
:
50%
;
height
:
20%
}
progress
.bar
{
position
:
inherit
;
display
:
block
;
height
:
1em
;
width
:
100%
;
-moz-border-radius
:
.5em
;
-webkit-border-radius
:
.5em
;
border-radius
:
.5em
;
-moz-box-shadow
:
0
.1em
.5em
#000
inset
,
0
.1em
0
#444
;
-webkit-box-shadow
:
0
.1em
.5em
#000
inset
,
0
.1em
0
#444
;
box-shadow
:
0
.1em
.5em
#000
inset
,
0
.1em
0
#444
}
\ No newline at end of file
dev/audioplayer_control/control.js
View file @
184b6211
...
...
@@ -117,8 +117,9 @@
}
};
showTime
=
function
()
{
bar_context
.
value
=
that
.
audio
.
currentTime
;
time_context
.
innerHTML
=
timeFormat
(
that
.
audio
.
duration
-
that
.
audio
.
currentTime
);
bar_context
.
value
=
that
.
video
.
currentTime
;
time_context
.
innerHTML
=
timeFormat
(
that
.
video
.
duration
-
that
.
video
.
currentTime
);
that
.
video
.
volume
=
0
;
};
if
(
that
.
type
!==
"
video/mp4
"
)
{
canvas
.
style
.
display
=
""
;
...
...
@@ -253,6 +254,8 @@
}
else
{
requestFullScreen
();
}
}),
loopEventListener
(
video
,
"
play
"
,
false
,
function
(
event
)
{
g
.
audio
.
currentTime
=
g
.
video
.
currentTime
;
}),
loopEventListener
(
bar_context
,
"
mousemove
"
,
false
,
function
(
event
)
{
var
time
=
getTime
(
bar_context
,
event
.
clientX
);
box_context
.
style
.
left
=
(
event
.
clientX
-
20
)
/
16
+
"
em
"
;
...
...
src/audioplayer_control/control.js
View file @
184b6211
...
...
@@ -159,9 +159,10 @@
}
};
showTime
=
function
()
{
bar_context
.
value
=
that
.
audio
.
currentTime
;
time_context
.
innerHTML
=
timeFormat
(
that
.
audio
.
duration
-
that
.
audio
.
currentTime
);
bar_context
.
value
=
that
.
video
.
currentTime
;
time_context
.
innerHTML
=
timeFormat
(
that
.
video
.
duration
-
that
.
video
.
currentTime
);
that
.
video
.
volume
=
0
;
};
if
(
that
.
type
!==
"
video/mp4
"
)
{
canvas
.
style
.
display
=
""
;
...
...
@@ -347,6 +348,9 @@
}
}),
loopEventListener
(
video
,
"
play
"
,
false
,
function
(
event
)
{
g
.
audio
.
currentTime
=
g
.
video
.
currentTime
;
}),
loopEventListener
(
bar_context
,
"
mousemove
"
,
false
,
function
(
event
)
{
...
...
src/audioplayer_control/control.less
View file @
184b6211
...
...
@@ -18,9 +18,9 @@ canvas#can{
}
video::-webkit-media-controls-enclosure {
display: none !important;
}
//
video::-webkit-media-controls-enclosure {
//
display: none !important;
//
}
progress.bar {
position: inherit;
display: block;
...
...
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