Merge pull request #1976 from mmcc/es6ification

ES6ification
videojs · Apr 4, 2015 · 6e29bcc · 6e29bcc
2 parents c9b53c5 + f3036dd
commit 6e29bcc
Show file tree

Hide file tree

Showing 103 changed files with 3,688 additions and 3,798 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 .DS_Store
 dist/*
 build/files/*
+build/temp/*
 docs/api/*
 dev.html
 projects
@@ -22,3 +23,6 @@ sandbox/*
 
 *results.xml
 *.log
+
+test/coverage/*
+.coveralls.yml
diff --git a/.jshintrc b/.jshintrc
@@ -1,7 +1,7 @@
 {
     "evil" : true,
     "validthis": true,
-    "browser"  : true,
+    "node"     : true,
     "debug"    : true,
     "boss"     : true,
     "expr"     : true,
@@ -11,10 +11,9 @@
     "trailing" : true,
     "undef"    : true,
     "laxbreak" : true,
+    "esnext"   : true,
     "predef"   : [
         "_V_",
-        "videojs",
-        "vjs",
         "goog",
         "console",
 
@@ -24,8 +23,7 @@
         "exports",
         "process",
 
-        "PlayerTest",
-        "TestHelpers",
+        "q",
         "asyncTest",
         "deepEqual",
         "equal",

diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,12 @@
 language: node_js
 node_js:
-- 0.10
+  - 0.10
 before_script:
-- if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then curl https://gist.githubusercontent.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash; fi
+  - if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then curl https://gist.githubusercontent.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash; fi
+before_install:
+  - export CHROME_BIN=chromium-browser
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
 notifications:
   irc:
     channels:
@@ -11,5 +15,5 @@ notifications:
     on_success: never
 env:
   global:
-  - secure: K6JpKwMkfNaJix3Bb0tLjVMzHMJgtBXdd/dvfw1BMb9DCBpd81PqXbDs7yXCddUxnUPTBPxZCrQgWsw71Wn+qEoIG5MU3uOT5A2rBbx/yZonVAGv5ed/9w0xk0OzO383CmPMFqwqtp9YmdmqGjQBkYXVXJjTvNTOAExFSdhO+3U=
-  - secure: GIbhjUJapvC70nIZVlhVyK+3KAD2TVKpiY/q412OO7V2izbvcM1tvU3LBoMZbROzrt5TT84tCoJDvHnrpL0OvxPwrzL5CUU7h4UTxhTOyQkEinbYAnWlW9wdrvtdczsEvANkFPqBZ53B3hVHZHMLOG8QRWaTBicF68vSHEJFqb4=
+    - secure: K6JpKwMkfNaJix3Bb0tLjVMzHMJgtBXdd/dvfw1BMb9DCBpd81PqXbDs7yXCddUxnUPTBPxZCrQgWsw71Wn+qEoIG5MU3uOT5A2rBbx/yZonVAGv5ed/9w0xk0OzO383CmPMFqwqtp9YmdmqGjQBkYXVXJjTvNTOAExFSdhO+3U=
+    - secure: GIbhjUJapvC70nIZVlhVyK+3KAD2TVKpiY/q412OO7V2izbvcM1tvU3LBoMZbROzrt5TT84tCoJDvHnrpL0OvxPwrzL5CUU7h4UTxhTOyQkEinbYAnWlW9wdrvtdczsEvANkFPqBZ53B3hVHZHMLOG8QRWaTBicF68vSHEJFqb4=