Skip to content

Commit c628473

Browse files
misteroneillmisteroneill
committed
Apply generator-videojs-plugin conventions
1 parent 7f51875 commit c628473

31 files changed

+1173
-908
lines changed

‎.editorconfig

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
root = true
33

44
[*]
5+
charset = utf-8
6+
end_of_line = lf
57
indent_style = space
68
indent_size = 2
7-
end_of_line = lf
8-
charset = utf-8
9-
trim_trailing_whitespace = true
109
insert_final_newline = true
10+
trim_trailing_whitespace = true
1111

1212
[*.md]
1313
trim_trailing_whitespace = false

‎.gitignore

+31-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,35 @@
1+
# OS
2+
Thumbs.db
3+
ehthumbs.db
4+
Desktop.ini
15
.DS_Store
6+
._*
7+
8+
# Editors
9+
*~
10+
*.swp
11+
*.tmproj
12+
*.tmproject
13+
*.sublime-*
14+
.idea/
15+
.project/
16+
.settings/
17+
.vscode/
18+
19+
# Logs
20+
logs
221
*.log
22+
npm-debug.log*
23+
24+
# Dependency directories
25+
bower_components/
326
node_modules/
27+
28+
# Yeoman meta-data
29+
.yo-rc.json
30+
31+
# Build-related directories
432
dist/
5-
*~
33+
dist-test/
34+
docs/api/
35+
es5/

‎.jshintrc

-11
This file was deleted.

‎.npmignore

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
dist/
2-
test/
3-
*~
1+
!dist/
2+
!dist-test/
3+
!docs/
4+
!es5/

‎.travis.yml

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
1+
sudo: false
12
language: node_js
23
node_js:
3-
- '0.10'
4+
- 'node'
5+
- '4.2'
6+
- '0.12'
7+
- '0.10'
48

9+
# Set up a virtual screen for Firefox.
510
before_script:
6-
- npm install -g grunt-cli
11+
- export DISPLAY=:99.0
12+
- sh -e /etc/init.d/xvfb start

‎CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# CHANGELOG
2+
3+
- 0.1.0: Initial release

‎CONTRIBUTING.md

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# CONTRIBUTING

‎Gruntfile.js

-84
This file was deleted.

‎LICENSE-Apache-2.0 ‎LICENSE

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2013 Brightcove
1+
Copyright 2015 Brightcove, Inc.
22

33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.
@@ -10,4 +10,4 @@ Unless required by applicable law or agreed to in writing, software
1010
distributed under the License is distributed on an "AS IS" BASIS,
1111
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
See the License for the specific language governing permissions and
13-
limitations under the License.
13+
limitations under the License.

‎README.md

-4
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,3 @@ player.overlay({
7171
}]
7272
});
7373
```
74-
75-
## Release History
76-
77-
- 0.1.0: Initial release

‎bower.json

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"name": "videojs-overlay",
3+
"version": "0.1.1",
4+
"author": "Brightcove, Inc.",
5+
"license": "Apache-2.0",
6+
"main": [
7+
"dist/videojs-overlay.css",
8+
"dist/videojs-overlay.min.js"
9+
],
10+
"keywords": [
11+
"videojs",
12+
"videojs-plugin"
13+
]
14+
}
15+

‎example.html

-62
This file was deleted.

‎index.html

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<!doctype html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8">
5+
<title>videojs-overlay Demo</title>
6+
<link href="/node_modules/video.js/dist/video-js.css" rel="stylesheet">
7+
<link href="/dist/videojs-overlay.css" rel="stylesheet">
8+
</head>
9+
<body>
10+
<video id="videojs-overlay-player" class="video-js vjs-default-skin" controls>
11+
<source src="//vjs.zencdn.net/v/oceans.mp4" type='video/mp4'>
12+
<source src="//vjs.zencdn.net/v/oceans.webm" type='video/webm'>
13+
</video>
14+
<ul>
15+
<li><a href="/test/">Run unit tests in browser.</a></li>
16+
</ul>
17+
<script src="/node_modules/video.js/dist/video.js"></script>
18+
<script src="/dist/videojs-overlay.js"></script>
19+
<script>
20+
(function(window, videojs) {
21+
var player = window.player = videojs('videojs-overlay-player');
22+
player.overlay({
23+
content: '<strong>Default overlay content</strong>',
24+
overlays: [{
25+
content: 'An event-triggered overlay',
26+
start: 'play',
27+
end: 'pause'
28+
}, {
29+
start: 5,
30+
end: 10,
31+
align: 'bottom-right'
32+
}]
33+
});
34+
}(window, window.videojs));
35+
</script>
36+
</body>
37+
</html>

‎lib/videojs-overlay.css

-57
This file was deleted.

0 commit comments

Comments
 (0)