1
0
mirror of https://github.com/videojs/video.js.git synced 2024-11-26 08:51:09 +02:00
Commit Graph

185 Commits

Author SHA1 Message Date
Steve Heffernan
dbd02fb05a Close GH-437: Made IE updates from CorwinT. Closes #309. Closes #364.. 2013-04-08 16:23:41 -07:00
Steve Heffernan
78a74536e5 Merge pull request #360 from mente/minified
correctly expose ready and dispose in minified version
2013-04-05 15:04:21 -07:00
Steve Heffernan
496fa982e0 Merge pull request #426 from dmlap/feature/poster-attribute
Do not remove poster attribute when creating the player
2013-04-04 16:03:25 -07:00
David LaPalomento
6f5e49fc16 Use accessors to transfer the poster attribute
When transferring the poster attribute from the container to the tech in mediafaker, use the accessor methods instead of directly referencing the private properties.
2013-04-04 18:56:52 -04:00
David LaPalomento
99a973e529 Do not remove poster attribute when creating the player
We use a div with a background image to simulate the poster image so that we can use a single poster implementation for flash and html. It may be desirable on some platforms to use the native poster image, however. On iPhones for instance, the simulated poster image covers up the native play button and can make it difficult to figure out where to touch to initiate playback. By keeping the poster attribute on the underlying video element, you can hide the simulated poster to get a native look-and-feel on that platform.
2013-04-04 09:55:27 -04:00
David LaPalomento
65687aa3d0 Rename vjs-disabled to vjs-hidden
Disabled is a bit overloaded with visible but unusable controls, so use hidden instead. Re-arrange default styles a bit and use dom helper methods instead of the vjs-objection functions.
2013-04-02 16:17:30 -04:00
David LaPalomento
cf52750a57 Update tests
Check for the presence of `vjs-disabled` instead of whether the display is set to none for volume and mute control tests.
2013-03-24 18:51:09 -04:00
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
Alex Vasilenko
e1409f8972 minified lib files renamed to minified api 2013-03-07 23:24:52 +02: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
Alex Vasilenko
1bceadf094 expose correct dispose method
testcase for correct dispose method
2013-03-05 23:23:01 +02:00
Alex Vasilenko
2de8ad6f63 ready method exposed in minified version
test case for minified lib and not minified code
2013-03-05 22:39:43 +02: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
Steve Heffernan
e07f9172fa Updated tests to include unit and integration tests. 2012-12-10 16:40:12 -08:00
Steve Heffernan
0edfae58eb Re-organized playback tech location in source. 2012-08-13 13:34:40 -07:00
Steve Heffernan
e1995350fe Removed refs to ecma.js 2012-03-26 10:58:20 -07:00
Steve Heffernan
df6d6647f7 Created new 'loadedalldata' event, and test. 2012-02-13 13:15:20 -08:00
Steve Heffernan
cc2d1e136c Fixed doc link.
Added tests.
2012-02-07 11:10:35 -08:00
Steve Heffernan
c762accb39 Fixed issue with .one scope.
Improved destroy method.
Still building out tests.
2012-02-03 17:53:59 -08:00
Steve Heffernan
2751be7e0f Updated qUnit tests. 2012-02-03 15:22:57 -08:00
Steve Heffernan
ef321a8072 MAJOR REFACTOR: Restrcutured code into class-based components. Setup and configuring should still work the same, but controls and tech elements are now sub-classes for Component, which builds elements and applies event behaviors.
Removed demo source code from repository root. Was receiving pull requests for the release files instead of source files. This makes it more clear where to make changes.
2011-11-29 11:40:05 -08:00
Steve Heffernan
0274280d66 Broke library into pieces and continued to reorganize. 2010-11-14 11:41:04 -08:00
Steve Heffernan
604b802df8 Added each function.
Updated controlbar to controlbars
2010-11-12 16:23:35 -08:00
Steve Heffernan
c211869e6a Created "Behaviors" and reorgainzed functions based on them. 2010-11-12 15:04:46 -08:00
Steve Heffernan
004fb9ee13 Cleaned up spinner styles. 2010-11-11 19:49:07 -08:00
Steve Heffernan
afd350050f Removed option to turn off links because it messes up controls alignment.
Explained some styles.
2010-11-11 19:33:33 -08:00
Steve Heffernan
9fe4307dd3 Updated skins to work with new layout methods. 2010-11-11 18:35:19 -08:00
Steve Heffernan
31f6fcdbd6 Created activateControl method for applying behaviors
Added rEvtContext for creating removable event listeners with context.
Switch to top/left form holygrail for load bar positioning.
Switched to relative/absolute for contorlsBelow instead of JS calculating heights.
Started testing maps integration.
2010-11-11 17:40:22 -08:00
Steve Heffernan
6a682af82c Starting new "Activate" method for controls.
Switched play/pause class on play button to playing/paused class on box, so other elements can style based on that.
2010-11-10 00:05:28 -08:00
Steve Heffernan
f59237e0e8 Switched back to divs for controls elements in order to make styles more portable. LIs had too many conflicsts. 2010-11-09 22:41:09 -08:00
Steve Heffernan
6d20179ad2 Updated subitles. Now using track element method for setting subitles. 2010-11-08 20:13:43 -08:00
Steve Heffernan
77a48d9324 More reorg.
Switched spinner to use CSS for centering instead of JS.
Created some device checks.
Modularized some device fixes.
2010-11-08 18:44:51 -08:00
Steve Heffernan
bea0021b5f Hopefully fixed issue with Android playback.
Fixed issue where big play button would appear over other fullscreen videos.
2010-11-08 13:49:05 -08:00
Steve Heffernan
b907b8d1f7 Massive reoganization. 2010-11-07 17:31:33 -08:00
Steve Heffernan
3b9141a1ae Switched to "players" list method for controlling fallbacks and fallback order 2010-11-07 15:30:59 -08:00
Steve Heffernan
5da3957cca Updated readme. 2010-11-07 12:17:51 -08:00
Steve Heffernan
6303b02119 Updated readme 2010-11-05 18:52:22 -07:00
Steve Heffernan
864e5bca0c Updated version numbers.
Created test folder.
2010-11-05 17:32:13 -07:00