1
0
mirror of https://github.com/videojs/video.js.git synced 2024-12-16 11:37:29 +02:00
Commit Graph

1487 Commits

Author SHA1 Message Date
Steve Heffernan
ae90526f2c Merge branch 'hotfix/flash-dispose' of github.com:dmlap/video-js into dmlap-hotfix/flash-dispose 2014-07-28 16:10:47 -07:00
Steve Heffernan
540e7f0cb7 Added line to changelog for #1337 2014-07-28 15:53:59 -07:00
Steve Heffernan
cab595a5dd Merge branch 'fix/bower-ignore' of github.com:gkralik/video.js into gkralik-fix/bower-ignore 2014-07-28 15:52:40 -07:00
Steve Heffernan
9217d5c2e7 Added line to changelog for #1321. Removed unneeded hasOwnProperty. 2014-07-28 15:07:57 -07:00
Steve Heffernan
34ad720626 Merge branch 'data-attributes' of github.com:gkatsev/video.js into gkatsev-data-attributes 2014-07-28 15:00:09 -07:00
Steve Heffernan
97c7e4c759 Moved source list handling out of src() and into its own function to simplify src 2014-07-28 14:43:12 -07:00
Steve Heffernan
738fa73949 Merge branch 'source-type' of github.com:guardian/video.js into guardian-source-type
Conflicts:
	src/js/exports.js
2014-07-28 13:46:35 -07:00
Steve Heffernan
d3e03accce Added line to the changelog 2014-07-28 13:39:53 -07:00
Steve Heffernan
edd2e11486 Updated trigger param docs to be single-line for the docs parser 2014-07-28 13:37:43 -07:00
Steve Heffernan
2466c76a57 Merge branch 'feature/component-trigger-fix' of github.com:bceacuna/video.js into bceacuna-feature/component-trigger-fix 2014-07-28 13:29:19 -07:00
Gary Katsevman
c794aeca34 quote vertical option so it doesn't get minified 2014-07-28 11:37:39 -07:00
Steve Heffernan
e17dd2c68d Merge pull request #1361 from gutworth/fix-ws
fix whitespace in util.js
2014-07-25 15:36:46 -07:00
Niels Doucet
472988df58 #1309 fix adding/removing event handlers in IE8 2014-07-24 09:13:27 +02:00
Benjamin Peterson
6789c921f5 fix whitespace in util.js 2014-07-23 20:50:06 -07:00
Steve Heffernan
b1c3bd4f84 Added npm install and grunt to the contrib update command 2014-07-23 11:56:55 -07:00
Steve Heffernan
f6ba25ddf6 Made the swf account for being ready after the tech was disposed 2014-07-16 14:01:01 -07:00
Steve Heffernan
02949f5b91 Allow overriding flash methods that were previously hidden by creating them in init 2014-07-14 16:07:26 -07:00
jackunion
bb93a18ca8 fixes #492
Binds up/down arrows for sliders
2014-07-13 20:46:20 +04:00
Steve Heffernan
3352346a74 Removed dist files 2014-07-11 14:50:42 -07:00
Steve Heffernan
a97a002ed6 Release 4.6.4 2014-07-11 14:48:42 -07:00
Steve Heffernan
fa635f835f Updated contrib release steps 2014-07-11 14:44:47 -07:00
Steve Heffernan
2af481e0ec Updated to swf version 4.4.2 to fix the network state reporting 2014-07-11 14:38:30 -07:00
Steve Heffernan
7debdea507 The base media tech class now checks the networkState at init to determine if loadstart should be manually fired.
Previously this was only done in the HTML5 tech, but Flash needs it as well. This relies on videojs/video-js-swf#106.

Also removed the 'not implemented' warnings from the media tech functions. I think there's a better way we can help tech authors here, and it was blocking the ability to check if a function was implemented for real.

