web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2025-07-09 01:15:31 +02:00
Code Releases Activity

@misteroneill enabled and updated videojs-standard and fixed an issue with linting. closes #3508

Browse Source
This commit is contained in:
Pat O'Neill
2016-08-11 18:33:34 -04:00
committed by Gary Katsevman
parent ab82bf0008
commit b3e4e95f9c
6 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -1,6 +1,6 @@
language: node_js language: node_js
node_js: node_js:
- 0.12 - 4.4
before_install: before_install:
- export CHROME_BIN=chromium-browser - export CHROME_BIN=chromium-browser
- export DISPLAY=:99.0 - export DISPLAY=:99.0

1
CHANGELOG.md
View File

@ -10,6 +10,7 @@ CHANGELOG
* greenkeeper updated karma dependencies ([view](https://github.com/videojs/video.js/pull/3523)) * greenkeeper updated karma dependencies ([view](https://github.com/videojs/video.js/pull/3523))
* @BrandonOCasey updated language docs to link to IANA language registry ([view](https://github.com/videojs/video.js/pull/3493)) * @BrandonOCasey updated language docs to link to IANA language registry ([view](https://github.com/videojs/video.js/pull/3493))
* @gkatsev removed unused dependencies ([view](https://github.com/videojs/video.js/pull/3516)) * @gkatsev removed unused dependencies ([view](https://github.com/videojs/video.js/pull/3516))
* @misteroneill enabled and updated videojs-standard and fixed an issue with linting ([view](https://github.com/videojs/video.js/pull/3508))
-------------------- --------------------

1
build/grunt.js
View File

@ -454,6 +454,7 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('gkatsev-grunt-sass'); grunt.loadNpmTasks('gkatsev-grunt-sass');
const buildDependents = [ const buildDependents = [
'shell:lint',
'clean:build', 'clean:build',
'browserify:build', 'browserify:build',

2
package.json
View File

@ -87,7 +87,7 @@
"time-grunt": "^1.1.1", "time-grunt": "^1.1.1",
"uglify-js": "~2.3.6", "uglify-js": "~2.3.6",
"videojs-doc-generator": "0.0.1", "videojs-doc-generator": "0.0.1",
"videojs-standard": "^5.0.0" "videojs-standard": "^5.2.0"
}, },
"vjsstandard": { "vjsstandard": {
"ignore": [ "ignore": [

2
src/js/tech/html5.js
View File

@ -574,7 +574,7 @@ class Html5 extends Tech {
*/ */
supportsFullScreen() { supportsFullScreen() {
if (typeof this.el_.webkitEnterFullScreen === 'function') { if (typeof this.el_.webkitEnterFullScreen === 'function') {
const userAgent = window.navigator && window.navigator.userAgent || ""; const userAgent = window.navigator && window.navigator.userAgent || '';
// Seems to be broken in Chromium/Chrome && Safari in Leopard // Seems to be broken in Chromium/Chrome && Safari in Leopard
if ((/Android/).test(userAgent) || !(/Chrome|Mac OS X 10.5/).test(userAgent)) { if ((/Android/).test(userAgent) || !(/Chrome|Mac OS X 10.5/).test(userAgent)) {

2
src/js/utils/browser.js
View File

@ -4,7 +4,7 @@
import document from 'global/document'; import document from 'global/document';
import window from 'global/window'; import window from 'global/window';
const USER_AGENT = window.navigator && window.navigator.userAgent || ""; const USER_AGENT = window.navigator && window.navigator.userAgent || '';
const webkitVersionMap = (/AppleWebKit\/([\d.]+)/i).exec(USER_AGENT); const webkitVersionMap = (/AppleWebKit\/([\d.]+)/i).exec(USER_AGENT);
const appleWebkitVersion = webkitVersionMap ? parseFloat(webkitVersionMap.pop()) : null; const appleWebkitVersion = webkitVersionMap ? parseFloat(webkitVersionMap.pop()) : null;