mozilla
/
popcorn-js
зеркало из https://github.com/mozilla/popcorn-js.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[#915] Removed support for Soundcloud and Vimeo in the interim

This commit is contained in:
Matthew Schranz 2012-05-31 11:52:42 -04:00
Родитель 825dddb064
Коммит 0de1ccde52
2 изменённых файлов: 9 добавлений и 22 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

22
plugins/mediaspawner/popcorn.mediaspawner.html
Просмотреть файл

@ -14,22 +14,6 @@
.mediaspawner({
source: "http://www.youtube.com/watch?v=CXDstfD9eJ0",
target: "mediaspawnerdiv",
start: 11,
end: 20,
caption: "This is a test. We are assuming control. We are assuming control.<br/>",
autoplay: true
})
.mediaspawner({
source: "http://player.vimeo.com/video/6960892",
target: "mediaspawnerdiv",
start: 41,
end: 50,
caption: "This is a test. We are assuming control. We are assuming control.<br/>",
autoplay: true
})
.mediaspawner({
source: "http://soundcloud.com/rhymesayers/brother-ali-us",
target: "mediaspawnerdiv",
start: 1,
end: 10,
caption: "This is a test. We are assuming control. We are assuming control.<br/>",
@ -41,8 +25,8 @@
"../../test/trailer.mp4"
],
target: "mediaspawnerdiv",
start: 31,
end: 40,
start: 11,
end: 20,
caption: "This is a test. We are assuming control. We are assuming control.<br/>",
autoplay: true
})
@ -64,7 +48,7 @@
</head>
<body>
<h1 id="qunit-header">Popcorn Media Spawner Plug-in Demo</h1>
<p>All types of media spawner media types are shown below the video. This includes youtube, vimeo, HTML5 Video and Audio.</p>
<p>All types of media spawner media types are shown below the video. This includes youtube, HTML5 Video and Audio.</p>
<div>
<video id="video"

9
plugins/mediaspawner/popcorn.mediaspawner.js
Просмотреть файл

@ -84,7 +84,7 @@
mediaType,
container,
regexResult;
Popcorn.plugin.debug = true;
// Check if mediaSource is passed and mediaType is NOT audio/video
if ( !options.source ) {
Popcorn.error( "Error. Source must be specified." );
@ -116,6 +116,10 @@ Popcorn.plugin.debug = true;
mediaType = "object";
}
if ( mediaType === "vimeo" || mediaType === "soundcloud" ) {
Popcorn.error( "Vimeo and soundcloud are currently not supported by the MediaSpawner Plugin." );
}
// Store Reference to Type for use in end
options.type = mediaType;
@ -182,8 +186,7 @@ Popcorn.plugin.debug = true;
options._container.style.display = "none";
}
// The Flash Players automagically pause themselves on end already but because these videos we create
// aren't tied directly to Popcorn instances we have to manually retrieve them ourselves
// The Flash Players automagically pause themselves on end already
if ( options.type === "object" ) {
options.popcorn.pause();
}