@misteroneill enabled and updated videojs-standard and fixed an issue…

… with linting. closes #3508
videojs · Aug 11, 2016 · b3e4e95 · b3e4e95
1 parent ab82bf0
commit b3e4e95
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - 0.12
+  - 4.4
 before_install:
   - export CHROME_BIN=chromium-browser
   - export DISPLAY=:99.0

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ CHANGELOG
 * 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))
 * @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))
 
 --------------------
 

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

diff --git a/package.json b/package.json
@@ -87,7 +87,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": [

diff --git a/src/js/tech/html5.js b/src/js/tech/html5.js
@@ -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)) {

diff --git a/src/js/utils/browser.js b/src/js/utils/browser.js
@@ -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;