Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
OLAT CI-CD Testing Project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor 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
Lars Oliver Dam
OLAT CI-CD Testing Project
Commits
c47ff91b
Commit
c47ff91b
authored
10 years ago
by
srosse
Browse files
Options
Downloads
Patches
Plain Diff
OO-697: only load once mediaelement.js, hack for ie8
parent
7a54f983
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/org/olat/modules/webFeed/ui/podcast/_content/episodes.html
+1
-1
1 addition, 1 deletion
...rg/olat/modules/webFeed/ui/podcast/_content/episodes.html
src/main/webapp/static/movie/player.js
+28
-15
28 additions, 15 deletions
src/main/webapp/static/movie/player.js
with
29 additions
and
16 deletions
src/main/java/org/olat/modules/webFeed/ui/podcast/_content/episodes.html
+
1
−
1
View file @
c47ff91b
...
...
@@ -76,7 +76,7 @@
<script
type=
"text/javascript"
>
/* <![CDATA[ */
#
if
(
$
!
helper
.
getMediaType
(
$episode
.
getEnclosure
())
==
"
video
"
)
BPlayer
.
insertPlayer
(
"
$!helper.getMediaUrl($episode)
"
,
"
o_podcast_episode_$velocityCount
"
,
$
!
helper
.
getWidth
(
$episode
),
$
!
helper
.
getHeight
(
$episode
),
"
video
"
);
BPlayer
.
insertPlayer
(
"
$!helper.getMediaUrl($episode)
"
,
"
o_podcast_episode_$velocityCount
"
,
$
!
helper
.
getWidth
(
$episode
),
$
!
helper
.
getHeight
(
$episode
),
false
,
null
,
"
video
"
);
#
else
BPlayer
.
insertPlayer
(
"
$!helper.getMediaUrl($episode)
"
,
"
o_podcast_episode_$velocityCount
"
,
400
,
24
,
"
sound
"
);
#
end
...
...
This diff is collapsed.
Click to expand it.
src/main/webapp/static/movie/player.js
+
28
−
15
View file @
c47ff91b
...
...
@@ -87,22 +87,34 @@ var BPlayer = {
});
}
}
else
{
jQuery
(
'
<link>
'
)
.
appendTo
(
'
head
'
)
.
attr
({
type
:
'
text/css
'
,
rel
:
'
stylesheet
'
})
.
attr
(
'
href
'
,
mediaElementBaseUrl
+
'
mediaelementplayer.min.css
'
);
var
realDomId
;
if
(
jQuery
(
'
#mediaelementplayercss
'
).
length
==
0
)
{
jQuery
(
'
<link>
'
)
.
appendTo
(
'
head
'
)
.
attr
({
id
:
'
mediaelementplayercss
'
,
type
:
'
text/css
'
,
rel
:
'
stylesheet
'
})
.
attr
(
'
href
'
,
mediaElementBaseUrl
+
'
mediaelementplayer.min.css
'
);
}
if
(
BPlayer
.
isIE8
())
{
jQuery
(
'
<script></script>
'
)
.
appendTo
(
'
head
'
)
.
attr
({
type
:
'
text/javascript
'
})
.
attr
(
'
src
'
,
mediaElementBaseUrl
+
'
mediaelement-and-player.min.js
'
);
BPlayer
.
insertHTML5MediaElementPlayerWorker
(
domId
,
args
);
.
appendTo
(
'
head
'
)
.
attr
({
type
:
'
text/javascript
'
})
.
attr
(
'
src
'
,
mediaElementBaseUrl
+
'
mediaelement-and-player.min.js
'
);
setTimeout
(
function
()
{
BPlayer
.
insertHTML5MediaElementPlayerWorker
(
domId
,
args
);
},
700
)
}
else
{
jQuery
.
getScript
(
mediaElementBaseUrl
+
'
mediaelement
-and-
player
.min.js
'
,
function
(
)
{
if
(
typeof
jQuery
(
'
body
'
).
mediaelementplayer
!=
'
undefined
'
)
{
BPlayer
.
insertHTML5MediaElementPlayerWorker
(
domId
,
args
);
});
}
else
{
jQuery
.
ajax
({
dataType
:
'
script
'
,
cache
:
true
,
async
:
false
,
//prevent 2x load of the mediaelement.js which is deadly
url
:
mediaElementBaseUrl
+
'
mediaelement-and-player.min.js
'
}).
done
(
function
()
{
BPlayer
.
insertHTML5MediaElementPlayerWorker
(
domId
,
args
);
});
}
}
}
},
...
...
@@ -125,6 +137,7 @@ var BPlayer = {
flashName
:
'
flashmediaelement.swf
'
,
silverlightName
:
'
silverlightmediaelement.xap
'
,
loop
:
config
.
repeat
,
pauseOtherPlayers
:
true
,
success
:
function
(
mediaElement
,
originalNode
,
player
)
{
if
(
config
.
autostart
)
{
try
{
...
...
@@ -202,11 +215,11 @@ var BPlayer = {
if
(
config
.
width
)
{
meConfig
.
audioWidth
=
config
.
width
;
}
content
=
"
<audio id='
"
+
domId
+
"
_vid
eo
' controls='controls' preload='none'>
"
;
content
=
"
<audio id='
"
+
domId
+
"
_
oo
vid' controls='controls' preload='none'>
"
;
content
+=
"
<source type='
"
+
mimeType
+
"
' src='
"
+
config
.
file
+
"
' /></audio>
"
;
}
else
{
//controls are mandatory for Safari at least
content
=
"
<video id='
"
+
domId
+
"
_vid
eo
' controls='controls' preload='none'
"
;
content
=
"
<video id='
"
+
domId
+
"
_
oo
vid' controls='controls' preload='none'
"
;
if
(
config
.
height
)
{
content
+=
"
height='
"
+
config
.
height
+
"
'
"
;
meConfig
.
videoHeight
=
config
.
height
;
...
...
@@ -222,7 +235,7 @@ var BPlayer = {
}
jQuery
(
'
#
'
+
domId
).
html
(
content
);
jQuery
(
'
#
'
+
domId
+
'
_vid
eo
'
).
mediaelementplayer
(
meConfig
);
jQuery
(
'
#
'
+
domId
+
'
_
oo
vid
'
).
mediaelementplayer
(
meConfig
);
},
mediaElementBaseUrl
:
function
()
{
...
...
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