1
0
mirror of https://github.com/videojs/video.js.git synced 2025-07-17 01:42:41 +02:00
Commit Graph

1227 Commits

Author SHA1 Message Date
e87fe460cc Merge branch 'monkeyhls' of git://github.com/gkatsev/video-js into gkatsev-monkeyhls 2014-03-26 14:37:20 -07:00
e39557e790 Always unpatch canPlayType.
Fix up tests to not ignore some if canPlayType is not available since
unpatch is no longer broken.
2014-03-26 16:59:04 -04:00
e2a1cac136 fix typo for unpatchCanPlayType 2014-03-26 16:58:49 -04:00
d21019ad78 add existence test for patch and unpatch methods 2014-03-26 16:39:11 -04:00
94ec725a66 update for IE8 and fixup stupid tests 2014-03-26 14:58:36 -04:00
75bd76f55c return the patched function from unpatchCanPlayType 2014-03-26 14:58:20 -04:00
fef6282d55 remove unused var 2014-03-26 13:49:21 -04:00
f1d2aef048 Don't assume only mimetype available for matching 2014-03-26 13:41:49 -04:00
0c856ce9a4 call unpatchCanPlayType after tests 2014-03-25 15:32:03 -04:00
817253b74f Also, switch out HTMLVideoElement to constructor reference in tests 2014-03-24 19:07:19 -04:00
f86e073f03 Switch HTMLVideoElement to constructor reference 2014-03-24 18:54:10 -04:00
86c3f94c87 fix up jshint errors 2014-03-24 18:00:00 -04:00
0f2aadcfcd Merge branch 'stable' 2014-03-24 13:53:54 -07:00
4daf1f173c Merge pull request #1098 from arxpoetica/patch-1
Fix code in examples.
2014-03-24 13:52:37 -07:00
416ee1b2a0 Fix code in examples.
The examples are broken with extra parentheses. Fixed.
2014-03-19 13:58:00 -04:00
5381f70d1c + vjs.Html5.{patchCanPlayType,unpatchCanPlayType}
patchCanPlayType is called on load.
It patched video#canPlayType if needed.
unpatchCanPlayType will revert the patch and return the patch function.
There are also corresponding tests that test patchCanPlayType,
unpatchCanPlayType and also whether the patch functions themselves work
correctly.
2014-03-17 20:47:47 -04:00
252ad3f466 be case insensitive 2014-03-13 18:25:03 -04:00
80d7b5014a Merge pull request #1075 from seniorflexdeveloper/hotfix/spinner
Loading Spinner Fixes
2014-03-13 14:26:20 -07:00
32e4d4c9d0 Merge pull request #1080 from tchakabam/master
Fixes null pointer exception and improves behavior of src() of when to trigger ready event
2014-03-13 14:18:36 -07:00
d289a336b8 Fix bower version (was 4.4.0 in bower.json but should be same as semver tag) 2014-03-13 22:16:39 +01:00
e35083bc28 Monkeypatch canPlayType on Android 4.0+ for HLS
Android devices starting with 4.0 can play HLS natively to some extent.
However, they do not say so in the canPlayType method. This commit
monkey patches canPlayType to respond with "maybe" for
"application/x-mpegURL" and "application/vnd.apple.mpegURL". Otherwise,
it'll fallback to the original canPlayType method.
2014-03-13 16:34:29 -04:00
4051a9cbee Fixed compile: removed trailing whitespace 2014-03-13 18:59:51 +01:00
26f6f4b0ea Enough to check for this.tech != null 2014-03-13 00:46:00 +01:00
cbefd37acf Added comment to triggerReady call 2014-03-13 00:45:06 +01:00
378d6ef482 - Bind hide on ended event to resolve issue #1028.
- Remove duplicate seeked event line.
2014-03-11 21:29:14 -07:00
02155c6b13 Trigger ready callback even when no tech available so client app can display custom fallback message 2014-03-11 16:47:51 +01:00
7a4c602be0 Fixes exception when userActive called but tech not initialized 2014-03-11 16:20:12 +01:00
e7b1098563 Merge branch 'master' of github.com:videojs/video.js 2014-03-06 13:18:58 -08:00
a64a5e27cf Merge branch 'stable'
Conflicts:
	dist/video-js/video-js.css
	dist/video-js/video-js.min.css
	dist/video-js/video.dev.js
	dist/video-js/video.js
2014-03-06 13:18:49 -08:00
bdeaae1c92 Release 4.4.3 v4.4.3 2014-03-06 13:15:53 -08:00
e2b2d14f48 Added line to the changelog 2014-03-06 12:55:25 -08:00
96c274de63 Merge branch 'patch/setposter-export' of git://github.com/heff/video-js into heff-patch/setposter-export 2014-03-06 12:49:36 -08:00
6244c39129 Added line to the changelog 2014-03-06 12:48:12 -08:00
e4b269e294 Added an IIFE to prevent deoptimization 2014-03-06 12:36:36 -08:00
54609dc3f5 Merge pull request #1061 from frankhereford/master
Update the Readme.md file with the current year.
2014-03-05 16:16:04 -08:00
2005fe2136 Exporting tech.setPoster(). Fixes #1028 2014-03-05 16:08:49 -08:00
efd4822c6b Update the Readme.md file with the current year. 2014-03-05 17:44:07 -06:00
d538debb1d Added try/catch to protect against IE with no Media Player 2014-03-05 15:04:04 -08:00
48230ea1a1 Added line to changelog 2014-03-05 13:42:32 -08:00
661cbd1eb0 Close GH-1059: Added a grunt task for opening the next issue that needs to be addressed. 2014-03-05 13:41:26 -08:00
fe2b702e32 Merge branch 'stable' 2014-03-04 11:33:35 -08:00
d47435a18f Merge pull request #1057 from paolodina/patch-1
Update setup.md
2014-03-04 11:33:12 -08:00
7c772fbf3e Merge branch 'bugfix/src-getter' of git://github.com/dmlap/video-js into dmlap-bugfix/src-getter
Conflicts:
	src/js/media/flash.js
2014-03-04 11:24:10 -08:00
4116d9ec14 Update setup.md 2014-03-04 20:13:14 +01:00
f155814cd9 Merge pull request #1 from heff/bugfix/src-getter
Made the src method return the player when setting
2014-03-04 14:11:56 -05:00
a0f929dd57 Added line to the changelog 2014-03-04 09:32:28 -08:00
cc5e515360 Use .npmignore to package a smaller subset of videojs for distribution. Make sure to include the video-js.less file for the designer to use. 2014-03-04 09:50:58 -05:00
2e26703162 Fixed captions positioning when player isn't playing 2014-03-03 13:47:16 -08:00
0ad8abfef1 Added line to the change log 2014-03-03 13:37:46 -08:00
61883ab4e2 Merge branch 'master' of git://github.com/harhoo/video.js into harhoo-master 2014-03-03 13:33:34 -08:00