Skip to content
This repository has been archived by the owner on Feb 13, 2019. It is now read-only.

VideoJS 5 Support #87

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

VideoJS 5 Support #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1645ff7
updated events to match that of the branch of , also removed method…
alex-phillips Nov 20, 2015
b22437a
updated all example and test code for version 5
alex-phillips Nov 20, 2015
1d72278
readded methods for checking support
alex-phillips Nov 20, 2015
ef6afd4
updated spec file for videojs 5 API
alex-phillips Nov 20, 2015
dd204d2
updated package versions
alex-phillips Dec 10, 2015
77b6b0a
updated videojs path with location of new version
alex-phillips Dec 10, 2015
a1562e9
updated to adhere to new videojs 5 event names
alex-phillips Dec 10, 2015
e8c9f37
added support for using skip delay from vast ad
alex-phillips Dec 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
"lib"
],
"dependencies": {
"videojs": "4.4.3",
"videojs": "5.4.3",
"vast-client-js": "http://github.com/theonion/vast-client-js.git#a0529f00c96f5961c08ab0011df19fd124828e87",
"videojs-contrib-ads": "0.5.0"
"videojs-contrib-ads": "3.1.1"
}
}
4 changes: 2 additions & 2 deletions example.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8" />
<title>Video.js VAST Example</title>

<link href="http://vjs.zencdn.net/4.7.1/video-js.css" rel="stylesheet">
<link href="http://vjs.zencdn.net/5.2.1/video-js.css" rel="stylesheet">
<link href="lib/videojs-contrib-ads/videojs.ads.css" rel="stylesheet" type="text/css">
<link href="videojs.vast.css" rel="stylesheet" type="text/css">

Expand All @@ -22,7 +22,7 @@
}
</style>
<!--[if lt IE 9]><script src="lib/es5.js"></script><![endif]-->
<script src="http://vjs.zencdn.net/4.7.1/video.js"></script>
<script src="http://vjs.zencdn.net/5.2.1/video.js"></script>
<script src="lib/videojs-contrib-ads/videojs.ads.js"></script>

<script src="lib/vast-client.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module.exports = function(config) {

files: [
'bower_components/vast-client-js/vast-client.js',
'bower_components/videojs/dist/video-js/video.js',
'bower_components/videojs/dist/video.js',
'bower_components/videojs-contrib-ads/src/videojs.ads.js',
'videojs.vast.js',
'spec/VastPluginSpec.js'
Expand All @@ -30,4 +30,4 @@ module.exports = function(config) {
config.singleRun = true;
config.autoWatch = false;
}
};
};
Loading