web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2024-12-16 11:37:29 +02:00
Code Releases Activity
1,651 Commits 20 Branches 521 Tags 151 MiB
4bde5c8928
Commit Graph

1651 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steve Heffernan
16640274d7 Merge branch 'hotfix/error-timeout-squashed' of github.com:mmcc/video.js into mmcc-hotfix/error-timeout-squashed 2014-09-02 16:43:01 -07:00
Steve Heffernan
5f7ae5a7ba Added a line to the changelog for #1470 2014-09-02 16:29:15 -07:00
Steve Heffernan
f3925c7364 Changed to feature prefix over suffix to make it read more as a boolean 2014-09-02 16:22:43 -07:00
Steve Heffernan
c90d7d36f6 Merge branch 'media-tech-features2' of github.com:gkatsev/video.js into gkatsev-media-tech-features2 2014-09-02 16:11:26 -07:00
Steve Heffernan
6f069b765c Added line to changelog for #1449 2014-09-02 15:22:17 -07:00
Steve Heffernan
a6fa0dcc80 Merge branch 'the-N-Zone' of github.com:gkatsev/video.js into gkatsev-the-N-Zone 2014-09-02 12:50:10 -07:00
Matthew McClure
e72d682028 added timeout fix and tests. 2014-09-02 12:39:08 -07:00
Gary Katsevman
599217f158 Update tests to grab/restore progressEventsFeature 2014-09-02 14:57:29 -04:00
Gary Katsevman
e60f2eef5c Update media.js and html5.js feature access. 
Due to #1415, various usage of features moved around. This makes sure
that features are now called directly on the tech everywhere.
 2014-09-02 14:51:13 -04:00
Gary Katsevman
7caa2fc1a7 Append Feature to 'features'. Update tests. 2014-09-02 14:46:19 -04:00
Gary Katsevman
c0f91674e4 Promote 'features' to the prototype 2014-09-02 14:44:58 -04:00
Gary Katsevman
e6897b6219 Inherit tech 'features' from 'MediaTechController' 
Use vjs.obj.create to inherit 'features' from
'MediaTechController.prototype.features'. Because we are inheriting, if
the defaults change (prototype.features), we can receive these updates
in our tech if we had not changed properties of features manually.
 2014-09-02 14:41:27 -04:00
Steve Heffernan
65e4b9f167 Added line to the changelog for #1453 
Moved grunt languages configuration to lower in the gruntfile.
 2014-09-02 11:40:18 -07:00
Tom Johnson
011861bbdb add support for videojs-grunt-languages 
updates to change build/lang to build/files/lang

update grunt languages references and version

remove build/lang reference

update languages plugin reference for array support
 2014-09-02 11:40:06 -07:00
Gary Katsevman
df1944e9ff NaN & null should be treated as 0 in dimension() 
When dimension() receives a NaN or null value for the number, it will
treat it as zero.
Updated tests to reflect that as well.
 2014-09-02 14:37:42 -04:00
Steve Heffernan
1aabc440b6 Merge branch 'master' of https://github.com/videojs/video.js 2014-09-02 11:07:37 -07:00
Steve Heffernan
c5bd01160a Added line to the changelog for #1409 2014-09-02 11:06:30 -07:00
Steve Heffernan
82aa55795e Removed html5Mock var declarations and fixed whitespace 2014-09-02 11:04:30 -07:00
Steve Heffernan
7c27add29d Merge branch 'issue-1408' of github.com:glencoesoftware/video.js into glencoesoftware-issue-1408 2014-09-02 11:00:36 -07:00
Matthew McClure
11b592ae01 Update CONTRIBUTING.md 
Getting rid of some out of date info about Karma configuration.
 2014-09-02 10:39:33 -07:00
MrVaykadji
a582c833e3 French translation 2014-08-31 21:56:27 +02:00
Andreas Knab
c4b4ebea4a Remove unneeded html5Mock 2014-08-28 12:28:07 +02:00
Steve Heffernan
1f33546f90 Added a line to the change log for #1455 2014-08-27 15:33:48 -07:00
Steve Heffernan
521f0eb941 Merge branch 'songpete-patch-1' 2014-08-27 15:31:15 -07:00
Steve Heffernan
22aa758067 Merge branch 'patch-1' of github.com:songpete/video.js into songpete-patch-1 2014-08-27 15:15:32 -07:00
Steve Heffernan
537ae2b805 Merge pull request #1435 from dmlap/test-manual-tracking 
Add test for manual time tracking and dispose
 2014-08-27 13:26:48 -07:00
