Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
4763a6a2
Commit
4763a6a2
authored
May 24, 2012
by
Edward Wang
Committed by
Jean-Baptiste Kempf
May 25, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
luahttp: Don't interfere with seek slider either
Ref #6652 Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
e91edd90
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
5 deletions
+12
-5
share/lua/http/js/controlers.js
share/lua/http/js/controlers.js
+5
-3
share/lua/http/js/ui.js
share/lua/http/js/ui.js
+7
-2
No files found.
share/lua/http/js/controlers.js
View file @
4763a6a2
...
@@ -17,9 +17,11 @@ function updateStatus() {
...
@@ -17,9 +17,11 @@ function updateStatus() {
$
(
'
#mediaTitle
'
).
append
(
$
(
'
[name="filename"]
'
,
data
).
text
());
$
(
'
#mediaTitle
'
).
append
(
$
(
'
[name="filename"]
'
,
data
).
text
());
$
(
'
#totalTime
'
).
append
(
format_time
(
$
(
'
length
'
,
data
).
text
()));
$
(
'
#totalTime
'
).
append
(
format_time
(
$
(
'
length
'
,
data
).
text
()));
$
(
'
#currentTime
'
).
append
(
format_time
(
$
(
'
time
'
,
data
).
text
()));
$
(
'
#currentTime
'
).
append
(
format_time
(
$
(
'
time
'
,
data
).
text
()));
$
(
'
#seekSlider
'
).
slider
({
if
(
!
$
(
'
#seekSlider
'
).
data
(
'
clicked
'
))
{
value
:
toFloat
(
$
(
'
position
'
,
data
).
text
())
*
100
$
(
'
#seekSlider
'
).
slider
({
});
value
:
toFloat
(
$
(
'
position
'
,
data
).
text
())
*
100
});
}
$
(
'
#currentVolume
'
).
append
(
Math
.
round
(
$
(
'
volume
'
,
data
).
text
()
/
2.56
)
+
'
%
'
);
$
(
'
#currentVolume
'
).
append
(
Math
.
round
(
$
(
'
volume
'
,
data
).
text
()
/
2.56
)
+
'
%
'
);
/* Don't interfere with the user's action */
/* Don't interfere with the user's action */
if
(
!
$
(
'
#volumeSlider
'
).
data
(
'
clicked
'
))
{
if
(
!
$
(
'
#volumeSlider
'
).
data
(
'
clicked
'
))
{
...
...
share/lua/http/js/ui.js
View file @
4763a6a2
...
@@ -4,6 +4,9 @@ $(function () {
...
@@ -4,6 +4,9 @@ $(function () {
value
:
0
,
value
:
0
,
min
:
0
,
min
:
0
,
max
:
100
,
max
:
100
,
start
:
function
(
event
,
ui
)
{
$
(
"
#seekSlider
"
).
data
(
'
clicked
'
,
true
);
},
stop
:
function
(
event
,
ui
)
{
stop
:
function
(
event
,
ui
)
{
$
(
"
#currentTime
"
).
empty
().
append
(
format_time
(
Math
.
round
((
ui
.
value
/
100
)
*
$
(
'
#seekSlider
'
).
attr
(
'
totalLength
'
))));
$
(
"
#currentTime
"
).
empty
().
append
(
format_time
(
Math
.
round
((
ui
.
value
/
100
)
*
$
(
'
#seekSlider
'
).
attr
(
'
totalLength
'
))));
switch
(
current_que
)
{
switch
(
current_que
)
{
...
@@ -17,6 +20,7 @@ $(function () {
...
@@ -17,6 +20,7 @@ $(function () {
sendVLMCmd
(
'
control Current seek
'
+
ui
.
value
);
sendVLMCmd
(
'
control Current seek
'
+
ui
.
value
);
break
;
break
;
}
}
$
(
"
#seekSlider
"
).
data
(
'
clicked
'
,
false
);
}
}
});
});
$
(
"
#volumeSlider
"
).
slider
({
$
(
"
#volumeSlider
"
).
slider
({
...
@@ -36,8 +40,9 @@ $(function () {
...
@@ -36,8 +40,9 @@ $(function () {
$
(
"
#volumeSlider
"
).
data
(
'
clicked
'
,
false
);
$
(
"
#volumeSlider
"
).
data
(
'
clicked
'
,
false
);
}
}
});
});
/* To ensure that updateStatus() doesn't interfere while use is
/* To ensure that updateStatus() doesn't interfere while the user
* sliding on the control. */
* slides the controls. */
$
(
"
#seekSlider
"
).
data
(
'
clicked
'
,
false
);
$
(
"
#volumeSlider
"
).
data
(
'
clicked
'
,
false
);
$
(
"
#volumeSlider
"
).
data
(
'
clicked
'
,
false
);
$
(
'
#buttonStop
'
).
click
(
function
()
{
$
(
'
#buttonStop
'
).
click
(
function
()
{
switch
(
current_que
)
{
switch
(
current_que
)
{
...
...
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