Skip to content

Commit 4ac2452

Browse files
brandonocaseygkatsev
authored andcommitted
chore: update to generator v6 (#63)
1 parent 48afd13 commit 4ac2452

20 files changed

+8908
-2415
lines changed

.github/ISSUE_TEMPLATE.md

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
## Description
2+
Briefly describe the issue.
3+
Include a [reduced test case](https://css-tricks.com/reduced-test-cases/).
4+
5+
## Steps to reproduce
6+
Explain in detail the exact steps necessary to reproduce the issue.
7+
8+
1.
9+
2.
10+
3.
11+
12+
## Results
13+
### Expected
14+
Please describe what you expected to see.
15+
16+
### Actual
17+
Please describe what actually happened.
18+
19+
### Error output
20+
If there are any errors at all, please include them here.
21+
22+
## Additional Information
23+
Please include any additional information necessary here. Including the following:
24+
25+
### versions
26+
#### videojs
27+
what version of videojs does this occur with?
28+
29+
#### browsers
30+
what browser are affected?
31+
32+
#### OSes
33+
what platforms (operating systems and devices) are affected?
34+
35+
### plugins
36+
are any videojs plugins being used on the page? If so, please list them below.

.github/PULL_REQUEST_TEMPLATE.md

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
## Description
2+
Please describe the change as necessary.
3+
If it's a feature or enhancement please be as detailed as possible.
4+
If it's a bug fix, please link the issue that it fixes or describe the bug in as much detail.
5+
6+
## Specific Changes proposed
7+
Please list the specific changes involved in this pull request.
8+
9+
## Requirements Checklist
10+
- [ ] Feature implemented / Bug fixed
11+
- [ ] If necessary, more likely in a feature request than a bug fix
12+
- [ ] Unit Tests updated or fixed
13+
- [ ] Docs/guides updated
14+
- [ ] Reviewed by Two Core Contributors

.gitignore

-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ npm-debug.log*
2525
bower_components/
2626
node_modules/
2727

28-
# Yeoman meta-data
29-
.yo-rc.json
30-
3128
# Build-related directories
3229
dist/
3330
docs/api/

.nvmrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
lts/*

.travis.yml

+7-19
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,20 @@ sudo: false
22
dist: trusty
33
language: node_js
44
node_js:
5-
- 'node'
6-
- 'lts/argon'
5+
- 'lts/*'
6+
before_install:
7+
- npm install -g greenkeeper-lockfile@1
78
before_script:
8-
9-
# Check if the current version is equal to the major version for the env.
10-
- 'export IS_INSTALLED="$(npm list video.js | grep "video.js@$VJS")"'
11-
12-
# We have to add semicolons to the end of each line in the if as Travis runs
13-
# this all on one line.
14-
- 'if [ -z "$IS_INSTALLED" ]; then
15-
echo "INSTALLING video.js@>=$VJS.0.0-RC.0 <$(($VJS+1)).0.0";
16-
npm i "video.js@>=$VJS.0.0-RC.0 <\$(($VJS+1)).0.0";
17-
else
18-
echo "video.js@$VJS ALREADY INSTALLED";
19-
fi'
209
- export CHROME_BIN=/usr/bin/google-chrome
2110
- export DISPLAY=:99.0
2211
- sh -e /etc/init.d/xvfb start
23-
env:
24-
- VJS=5
25-
- VJS=6
12+
- greenkeeper-lockfile-update
13+
after_script: greenkeeper-lockfile-upload
2614
addons:
27-
# Commented out until Firefox works on Travis/with Karma again.
28-
# firefox: latest
15+
firefox: latest
2916
apt:
3017
sources:
3118
- google-chrome
3219
packages:
3320
- google-chrome-stable
21+

.yo-rc.json

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"generator-videojs-plugin": {
3+
"scope": "",
4+
"name": "overlay",
5+
"description": "A plugin to display simple overlays during video playback.",
6+
"author": "Brightcove, Inc.",
7+
"license": "apache2",
8+
"sass": true,
9+
"ie8": true,
10+
"docs": true,
11+
"lang": false,
12+
"husky": "lint",
13+
"pluginType": "advanced",
14+
"css": true
15+
}
16+
}

README.md

+25-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,35 @@
1-
# Video.js Overlay
1+
# videojs-overlay
22

33
[![Build Status](https://travis-ci.org/brightcove/videojs-overlay.svg?branch=master)](https://travis-ci.org/brightcove/videojs-overlay)
4+
[![Greenkeeper badge](https://badges.greenkeeper.io/brightcove/videojs-overlay.svg)](https://greenkeeper.io/)
5+
[![Slack Status](http://slack.videojs.com/badge.svg)](http://slack.videojs.com)
6+
7+
[![NPM](https://nodei.co/npm/videojs-overlay.png?downloads=true&downloadRank=true)](https://nodei.co/npm/videojs-overlay/)
48

59
A plugin to display simple overlays - similar to YouTube's "Annotations" feature in appearance - during video playback.
610

711
_Note_: This meaning of an "overlay" is distinct from that of a modal dialog, which can overlay the entire player. This is built into video.js as [the `ModalDialog` component](http://docs.videojs.com/docs/api/modal-dialog.html).
812

13+
Maintenance Status: Stable
14+
15+
<!-- START doctoc generated TOC please keep comment here to allow auto update -->
16+
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
17+
18+
19+
- [Getting Started](#getting-started)
20+
- [Documentation](#documentation)
21+
- [Plugin Options](#plugin-options)
22+
- [`align`](#align)
23+
- [`showBackground`](#showbackground)
24+
- [`attachToControlBar`](#attachtocontrolbar)
25+
- [`class`](#class)
26+
- [`content`](#content)
27+
- [`overlays`](#overlays)
28+
- [Examples](#examples)
29+
30+
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
31+
32+
933
## Getting Started
1034

1135
Once you've added the plugin script to your page, you can use it with any video:

index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<source src="//vjs.zencdn.net/v/oceans.webm" type='video/webm'>
1313
</video>
1414
<ul>
15-
<li><a href="test/">Run unit tests in browser.</a></li>
15+
<li><a href="test/debug.html">Run unit tests in browser.</a></li>
1616
</ul>
1717
<script src="node_modules/video.js/dist/video.js"></script>
1818
<script src="dist/videojs-overlay.js"></script>

0 commit comments

Comments
 (0)