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

904 Commits

Author SHA1 Message Date
Steve Heffernan
610974854c Merge pull request #383 from heff/feature/track-default
Adding default to 'off' for track lists from #190
2013-03-15 16:13:19 -07:00
Steve Heffernan
59cdd4edcd Adding default to 'off' on track menus from #190 2013-03-15 16:08:40 -07:00
Steve Heffernan
32755ca855 Merge branch 'master' of git://github.com/zencoder/video-js 2013-03-15 14:03:59 -07:00
Jake Harvey
f3af77e985 Close GH-378: #376 Removing Helvetica from font-family declarations.. 2013-03-15 13:52:40 -07:00
Steve Heffernan
8c6138797a Merge branch 'master' of git://github.com/zencoder/video-js 2013-03-09 15:45:09 -08: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
Steve Heffernan
de5acf4fe7 Merge pull request #368 from dmlap/issue367
Fixes #367
2013-03-08 14:45:18 -08: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
Steve Heffernan
bc723acb06 Merge pull request #361 from Axonn/fix-component-child-adding
Fix ability to add child after closure compiled
2013-03-07 16:39:18 -08:00
Alex Vasilenko
dcc66cb14c recompile sources before starting tests via npm test 2013-03-07 23:32:00 +02:00
Alex Vasilenko
e1409f8972 minified lib files renamed to minified api 2013-03-07 23:24:52 +02:00
Alex Vasilenko
264e3aeb38 expose vjs.Component.dispose 2013-03-07 23:23:02 +02:00
Alex Vasilenko
696097ca38 Merge branch 'optional_resize' of github.com:mente/video-js into optional_resize
* 'optional_resize' of github.com:mente/video-js:
  proper vertical-align on default skin
2013-03-07 23:21:23 +02:00
Alex Vasilenko
cf2fd9cbe8 use {width: "auto", height: "auto"} to let css decide video dimensions 2013-03-07 23:21:08 +02:00
corwin.tomkinson
93f8737fc7 Fix ability to add child after closure compiled 2013-03-07 11:37:51 +00:00
Steve Heffernan
f11c5d3ca9 Merge pull request #340 from Sundrique/fix-parent-el-option
Fix parentEl tech option.
2013-03-06 16:57:40 -08:00
Steve Heffernan
eb3f1aca8a Merge pull request #348 from Wellming/master
fix iPhone and iPad detection.
2013-03-06 16:45:51 -08:00
Steve Heffernan
253c510da0 Merge pull request #354 from dmlap/issue347
Fix Issue #347
2013-03-06 16:36:59 -08: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
Alex Vasilenko
e4c9588048 proper vertical-align on default skin 2013-03-05 19:02:59 +02:00
Alex Vasilenko
9b52edea07 do not force default 300x150 if no width/height found 2013-03-05 18:35:55 +02:00
Steve Heffernan
29297bd37b Merge pull request #356 from gkatsev/gitignore
add swp files to gitignore
2013-03-04 17:12:44 -08:00
Gary Katsevman
754f590778 add swp files to gitignore 2013-03-04 18:21:11 -05:00
David LaPalomento
b662139708 Remove unused variable
Get rid of a variable that was copy-pasted along from a previous incarnation of this fix.
2013-03-04 14:53:27 -05:00
Steve Heffernan
f72a90f4a8 Merge pull request #353 from bcjwilson/master
Poster image to stretch both horizontally and vertically while staying centered and maintaining aspect ratio.
2013-03-04 11:22:10 -08: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
Jim R. Wilson
f8385f06d0 changing poster image to div with backgroundImage
The existing poster implementation uses an <img> tag
stretched horizontally with capped max-height. This
works in some cases like pillar-boxing when the poster
is not as wide as the player. However it fails to
letter box when the player is taller than the poster.

This change uses a stretched div with background-image
and backround-size to create a vertically aligned
poster image which stretches in both directions to fit
while maintaining aspect ratio.

For browsers which do not support backgroundSize (IE8)
the original <img> based strategy is used as a fallback.
2013-03-01 17:45:07 -05:00
Steve Heffernan
6a6b46cbcf Merge branch 'master' of git://github.com/zencoder/video-js 2013-02-28 16:37:52 -08:00
Steve Heffernan
3d617476a5 Merge pull request #349 from bcjwilson/master
formatting and spelling connections readme
2013-02-25 15:08:18 -08:00
Jim R. Wilson
50e7fac830 revert excuse-our-dust message back to h3, looked better that way 2013-02-25 17:15:47 -05:00
Jim R. Wilson
e005f1a505 normalizing markdown markup, whitespace, spelling 2013-02-25 17:13:58 -05:00
Jim R. Wilson
b681af9cf8 sp, gettign->getting 2013-02-25 17:05:04 -05:00
Steve Heffernan
34dfaec5ca Merge branch 'master' of git://github.com/zencoder/video-js 2013-02-24 17:50:55 -08:00
Steve Heffernan
496c699298 Updated to specific version of grunt-contrib-qunit to fix travis CI build errors 2013-02-24 15:20:17 -08:00
Wellming Li
c647b436aa fix iPhone and iPad detection. 2013-02-24 17:56:30 +08:00
Steve Heffernan
fa29d9ac86 Merge remote-tracking branch 'upstream/master' 2013-02-22 22:56:09 -05:00
David LaPalomento
60f9b505f1 Close GH-346: Remove need for good.require/good.provide. 2013-02-22 22:26:58 -05:00
Steve Heffernan
191a9d671d Merge pull request #345 from Axonn/344-component-exports
Rename component method exports. Fixes #344
2013-02-20 07:45:05 -08:00
corwin.tomkinson
4f18a6bd97 Rename component method exports. Fixes #344 2013-02-20 14:59:22 +00:00
Steve Heffernan
6fffd7e77b Merge pull request #301 from gdkraus/291-accessibility
Accessibility improvements for the player
2013-02-15 16:22:05 -08:00
alexsandrovsky
eda21b7b22 Fix parentEl tech option.
Player cannot find parentEl option after minification, so flash tech fails.
2013-02-15 23:31:31 +03:00
Greg Kraus
dd9f1603a4 Provide more information to screen reader users about the duration time 2013-02-14 19:27:54 -05:00
Greg Kraus
f5b4980718 resolved conflicts with upstream master 2013-02-14 18:11:43 -05:00