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

777 Commits

Author SHA1 Message Date
Matthew McClure
016e94f889 Merge remote-tracking branch 'upstream/master' 2013-04-28 17:34:08 -07:00
Steve Heffernan
7199b91f4d Merge pull request #459 from gkatsev/issue/fixEvents
Make preventDefault and stopPropagation call the corresponding methods on the actual event
2013-04-25 12:29:53 -07:00
Steve Heffernan
623bb75267 Merge pull request #458 from gkatsev/lockShowing
Make lockShowing apply a css class instead of modifying styles directly....
2013-04-25 12:29:28 -07:00
Gary Katsevman
83b007504f Make vjs-lock-showing less specific but with display !important 2013-04-25 15:13:23 -04:00
Matthew McClure
07d90fb6e0 grunt now adds copyright comment to top of video.js 2013-04-22 18:48:34 -07:00
Gary Katsevman
c4d07c402d Make preventDefault and stopPropagation call the corresponding methods on the actual event 2013-04-22 17:23:20 -04:00
Gary Katsevman
c0726d20f0 Make lockShowing apply a css class instead of modifying styles directly. Adress #427 2013-04-22 16:07:41 -04:00
Steve Heffernan
f81b369955 Merge pull request #457 from gkatsev/fix/calculateDistance
Fix calculateDistance on slider to work in iframes and all devices.
2013-04-22 11:26:51 -07:00
Steve Heffernan
229f5028e1 Merge pull request #456 from gkatsev/feature/issue448
Add videojs to window directly. Fix #448
2013-04-22 11:24:05 -07:00
Steve Heffernan
8494080c90 Merge pull request #454 from dmlap/issue453
Move html tech feature detection earlier than superclass constructor. Fix #453
2013-04-22 11:23:28 -07:00
Steve Heffernan
ea792587d5 Merge pull request #449 from eXon/master
Let external libs use the extend
2013-04-22 11:20:50 -07:00
Gary Katsevman
a8e87f80ed Make slider use changedTouches if available. Also, test to make sure we get the correct ratio for calculateDistance 2013-04-22 13:57:42 -04:00
Gary Katsevman
b1b0ac0377 Add videojs to window directly. Fix #448 2013-04-22 11:32:17 -04:00
Matthew McClure
953ae8abec Added copyright banner to top of distribution video.js 2013-04-21 22:44:36 -07:00
Matthew McClure
23c647eecb switched license over from LGPLv3 to Apache2 2013-04-21 20:36:44 -07:00
David LaPalomento
99c982c103 Move html tech feature detection earlier than superclass constructor
The MediaTechController calls createEl during its initialization to construct the actual video element used for playback. On iOS, the video element must be recreated during this process so that it doesn't become unresponsive. Make sure that we determine whether recreating the video elemen is necessary before calling the superclass constructor.
2013-04-19 20:14:48 -04:00
Steve Heffernan
5ff2b1d061 Merge pull request #450 from gkatsev/feature/iife-wrapper
Make the minified output be wrapped in an IIFE, fix #402.
2013-04-18 14:02:49 -07:00
Gary Katsevman
c172ed715b Make the minified output be wrapped in an IIFE, fix #402. 2013-04-18 15:27:14 -04:00
Benoit Tremblay
fd798f3dac Fix script after video DOM
You have to wait at least once in case this script is loaded after your video in the DOM (weird behavior only with minified version)
2013-04-18 00:49:59 -03:00
Benoit Tremblay
7a0155aa03 Check the unobfuscated init so we can extend outside the lib 2013-04-17 23:07:04 -03:00
Steve Heffernan
a73f0ab6f0 Updated event fixing to support IE8 and Firefox 2013-04-16 16:25:12 -07:00
Steve Heffernan
bdb4456c62 Fixed an issue where Firefox would lose the type of an event.
Because it returns false for event.hasOwnProperty('type');
2013-04-16 15:58:57 -07:00
Steve Heffernan
83553b6540 Merge pull request #444 from heff/feature/browser-tests
First pass at automated multi-browser/device testing. closes #419
2013-04-15 13:25:22 -07:00
Steve Heffernan
3b48be921e First pass at automated multi-browser/device testing. closes #419
I've got a way to run tests across every browser and device out there except for IE8, and IE8 should work except I'm running into a Browserstack bug that I've let them know about.

It uses a project called bunyip, which internallt uses Yeti (YUI), Pagekite, and Browserstack.

Next steps include:
  - Making it all automatic. Right now you have to wait for browsers to connect and then manually hit enter when they have.
  - Make it a grunt task
  - Document it all so others can use it

