1
0
mirror of https://github.com/videojs/video.js.git synced 2025-01-04 06:48:49 +02:00
Commit Graph

676 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Steve Heffernan
4e5a85a24a Merge pull request #297 from ptrin/patch-1
Fixed a broken markdown link
2013-02-13 16:33:21 -08:00
Steve Heffernan
0373d15c2f Merge pull request #314 from Sundrique/313-attributes
313 Save all video tag attributes while moving media element in DOM
2013-02-13 16:27:48 -08:00
Steve Heffernan
aa0ea90ee2 Merge pull request #316 from Sundrique/315-fullscreen-icon
315 Fullscreen button CSS rules for webkit and Firefox added
2013-02-13 16:23:10 -08:00
Steve Heffernan
7adede7b68 Merge pull request #320 from Sundrique/poster-visibility-fix
Fix poster component visibility
2013-02-13 16:20:39 -08:00
Steve Heffernan
1905e59bdb Merge pull request #321 from Sundrique/volume-handler-fix
Fix volume handler initial position
2013-02-13 16:19:21 -08:00
Steve Heffernan
2f3ef4099e Merge pull request #328 from BCjwhisenant/gruntfile-fix
Added code to replace Windows-style backslashes with Unix-style
2013-02-13 14:30:47 -08:00
BCjwhisenant
1da6396102 removed extraneous whitespace from Gruntfile
testing:
grunt and grunt test both successful
2013-02-13 15:32:48 -05:00
Greg Kraus
6c9e17dce2 Corrected duration time label to read 'time remaining' 2013-02-12 21:37:45 -05:00
Greg Kraus
07cda9583f Corrected the call to get the player width 2013-02-12 21:24:58 -05:00
Greg Kraus
c6338728d8 Merge branch 'master' into 291-accessibility. Updating to the latest upstream code 2013-02-12 21:21:09 -05:00
jwhisenant
f0f7c8917b Added code to replace Windows-style backslashes with Unix-style
forward-slashes

testing:
grunt successful
grunt test successful
2013-02-12 13:34:01 -05:00
Steve Heffernan
41d4641cea Merge pull request #327 from gkatsev/jshint
update plugins.js to follow jshint.
2013-02-11 13:41:42 -08: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
a2d4262c56 Merge pull request #326 from dmlap/plugin-tutorial
Plugin tutorial
2013-02-11 13:03:58 -08: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
David LaPalomento
1636677995 Remove Up-Front Config Example
Get rid of the example code for configuring a plugin at creation time. There's already an example in the tutorial and it makes things a bit confusing.
2013-02-11 13:05:39 -05:00
Steve Heffernan
24ff4b1321 Merge pull request #304 from Commander147/246-Custom-Start-Time-Offset-Support
246 custom start time offset support
2013-02-11 09:56:35 -08:00
Steve Heffernan
eadaa2f800 Merge pull request #322 from gkatsev/plugin
Add plugin event ordering test
2013-02-11 09:05:04 -08:00