Steve Heffernan
fc0d37daec Merge branch 'guardian-html5-src-fix' 2014-08-27 13:12:46 -07:00
Steve Heffernan
2a9f1cdaac Added a line to the changelog for #1430 2014-08-27 13:11:55 -07:00
Steve Heffernan
87e25dd38e Merge branch 'html5-src-fix' of github.com:guardian/video.js into guardian-html5-src-fix 2014-08-27 13:08:02 -07:00
Steve Heffernan
16321d6208 Added line to the changelog for #1426 2014-08-27 13:05:33 -07:00
Steve Heffernan
34a8d64c04 Merge pull request #1426 from andekande/germantranslation 
german Translation based on es.json
 2014-08-27 12:59:50 -07:00
Pete Song
58c081f154 Bind 'onKeyPress' during keydown instead of keyup. 
Binding during keydown will be more effective at preventing certain default behavior like moving the page down as these events may happen prior to keyup. Addresses #1452
 2014-08-26 20:45:39 -04:00
Gary Katsevman
68ad48d8e8 Ignore null, undefined, and NaN is dimension() 
Add vjs.isNaN to have a better cross browser isNaN checker.
Previously, only undefined was ignored, so, it tried setting the
dimension using null and NaN as values. In most browsers this isn't a
problem, but in particular on IE8, things break.
With this PR, all three of those values will be ignored.
 2014-08-25 18:41:33 -04:00
Andreas Knab
49f58e0bbd Switch to sinon fake timers 2014-08-25 16:42:58 +02:00
Andreas Knab
f716807852 Add test cases for default and disabled timeout 2014-08-25 11:35:06 +02:00
Andreas Knab
6d65871cb0 Add simple inactivityTimeout test 2014-08-25 11:28:52 +02:00
Steve Heffernan
055d81dc3a 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-08-20 15:17:08 -07:00
Steve Heffernan
760eb308db Release 4.7.3 2014-08-20 15:16:22 -07:00
Steve Heffernan
03059c17d8 Added line to the changelog for #1424 2014-08-20 15:12:12 -07:00
Eric Berdahl
5ee97ea9a1 Publish (i.e. prevent closure compiler from obfuscating name of) videojs.Player.prototype.selectSource function. This allows developers to provide their own algorithms for selecting which source a Player should use. 2014-08-20 15:11:58 -07:00
Steve Heffernan
5761ab33bd Added line to the changelog for #1427 2014-08-20 15:07:52 -07:00
Tom Johnson
c19a3f3f48 add fix for localization of not supported message 
add base documentation for language support

typo fix

added utility function for adding languages per conversation with @heff. Includes test.

move addLanguage to core. update both core and util tests. added export property

added language sandbox for demo

fix comment

doc udpate

remove build instructions

add addLanguage API to doc

fix deep merge in test

test update

update local reference to string for compiled tests
 2014-08-20 15:04:30 -07:00
Steve Heffernan
a888108e2c Merge pull request #1422 from SunnyLi/patch-1 
Fix typo in video tracks documentation
 2014-08-20 13:00:32 -07:00
David LaPalomento
a1eb8dd975 Add test for manual time tracking and dispose 
Make sure time and progress event synthesis is turned off after the tech is disposed.For #1431.
 2014-08-20 14:39:02 -04:00
Matt Osborn
21f2d3c150 fixing techGet for HTML5 src method 2014-08-19 17:04:31 +01:00
Jan Hesse
dd0c7efa60 german Translation based on es.json 2014-08-18 13:11:05 +02:00
Sunny Li
ec61386f47 Fix typo in video tracks documentation 
small typo
 2014-08-16 12:45:31 -04:00
Andreas Knab
98edeccb3f Allow disabling of inactivity timeout 2014-08-15 14:39:49 +02:00
Steve Heffernan
342bdce748 Merge branch 'stable' 
Conflicts:
	dist/video-js/video-js.css
	dist/video-js/video-js.min.css
	dist/video-js/video-js.swf
	dist/video-js/video.dev.js
	dist/video-js/video.js
 2014-08-14 16:32:26 -07:00
Steve Heffernan
7baa40220f Release 4.7.2 2014-08-14 16:31:27 -07:00