Skip to content

Commit

Permalink
Update to new more modern buildstreet
Browse files Browse the repository at this point in the history
  • Loading branch information
hartman committed May 17, 2019
1 parent d62639e commit 850f854
Show file tree
Hide file tree
Showing 24 changed files with 10,360 additions and 552 deletions.
8 changes: 0 additions & 8 deletions .babelrc

This file was deleted.

6 changes: 2 additions & 4 deletions .gitignore
Expand Up @@ -25,11 +25,9 @@ npm-debug.log*
bower_components/
node_modules/

# Yeoman meta-data
.yo-rc.json

# Build-related directories
dist/
docs/api/
es5/
test/dist/
.eslintcache
.yo-rc.json
1 change: 1 addition & 0 deletions .nvmrc
@@ -0,0 +1 @@
lts/*
27 changes: 12 additions & 15 deletions .travis.yml
@@ -1,18 +1,15 @@
sudo: true
dist: xenial
language: node_js
dist: trusty
node_js:
- 'stable'

# Set up a virtual screen for Chrome and Firefox.
# node version is specified using the .nvmrc file
cache: npm
before_install:
- npm install -g greenkeeper-lockfile@1
before_script:
- export CHROME_BIN=/usr/bin/google-chrome
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start

- greenkeeper-lockfile-update
after_script:
- greenkeeper-lockfile-upload
addons:
apt:
sources:
- google-chrome
packages:
- google-chrome-stable
firefox: latest
chrome: stable
services:
- xvfb
1 change: 0 additions & 1 deletion CHANGELOG.md
@@ -1 +0,0 @@
# CHANGELOG
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Expand Up @@ -4,15 +4,15 @@ We welcome contributions from everyone!

## Getting Started

Make sure you have NodeJS 0.10 or higher and npm installed.
Make sure you have Node.js 8 or higher and npm installed.

1. Fork this repository and clone your fork
1. Install dependencies: `npm install`
1. Run a development server: `npm start`

### Making Changes

Refer to the [video.js plugin standards][standards] for more detail on best practices and tooling for video.js plugin authorship.
Refer to the [video.js plugin conventions][conventions] for more detail on best practices and tooling for video.js plugin authorship.

When you've made your changes, push your commit(s) to your fork and issue a pull request against the original repository.

Expand All @@ -27,4 +27,4 @@ Testing is a crucial part of any software project. For all but the most trivial

[karma]: http://karma-runner.github.io/
[local]: http://localhost:9999/test/
[standards]: https://github.com/videojs/generator-videojs-plugin/docs/standards.md
[conventions]: https://github.com/videojs/generator-videojs-plugin/blob/master/docs/conventions.md
2 changes: 1 addition & 1 deletion LICENSE
@@ -1,4 +1,4 @@
Copyright (c) 2015 Derk-Jan Hartman
Copyright (c) Derk-Jan Hartman <hartman.wiki@gmail.com>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
60 changes: 53 additions & 7 deletions README.md
@@ -1,17 +1,63 @@
# videojs-ogvjs

[![Current version](https://img.shields.io/npm/v/videojs-ogvjs.svg)](https://www.npmjs.com/package/videojs-ogvjs) [![Dependencies](https://img.shields.io/versioneye/d/nodejs/videojs-ogvjs.svg)](https://www.versioneye.com/nodejs/videojs-ogvjs) [![Build Status](https://travis-ci.org/hartman/videojs-ogvjs.svg?branch=master)](https://travis-ci.org/hartman/videojs-ogvjs)
A Video.js Tech plugin for Ogv.js

A [Video.js](https://www.videojs.com) Tech plugin for [Ogv.js](https://github.com/brion/ogv.js/).
## Installation

With this module, you can playback Ogg Vorbis/Theora file with the VideoJS player on browsers that do not support this format, like Safari and Internet Explorer.
```sh
npm install --save videojs-ogvjs
```

Many thanks to the great work of the Video.js developers and to Brion Vibber for his relentless efforts to bring unencumbered video to the entire world.
## Usage

## Demo
To include videojs-ogvjs on your website or web application, use any of the following methods.

Try out [the demo](https://cdn.rawgit.com/hartman/videojs-ogvjs/v1.1.2/example.html) !!
### `<script>` Tag

This is the simplest case. Get the script in whatever way you prefer and include the plugin _after_ you include [video.js][videojs], so that the `videojs` global is available.

```html
<script src="//path/to/video.min.js"></script>
<script src="//path/to/videojs-ogvjs.min.js"></script>
<script>
var player = videojs('my-video');
player.ogvjs();
</script>
```

### Browserify/CommonJS

When using with Browserify, install videojs-ogvjs via npm and `require` the plugin as you would any other module.

```js
var videojs = require('video.js');

// The actual plugin function is exported by this module, but it is also
// attached to the `Player.prototype`; so, there is no need to assign it
// to a variable.
require('videojs-ogvjs');

var player = videojs('my-video');

player.ogvjs();
```

### RequireJS/AMD

When using with RequireJS (or another AMD library), get the script in whatever way you prefer and `require` the plugin as you normally would:

```js
require(['video.js', 'videojs-ogvjs'], function(videojs) {
var player = videojs('my-video');

player.ogvjs();
});
```

## License

MIT and Apache-2.0
MIT. Copyright (c) Derk-Jan Hartman &lt;hartman.wiki@gmail.com&gt;


[videojs]: http://videojs.com/
14 changes: 0 additions & 14 deletions bower.json

This file was deleted.

26 changes: 0 additions & 26 deletions example.html

This file was deleted.

12 changes: 5 additions & 7 deletions index.html
Expand Up @@ -3,20 +3,18 @@
<head>
<meta charset="utf-8">
<title>videojs-ogvjs Demo</title>
<link href="/node_modules/video.js/dist/video-js.css" rel="stylesheet">
<link href="node_modules/video.js/dist/video-js.css" rel="stylesheet">

</head>
<body>
<video id="videojs-ogvjs-player" class="video-js vjs-default-skin" poster="https://upload.wikimedia.org/wikipedia/commons/thumb/9/94/Folgers.ogv/352px--Folgers.ogv.jpg" controls preload="none" width="352" height="264" crossorigin>
<source src="https://upload.wikimedia.org/wikipedia/commons/9/94/Folgers.ogv" type='video/ogg; codecs=&quot;theora, vorbis&quot;'>
</video>
<ul>
<li><a href="/test/">Run unit tests in browser.</a></li>
<li><a href="/test/debug.html">Run unit tests in browser.</a></li>
</ul>
The above video is an Instant Folgers commercial and free from copyright restrictions, as it is in the <a href="https://archive.org/details/FolgersCoffe">Public Domain</a>. Video hosted by <a href="https://commons.wikimedia.org/wiki/File:Folgers.ogv">Wikimedia Commons</a>.
<script src="/node_modules/video.js/dist/video.js"></script>
<script src="/node_modules/ogv/dist/ogv-support.js"></script>
<script src="/node_modules/ogv/dist/ogv.js"></script>
<script src="/dist/videojs-ogvjs.js"></script>
<script src="node_modules/video.js/dist/video.js"></script>
<script src="dist/videojs-ogvjs.js"></script>
<script>
(function(window, videojs) {
var player = videojs('videojs-ogvjs-player', {
Expand Down

2 comments on commit 850f854

@bvibber
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So far so good; one thing I noticed is the way it's bundling ogv.js into the demo, the code ends being run in strict mode even where it wasn't originally defined that way. This causes a failure in IE with the Flash-based audio path, where some old legacy code was doing a trick with arguments.callee which throws in strict mode; this bit wasn't needed so I'm removing it upstream.

@hartman
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The other thing that i'm running into a little bit with this version + ogv + RL module is the dynamic loading of ogv via ogvsupport + globals etc..

I even tried wrapping everything inside a webpack module, but the mixing of all the environments has me a bit flabbergasted honestly.

Please sign in to comment.