web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2024-11-28 08:58:46 +02:00
Code Releases Activity
1,242 Commits 21 Branches 519 Tags 150 MiB
a9ad77aa00
Commit Graph

1242 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steve Heffernan
a9ad77aa00 Removed a low value test that was causing a hang in testing 2014-03-27 11:53:06 -07:00
Steve Heffernan
b3b42e3822 Made findPosition return rounded values to fix Android tests 2014-03-27 11:44:50 -07:00
Steve Heffernan
88403221a9 Fixed canPlayType patch tests on Android 2014-03-27 11:19:21 -07:00
Steve Heffernan
2079af7320 Merge pull request #1116 from dmlap/hotfix/gcc-currentSrc 
Fix currentSrc when Flash returns null
 2014-03-26 16:53:55 -07:00
David LaPalomento
c8bd862e3e Fix currentSrc when Flash returns null 
It looks like GCC was mangling `rtmpConnection` and `rtmpStream` before invoking them. Unfortunately, we define those methods as string literals so they do not have mangled equivalents. Invoke them using string literals so GCC never mangles the method names.
 2014-03-26 19:45:42 -04:00
Steve Heffernan
74c73969cd Merge branch 'gkatsev-defaultprevented' 2014-03-26 14:45:53 -07:00
Steve Heffernan
c286c826db Added line to changelog 2014-03-26 14:45:08 -07:00
Steve Heffernan
33f388366d Merge branch 'master' of github.com:videojs/video.js 2014-03-26 14:40:38 -07:00
Steve Heffernan
f363523551 Switched to single quotes 2014-03-26 14:39:33 -07:00
Steve Heffernan
e87fe460cc Merge branch 'monkeyhls' of git://github.com/gkatsev/video-js into gkatsev-monkeyhls 2014-03-26 14:37:20 -07:00
Steve Heffernan
2c12ed98a7 Merge branch 'defaultprevented' of git://github.com/gkatsev/video-js into gkatsev-defaultprevented 2014-03-26 14:32:50 -07:00
Steve Heffernan
87ee28e6cb Merge pull request #1112 from seniorflexdeveloper/feature/grunt-connect 
Grunt Connect
 2014-03-26 14:30:45 -07:00
Gary Katsevman
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
Gary Katsevman
e2a1cac136 fix typo for unpatchCanPlayType 2014-03-26 16:58:49 -04:00
Gary Katsevman
d21019ad78 add existence test for patch and unpatch methods 2014-03-26 16:39:11 -04:00
Gary Katsevman
94ec725a66 update for IE8 and fixup stupid tests 2014-03-26 14:58:36 -04:00
Gary Katsevman
75bd76f55c return the patched function from unpatchCanPlayType 2014-03-26 14:58:20 -04:00
Gary Katsevman
fef6282d55 remove unused var 2014-03-26 13:49:21 -04:00
Gary Katsevman
f1d2aef048 Don't assume only mimetype available for matching 2014-03-26 13:41:49 -04:00
Tom Johnson
d1d97bfe9b update contributing doc with grunt commands 2014-03-25 15:38:32 -07:00
Tom Johnson
0a1d4b2645 use grunt connect for development 2014-03-25 15:22:29 -07:00
Gary Katsevman
0c856ce9a4 call unpatchCanPlayType after tests 2014-03-25 15:32:03 -04:00
Gary Katsevman
817253b74f Also, switch out HTMLVideoElement to constructor reference in tests 2014-03-24 19:07:19 -04:00
Gary Katsevman
f86e073f03 Switch HTMLVideoElement to constructor reference 2014-03-24 18:54:10 -04:00
Gary Katsevman
86c3f94c87 fix up jshint errors 2014-03-24 18:00:00 -04:00
Gary Katsevman
d48d6cf99d add a test 2014-03-24 17:56:02 -04:00
Steve Heffernan
0f2aadcfcd Merge branch 'stable' 2014-03-24 13:53:54 -07:00
Steve Heffernan
4daf1f173c Merge pull request #1098 from arxpoetica/patch-1 
Fix code in examples.
 2014-03-24 13:52:37 -07:00
Robert Hall
416ee1b2a0 Fix code in examples. 
The examples are broken with extra parentheses. Fixed.
 2014-03-19 13:58:00 -04:00
Gary Katsevman
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
Gary Katsevman
252ad3f466 be case insensitive 2014-03-13 18:25:03 -04:00
Matthew McClure
80d7b5014a Merge pull request #1075 from seniorflexdeveloper/hotfix/spinner 
Loading Spinner Fixes
 2014-03-13 14:26:20 -07:00
Matthew McClure
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
Stephan Hesse
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
Gary Katsevman
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
Stephan Hesse
4051a9cbee Fixed compile: removed trailing whitespace 2014-03-13 18:59:51 +01:00
Stephan Hesse
26f6f4b0ea Enough to check for this.tech != null 2014-03-13 00:46:00 +01:00
Stephan Hesse
cbefd37acf Added comment to triggerReady call 2014-03-13 00:45:06 +01:00
Tom Johnson
378d6ef482 - Bind hide on ended event to resolve issue #1028. 
- Remove duplicate seeked event line.
 2014-03-11 21:29:14 -07:00
tchakabam
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
tchakabam
7a4c602be0 Fixes exception when userActive called but tech not initialized 2014-03-11 16:20:12 +01:00
Steve Heffernan
e7b1098563 Merge branch 'master' of github.com:videojs/video.js 2014-03-06 13:18:58 -08:00
Steve Heffernan
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
Steve Heffernan
bdeaae1c92 Release 4.4.3 2014-03-06 13:15:53 -08:00
Steve Heffernan
e2b2d14f48 Added line to the changelog 2014-03-06 12:55:25 -08:00
Steve Heffernan
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
Steve Heffernan
6244c39129 Added line to the changelog 2014-03-06 12:48:12 -08:00
Steve Heffernan
e4b269e294 Added an IIFE to prevent deoptimization 2014-03-06 12:36:36 -08:00
Gary Katsevman
f3166ad082 Add speced event.defaultPrevented 2014-03-06 13:36:40 -05:00
Steve Heffernan
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