forked from seanbehan/videojs_rails
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request seanbehan#4 from grzlus/master
Update to 4.1.0
- Loading branch information
Showing
16 changed files
with
6,868 additions
and
2,349 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,16 @@ | ||
<!-- Begin VideoJS --> | ||
<div class="video-js-box"> | ||
<!-- Using the Video for Everybody Embed Code http://camendesign.com/code/video_for_everybody --> | ||
<video id="<%=@options[:id]%>" class="<%= @options[:classes] %> video-js" width="<%=@options[:width]%>" height="<%=@options[:height]%>" controls="controls" preload="auto"> | ||
<video id="<%=@options[:id]%>" class="<%= @options[:classes] %> video-js vjs-default-skin" controls preload="auto" width="<%=@options[:width]%>" height="<%=@options[:height]%>" poster="<%= @options[:poster] %>" data-setup="{}"> | ||
<% if @options[:sources] %> | ||
<%- @options[:sources].each do |type, source| %> | ||
<source src="<%= source %>" type='video/<%= type %>' /> | ||
<%- end %> | ||
<%- end %> | ||
|
||
<source src="<%=@options[:source]%>" type='video/mp4; codecs="avc1.42E01E, mp4a.40.2"' /> | ||
|
||
<!-- Flash Fallback. Use any flash video player here. Make sure to keep the vjs-flash-fallback class. --> | ||
<object id="flash_fallback_1" class="vjs-flash-fallback" width="<%=@options[:width]%>" height="<%=@options[:height]%>" type="application/x-shockwave-flash" data="http://releases.flowplayer.org/swf/flowplayer-3.2.1.swf"> | ||
<param name="movie" value="http://releases.flowplayer.org/swf/flowplayer-3.2.1.swf" /> | ||
<param name="allowfullscreen" value="true" /> | ||
<param name="flashvars" value='config={"playlist":["<%=@options[:poster]%>", {"url": "<%=@options[:source]%>","autoPlay":false,"autoBuffering":true}]}' /> | ||
|
||
<!-- Image Fallback. Typically the same as the poster image. --> | ||
<img src="<%=@options[:poster]%>" width="<%=@options[:width]%>" height="<%=@options[:height]%>" alt="" title="" /> | ||
</object> | ||
<%# TODO: Add some function to change ISO country code to name %> | ||
<% if @options[:captions] %> | ||
<%- @options[:captions].each do |lang, caption| %> | ||
<track kind="captions" src="<%= caption %>" srclang="<%= lang %>" label="<%= lang %>"></track> | ||
<%- end %> | ||
<%- end %> | ||
</video> | ||
|
||
<!-- Download links provided for devices that can't play video in the browser. --> | ||
<p class="vjs-no-video"><a href="<%=@options[:source]%>">download</a> </p> | ||
</div> | ||
<!-- End VideoJS --> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
module VideojsRails | ||
VERSION = "0.0.1" | ||
VERSION = "4.1.0" | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.