I think this is close enough for me to close the milestone 4.0 issue.
2013-04-12 16:51:04 -07:00
Steve Heffernan
2138d4f2a0 Close GH-425: Backing out goog.inherits and adding back the previous inheritance API. fixes #415. 2013-04-09 13:43:35 -07:00
Benoit Tremblay
3a32f44f23 Close GH-432: Additional exports for external techs. 2013-04-09 13:18:55 -07:00
Steve Heffernan
c74f39318f Updated grunt and grunt-contrib versions to fix PhantomJS bug
Also changed some additional code to fix new jshint issues found by new jshint version.
2013-04-09 10:42:41 -07:00
Steve Heffernan
0aa814fae7 Fixed another issue blocking the play event from triggering in Flash 2013-04-08 19:20:53 -07:00
Steve Heffernan
896d0333c7 Fixed a bug where play event was no longer being triggered. 2013-04-08 18:53:19 -07:00
Steve Heffernan
dbd02fb05a Close GH-437: Made IE updates from CorwinT. Closes #309. Closes #364.. 2013-04-08 16:23:41 -07:00
Steve Heffernan
bafaf49e7e Close GH-433: Update contribflow version and add contrib.json. 2013-04-08 13:55:50 -07:00
Steve Heffernan
78a74536e5 Merge pull request #360 from mente/minified
correctly expose ready and dispose in minified version
2013-04-05 15:04:21 -07:00
Steve Heffernan
a59822065d Merge pull request #417 from RavWar/controls_css_rework
Lock controls when video is paused
2013-04-05 14:56:01 -07:00
Alex Vasilenko
6e5407596e run grunt test only for travis 2013-04-06 00:14:12 +03:00
Alex Vasilenko
2ff8a2bba2 minify both source and tests for test grunt task 2013-04-06 00:12:41 +03:00
Steve Heffernan
496fa982e0 Merge pull request #426 from dmlap/feature/poster-attribute
Do not remove poster attribute when creating the player
2013-04-04 16:03:25 -07:00
David LaPalomento
6f5e49fc16 Use accessors to transfer the poster attribute
When transferring the poster attribute from the container to the tech in mediafaker, use the accessor methods instead of directly referencing the private properties.
2013-04-04 18:56:52 -04:00
Steve Heffernan
a9352922d9 Merge pull request #399 from dmlap/issue398
Fix #398
2013-04-04 13:02:43 -07:00
Steve Heffernan
1faa39db5b Merge pull request #265 from EricR/patch-1
techOrder should be an array of strings
2013-04-04 12:48:13 -07:00
Steve Heffernan
143e53febc Added isReady = false on unloadTech. fixes #214, fixes #211 2013-04-04 11:06:13 -07:00
David LaPalomento
99a973e529 Do not remove poster attribute when creating the player
We use a div with a background image to simulate the poster image so that we can use a single poster implementation for flash and html. It may be desirable on some platforms to use the native poster image, however. On iPhones for instance, the simulated poster image covers up the native play button and can make it difficult to figure out where to touch to initiate playback. By keeping the poster attribute on the underlying video element, you can hide the simulated poster to get a native look-and-feel on that platform.
2013-04-04 09:55:27 -04:00
Steve Heffernan
6bd4651767 Merge pull request #421 from BCjwhisenant/contrib-guide-node
Fix for #411 - change to CONTRIBUTING.md about phantomjs and Node 0.10.x
2013-04-03 10:37:57 -07:00
Jim Whisenant
ece4f7e5e9 Added a note about the known issue between phantomjs and Node 0.10.x 2013-04-02 21:58:37 -04:00
Ravwar
baeff8030d Fix controls locking and unlocking functionality by:
1. Switch control bar default hiding styles
2. Fix typos
3. Remove duplicate function
2013-04-03 02:57:59 +04:00
David LaPalomento
65687aa3d0 Rename vjs-disabled to vjs-hidden
Disabled is a bit overloaded with visible but unusable controls, so use hidden instead. Re-arrange default styles a bit and use dom helper methods instead of the vjs-objection functions.
2013-04-02 16:17:30 -04:00
Steve Heffernan
f1d957929c Merge pull request #404 from RavWar/fix_exports_duplicates
Remove duplicate code from exports
2013-04-01 16:26:14 -07:00
Steve Heffernan
be63a06f54 Merge pull request #410 from dsteinbrunner/patch-1
typo fix
2013-04-01 16:00:40 -07:00
Jim Whisenant
7b7452ff9f added a note to advise users to stick with an earlier version of Node.js until the known issue with phantomjs is fixed.
fixes #477
2013-03-29 18:13:49 -04:00
David Steinbrunner
1e640b9790 typo fix 2013-03-29 17:23:38 -03:00
Steve Heffernan
22c3f47546 Merge pull request #407 from gkatsev/feature/duration-display
Make the Duration Display not display the duration as a negative number
2013-03-27 15:08:40 -07:00