1
0
mirror of https://github.com/videojs/video.js.git synced 2024-12-12 11:15:04 +02:00
Commit Graph

562 Commits

Author SHA1 Message Date
Steve Heffernan
e840a27409 Merge branch 'master' of git://github.com/mchristopher/video-js into mchristopher-master
Conflicts:
	test/video.test.js
2013-01-18 17:03:17 -08:00
Michael Christopher
67c96304f2 Uppercase constants 2013-01-18 16:54:45 -08:00
Michael Christopher
aece38716d Pass tests 2013-01-18 15:09:46 -08:00
Michael Christopher
c6e23d772a Updating SSL support for new VJS 2013-01-18 14:57:57 -08:00
Michael Christopher
df2fc221e3 Merge newest changes 2013-01-18 14:54:44 -08:00
Steve Heffernan
54737a8af2 Updated options to use underscore for private 2013-01-17 21:03:25 -05:00
Steve Heffernan
487fdc8511 Fixed instances where options was still using a non-string key 2013-01-17 20:45:22 -05:00
Steve Heffernan
70fbf7fc8a Updated events to support event.stopImmediatePropagation().
Added a first play event.
2013-01-17 20:33:53 -05:00
Steve Heffernan
b208d63367 Adding compiling back with calcdeps. Testing travis CI. 2013-01-16 21:01:10 -05:00
Steve Heffernan
38e19282fd removed compile from grunt testing because can't install it on travis ci 2013-01-16 20:58:23 -05:00
Steve Heffernan
1189bbaa95 Added compiled tests to test runner. 2013-01-16 20:30:55 -05:00
Steve Heffernan
0b3e240999 Changed this.player to this.player_ to be more consistent with other private vars. 2013-01-16 20:24:38 -05:00
Steve Heffernan
e17d1a2d85 Formatted install steps 2013-01-16 17:13:39 -05:00
Steve Heffernan
fd7d53cb5a Updated contributing.md to have grunt-cli step 2013-01-16 17:09:46 -05:00
Steve Heffernan
e4eb0d5ffe Added a method for doing a deep merge on options objects so individual options could be passed to children withoug overwriting all defaults.
Cleaned up vjs.merge.
2013-01-16 11:09:56 -05:00
Steve Heffernan
a6f2161ca8 Updated index.html.example to use sourcelist.js. 2013-01-14 23:29:20 -05:00
Steve Heffernan
7f8acd2850 Updated readme and contrib.md 2013-01-14 22:51:01 -05:00
Steve Heffernan
6623919429 Merge branch 'feature/component-docs'
Conflicts:
	src/player.js
2013-01-14 22:40:19 -05:00
Steve Heffernan
6ad5e0dada Udpated contributing.md 2013-01-14 22:35:23 -05:00
Michael Christopher
3e7289f244 Add HTTPS support for CDN version 2013-01-14 13:11:20 -08:00
Steve Heffernan
921b783e40 Added phantom to package list. 2013-01-12 22:30:55 -08:00
Steve Heffernan
4c0d74b6c2 Removed unused node packages. 2013-01-12 22:26:10 -08:00
Steve Heffernan
0f0fccc312 Update grunt build script. 2013-01-12 22:23:22 -08:00
Steve Heffernan
e7c146bc1f Reorgnizing src files.
Moving to grunt for build.
2013-01-11 23:02:20 -08:00
Steve Heffernan
675147645c Cleaning up repo. 2013-01-11 11:52:01 -08:00
Steve Heffernan
06e3ec9dce Cleaned up test logging. Added fallback message for no video support. 2013-01-10 13:48:41 -08:00
Steve Heffernan
77d9d34f91 Merge pull request #236 from lindstedt/master
Feedback message when user can't view video
2013-01-10 13:43:05 -08:00
Steve Heffernan
92855aaf8f Merge pull request #276 from tijptjik/patch-1
Simple typo
2013-01-10 13:40:49 -08:00
Steve Heffernan
68441c7141 Adding jshint back to testing 2013-01-10 13:10:48 -08:00
Steve Heffernan
f267e27e36 Updated closure compiler advanced mode branch 2013-01-10 13:06:12 -08:00
Steve Heffernan
428203c466 Continued updating all library pieces to support closure compiler.
Renamed internal lib var to vjs instead of _V_.
2013-01-04 16:58:23 -08:00
Steve Heffernan
e125ee878e Updated closure compiler build. Starting Flash support. 2012-12-31 15:25:56 -08:00
Steve Heffernan
688b5053ee Major rewrite to support Google Closure Compiler Advanced Optimization.
Still in process.
2012-12-30 21:45:50 -08:00
Mart van de Ven
90febd2bcf typo 2012-12-28 21:05:58 +08:00
Steve Heffernan
a34259860f Started components doc. 2012-12-17 11:18:31 -08:00
Steve Heffernan
21d2b2086f Merge pull request #249 from Menda/patch-1
Update docs/tech.md
2012-12-11 16:01:40 -08:00
Steve Heffernan
d5e52b554c Merge pull request #254 from benfoxall/master
Document _V_(domElement) init
2012-12-11 15:27:20 -08:00
Steve Heffernan
f7f7cb475e Added space to title 2012-12-11 15:02:47 -08:00
Steve Heffernan
55d02cf6d8 Added .editorconfig and travis CI badge 2012-12-11 14:33:42 -08:00
Steve Heffernan
e77dd302e5 Trying to fix phantomjs running on travis CI 2012-12-11 13:54:16 -08:00
Steve Heffernan
53774c2f74 Fixed error in package info for Travis CI 2012-12-11 13:45:22 -08:00
Steve Heffernan
b18bc876b0 Moved .values definition to support being used in width() 2012-12-11 13:39:15 -08:00
Steve Heffernan
6bb2a8cdda Fixed incorrect width and height returning. fixes 258 2012-12-11 13:34:13 -08:00
Steve Heffernan
60a70f94b2 Merge branch 'feature/test-buildout' 2012-12-10 18:54:48 -08:00
Steve Heffernan
4d7da6cb8a Adding line to CHANGELOG: Added automated test suite and support for Travis CI. 2012-12-10 18:54:48 -08:00
Steve Heffernan
be0febaad9 Added Travis CI config, and also supporting package.json.
Removed flwplayer folder.
Added phantomjs for Travis CI test running, including temp makefile.
2012-12-10 18:51:48 -08:00
Steve Heffernan
0a8d967a3e Removed demo-subtitles.srt. Not using it. 2012-12-10 16:46:48 -08:00
Steve Heffernan
d8ec3cbc87 Removed root source-list.js. Not sure what it was there for. 2012-12-10 16:44:41 -08:00
Steve Heffernan
9293076b75 Removed original build.sh. Was causing confusion. 2012-12-10 16:41:18 -08:00
Steve Heffernan
e07f9172fa Updated tests to include unit and integration tests. 2012-12-10 16:40:12 -08:00