Fixes #1300, fixes #1341
2014-07-10 19:18:58 -07:00
David LaPalomento
a77e39f342 Set this.el_ directly instead of using another variable
The flash tech doesn't need to hold onto a reference to the placeholder element after the embed code has been generated. Set this.el_ to the embed code immediately instead of using another property to track it during init. Tested in IE8.
2014-07-10 17:17:53 -04:00
David LaPalomento
da19fa3ead Track the object element during init and remove it if the tech is disposed before onReady. For #1339.
If dispose() was called before the SWF triggered onReady(), the placeholder div would be cleaned up but the actual object element would be left behind to mess things up in the future. Keep track of the object element during initialization and make sure it is removed if flash is unloaded early.
2014-07-09 16:29:30 -04:00
Matt Osborn
d6d3dd1d4d using vjs.bind 2014-07-09 10:14:44 +01:00
Matt Osborn
926ccac6a7 removing redundant ready check 2014-07-09 10:12:17 +01:00
Gregor Kralik
bdc89a0b24 bower: ignore dot files, build and tests 2014-07-09 11:02:08 +02:00
themicp
392cbda095 Added support for listening to multiple events through a types array. closes #1231 2014-07-08 11:51:47 -07:00
Gary Katsevman
d5372545a2 Added additional browsers for saucelabs testing. closes #1216 2014-07-08 11:46:02 -07:00
Gary Katsevman
813f28fb4d Added a base for running saucelabs tests from grunt. closes #1215 2014-07-08 11:43:57 -07:00
Steve Heffernan
1378f566ab Merge branch 'stable'
Conflicts:
	contrib.json
2014-07-08 11:08:16 -07:00
Steve Heffernan
ab520e9dd7 Updated stable with new contrib commands, including test, watch, server 2014-07-08 11:06:29 -07:00
spectralsun
14ecc2fc89 added missing exports. closes #1328 2014-07-07 10:43:44 -07:00
John Doe
bdf6c54dbc Merge branch 'stable' 2014-07-07 10:09:01 -07:00
Matthew McClure
c0451fa674 Merge pull request #1331 from StevenMeyer/patch-1
Corrected API method name (#1330)
2014-07-07 10:06:53 -07:00
Steven Meyer
5812d64154 Corrected API method name
Corrected API method name and added helpful message on using events.

I was confused for a while regarding how to use the events, so it might help someone else.
2014-07-04 14:24:34 +01:00
Matt Osborn
3b60b9decd setSource method tweaks 2014-07-02 12:26:04 +01:00
Gary Katsevman
b65eb0e5f3 switch to vjs.obj.each 2014-07-01 16:11:32 -04:00
Gary Katsevman
c9b1217e10 Copy over data attrs from video el to wrapper el. 2014-07-01 15:10:45 -04:00
Matt Osborn
9e8a31065e adding a currentType method to get current source type if known 2014-07-01 10:46:16 +01:00
Erick Acuna
d24a9b48ac Updated jsdoc 2014-06-26 10:50:25 -04:00
Steve Heffernan
80147f0054 Updated the contrib feature accept process to support upstream repos and added a review process 2014-06-25 17:54:47 -07:00
Matt Osborn
fe6946d451 Fixed an error when disposing a tech using manual timeupdates. closes #1312 2014-06-25 17:40:25 -07:00
Cavitt
b66ef806e5 Exposed the vertical option for slider controls. closes #1303 2014-06-25 17:27:56 -07:00
Steve Heffernan
fc4d00c658 Condensed the contrib commands 2014-06-25 15:48:40 -07:00
Steve Heffernan
1448638285 Updated contrib install process 2014-06-24 14:57:47 -07:00
Erick Acuna
0ee79afdfe Fixed issue number 1298 component.trigger does not pass event object #1298 2014-06-24 12:43:18 -04:00
Patrick Forget
8a05aa11a1 Added a composer.json for PHP packages. closes #1241 2014-06-13 17:01:11 -07:00
David LaPalomento
155781058e Fixed an IE11 issue where clicking on the video wouldn't show the controls. closes #1291 2014-06-13 14:16:03 -07:00