Steve Heffernan
8bc5fb055e
Merge branch 'master' of github.com:zencoder/video-js
2013-03-09 13:19:16 -08:00
Steve Heffernan
d147b1ae2f
Merge branch 'optional_resize' of git://github.com/mente/video-js into mente-optional_resize closes #359
...
Conflicts:
test/unit/component.js
2013-03-09 13:18:07 -08:00
Alex Vasilenko
a3b9b50e8b
vjs.Component.dimension accepts 'auto' as value
...
test case for vjs.Component.dimension with 'auto'
2013-03-09 10:39:28 +02:00
David LaPalomento
7e0ee0c799
Fix minified property access
...
Use a string literal to reference the tech's player property so the access isn't mangled by closure.
2013-03-08 10:13:01 -05:00
David LaPalomento
0ba7166636
Fixes #367
...
If you are quick, you could get videojs to wrap the HTML video element twice on iOS. The video element has to be recreated after moving on iOS but we weren't re-associating it with the player object. When autoSetup swung through, it would re-initialize the video element and create a player within a player.
2013-03-07 20:57:52 -05:00
David LaPalomento
888f04484a
Remove phantom UA check
...
The volume controls and mute toggle are guarding against not having a tech present, so it's no longer necessary to mock the tech for all command-line tests. Individual tests continue to do so using PlayerTest.makePlayer.
2013-03-06 09:45:18 -05:00
David LaPalomento
f1e90d65f2
Block defineSetter test for older IE
...
__defineSetter__ doesn't work on some versions of IE, so just ignore the volume/mute toggle tests when run on those browsers.
2013-03-05 18:07:35 -05:00
David LaPalomento
ad98bebf55
Reformat var statements
...
Declare them in a single line at the top of the function and initialize them later.
2013-03-05 13:38:47 -05:00
David LaPalomento
ab25a823b7
Fix 347
...
Hide volume slider and mute toggle when the current tech doesn't support adjusting video volume. Added controls specific test cases. Volume-related controls retest whether to display themselves whenever `loadstart` fires.
2013-03-02 00:00:23 -05:00
David LaPalomento
60f9b505f1
Close GH-346: Remove need for good.require/good.provide.
2013-02-22 22:26:58 -05:00
Gary Katsevman
b3f6aa0078
fix test
2013-02-11 16:35:43 -05:00
Gary Katsevman
964e50a9ee
update plugins.js
2013-02-11 16:18:12 -05:00
Steve Heffernan
d096a7d33e
Merge pull request #325 from gkatsev/jshint
...
Add gruntfile and tests to Jshint linting
2013-02-11 12:36:56 -08:00
Gary Katsevman
103adfc1a5
update test/unit/plugins to adhere to jshint
2013-02-08 17:30:00 -05:00
Gary Katsevman
b52cf5889e
update test/unit/player to adhere to jshint
2013-02-08 17:29:04 -05:00
Gary Katsevman
31f76092f8
update test/unit/{media.html5,setup}.js to adhere to jshint
2013-02-08 17:27:04 -05:00
Gary Katsevman
c13b96acbb
update test/unit/lib to adhere to jshint
2013-02-08 17:25:33 -05:00
Gary Katsevman
e6478e96de
Update test/unit/events to follow jshint
2013-02-08 17:20:46 -05:00
Gary Katsevman
8f6d408802
Update test/unit/core to jshint
2013-02-08 17:18:49 -05:00
Gary Katsevman
e1d4b2c827
Update test/unit/component to conform to jshint
2013-02-08 17:14:36 -05:00
Gary Katsevman
4cefbf6bac
check how many events were triggered
2013-02-08 16:13:35 -05:00
Gary Katsevman
b8b23d00de
Add a test using stop Propagation
2013-02-08 16:13:35 -05:00
Gary Katsevman
c6a855cf74
add plugin test for event order
2013-02-08 16:13:35 -05:00
Steve Heffernan
d38620bc7e
Added test for overwriting existing plugin
2013-02-04 16:13:37 -08:00
Steve Heffernan
1f3a9f117d
Update plugin tests to support compiling
2013-02-04 10:43:16 -08:00
Steve Heffernan
cb77fb337f
Added code to pass plugins tests
2013-02-04 10:31:53 -08:00
Steve Heffernan
6f2597cc8d
Added test for the plugin interface.
2013-02-04 07:55:31 -08:00
Steve Heffernan
dc18f475f8
Changed to vjs.obj.function naming for object related functions.
...
Updated mergeOptions to just options.
2013-01-25 17:36:40 -08:00
Steve Heffernan
c7d3b9ebf9
Updated grunt script to add CSS/PNG/SWF files dist. Also did some renaming of files and folders.
2013-01-25 15:22:14 -08:00
Steve Heffernan
2c28d44f92
Changed name of test file to test.video.js
2013-01-18 17:30:35 -08:00
Steve Heffernan
ddb016e5b0
Deleted video.test.js...again
2013-01-18 17:20:04 -08:00
Steve Heffernan
f82296b4c1
Putting video.test.js in dist/ now instead of test. Don't want to commit video.test.js because it will cause merge conflicts on pull requests.
2013-01-18 17:16:29 -08:00
Steve Heffernan
2effe5a8cc
Removed video.test.js and added to gitignore to prevent merge conflicts
2013-01-18 17:05:39 -08:00
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
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
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
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
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
f267e27e36
Updated closure compiler advanced mode branch
2013-01-10 13:06:12 -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
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
