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,514 Commits 21 Branches 519 Tags 150 MiB
08da4c889f
Commit Graph

1514 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steve Heffernan
08da4c889f Added a line to the changelog for #1467 2014-09-05 14:50:00 -07:00
Steve Heffernan
1ff1d76a8c Merge commit 'a582c833e34c227ff29b707bad9cd4857f32c877' of github.com:MrVaykadji/video.js into french 2014-09-05 14:48:05 -07:00
Steve Heffernan
18be3ef9ac Added a line to the changelog for #1487 2014-09-05 14:31:20 -07:00
Matthew McClure
864432d7d3 updated styles for error messages and made poster absolutely positioned by default 2014-09-05 13:59:27 -07:00
Steve Heffernan
6c2efbf999 Added a line to the changelog for #1483 2014-09-05 13:53:11 -07:00
David LaPalomento
eec1fc13fe Move language methods into externs 
Trying to create a player-like subclass of component requires overriding languages() but that method was being minified. Add it to externs so that it can be overridden after minification. Fixes #1420.
 2014-09-05 13:50:13 -07:00
Steve Heffernan
54b175d988 Added line to the changelog for #1482 2014-09-05 13:42:06 -07:00
David LaPalomento
b9181ee55b Make sure the error property is set before proxying through the tech. 
Some error events don't cause the error property on the video element to be set. In that case, handle the event like any other. Fixes #1465.
 2014-09-05 13:36:50 -07:00
David LaPalomento
d385f8257f Fixes #1481 
Clear out pending errors on player disposal.
Source selection errors are dispatched asynchronously so that there is an opportunity to override the error message. If the player is disposed during that period, the error timeout wasn't being cleared properly. Fix for #1480.

Fix whitespace
When defining variables inline with declarations, stick to one variable per line.
 2014-09-05 13:32:15 -07:00
Steve Heffernan
88f59d7ad6 Release 4.8.0 2014-09-03 08:43:58 -07:00
Steve Heffernan
1c84f37fa0 Updated contrib.json for contrib prompt changes 2014-09-03 08:36:46 -07:00
Steve Heffernan
7d4b26625f Fixed a broken playbackRate test on Android 2.3 2014-09-02 17:38:11 -07:00
Steve Heffernan
7ead5f708f Added a line to the changelog for #1473 2014-09-02 16:47:47 -07:00
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