Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use videojs-standard 5.2 and fix two errors #3508

Closed
wants to merge 4 commits into from
Closed

Use videojs-standard 5.2 and fix two errors #3508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5a8845b
Use videojs-standard 5.2 and fix two errors
misteroneill Aug 8, 2016
55719f8
Lint on build.
misteroneill Aug 8, 2016
111127a
Use Node 4 on Travis
misteroneill Aug 8, 2016
ed3285f
Don't lint on dist build
misteroneill Aug 8, 2016
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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: node_js
node_js:
- 0.12
- 4.4
before_install:
- export CHROME_BIN=chromium-browser
- export DISPLAY=:99.0
Expand Down
1 change: 1 addition & 0 deletions build/grunt.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,7 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('gkatsev-grunt-sass');

const buildDependents = [
'shell:lint',
'clean:build',

'browserify:build',
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
"time-grunt": "^1.1.1",
"uglify-js": "~2.3.6",
"videojs-doc-generator": "0.0.1",
"videojs-standard": "^5.0.0"
"videojs-standard": "^5.2.0"
},
"vjsstandard": {
"ignore": [
Expand Down
2 changes: 1 addition & 1 deletion src/js/tech/html5.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ class Html5 extends Tech {
*/
supportsFullScreen() {
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
if ((/Android/).test(userAgent) || !(/Chrome|Mac OS X 10.5/).test(userAgent)) {
Expand Down
2 changes: 1 addition & 1 deletion src/js/utils/browser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import document from 'global/document';
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 appleWebkitVersion = webkitVersionMap ? parseFloat(webkitVersionMap.pop()) : null;

Expand Down