web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2025-01-31 11:26:45 +02:00
Code Releases Activity
1,210 Commits 20 Branches 521 Tags
Commit Graph

448 Commits

Author SHA1 Message Date
Gregory Waxman
204bb84ecb Array traversing for children opts - closes #1070 2014-03-18 15:49:59 -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
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
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
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
e4b269e294 Added an IIFE to prevent deoptimization 2014-03-06 12:36:36 -08:00
Steve Heffernan
2005fe2136 Exporting tech.setPoster(). Fixes #1028 2014-03-05 16:08:49 -08:00
Steve Heffernan
d538debb1d Added try/catch to protect against IE with no Media Player 2014-03-05 15:04:04 -08:00
Steve Heffernan
7c772fbf3e Merge branch 'bugfix/src-getter' of git://github.com/dmlap/video-js into dmlap-bugfix/src-getter 
Conflicts:
	src/js/media/flash.js
 2014-03-04 11:24:10 -08:00
Steve Heffernan
2e26703162 Fixed captions positioning when player isn't playing 2014-03-03 13:47:16 -08:00
harhoo
3e19d7621a Whitespace changes 2014-03-03 15:31:47 +00:00
harhoo
b0a6cf335a Move captions down when controls are inactive 2014-03-03 10:26:51 +00:00
Steve Heffernan
e9da3350d4 Made the src method return the player when setting, and made Flash return the current srouce for flash.src() 2014-02-27 17:34:01 -08:00
Vladimir B.
6b28ba268a There was no semicolon 
There was no semicolon
 2014-02-25 13:11:03 +02:00
Steve Heffernan
333db84510 Made module.exports a string key so it'd be exported. fixes #1033 2014-02-24 21:19:06 -08:00
Steve Heffernan
310a0630c9 Switched to custom universal module definition. closes #998 closes #847 closes #998 2014-02-13 19:20:30 -08:00
Steve Heffernan
fe4c477da6 Switch this.content references to use the standard this.contentEl_ 
Also cleaned up some comments and formatting.
 2014-02-11 17:20:07 -08:00
Steve Heffernan
24125bbb63 Merge branch 'patch-1' of git://github.com/MrAvenger/video.js into MrAvenger-patch-1 2014-02-11 15:36:06 -08:00
Steve Heffernan
7ade43d91d Merge branch 'bugfix/lastseek-cleanup' of git://github.com/dmlap/video-js into dmlap-bugfix/lastseek-cleanup 2014-02-10 16:17:30 -08:00
Matthew McClure
3cb41c7786 Close GH-971: Quiet down deprecation warnings. 2014-02-06 17:15:01 -08:00
Steve Heffernan
1b45195f9d Close GH-981: Stopped component's dispose event from bubbling up. 2014-02-06 17:11:33 -08:00
Steve Heffernan
849521ee66 Merge pull request #988 from golisandeep3/master 
Fixed ARIA role attribute for button and slider
 2014-02-06 17:00:33 -08:00
Steve Heffernan
4521c70173 Changed enableUserActivity to enableTouchActivity 
Added back tracking of touch+hold
 2014-02-06 16:54:35 -08:00
Gary Katsevman
28a4d29934 enable user activity on components by default 2014-02-06 17:04:58 -05:00
Gary Katsevman
9975ed407a Don't enable enableUserActivity on an option 2014-02-06 15:59:57 -05:00
Gary Katsevman
75a23135e6 Report user activity on touchmove if userWasActive 2014-02-06 15:59:10 -05:00
Gary Katsevman
4d2267c1bc use tap events. Report activity on touch move. 2014-02-06 15:40:20 -05:00
Gary Katsevman
e5294848f9 Remove listenToTouchMove. 2014-02-05 20:50:39 -05:00
Gary Katsevman
26c8d3f92c enableUserActivity on component 
disableUserActivity on MediaTechController and Player.
MediaTechController does it manually.
 2014-02-05 20:41:52 -05:00
Gary Katsevman
a7d624affe stop immediate propagation on tap events 
Make media tech controller only hide control bar.
 2014-02-05 19:22:43 -05:00
Gary Katsevman
4b254a07df remove unused var 2014-02-05 19:19:14 -05:00
Gary Katsevman
07cd9800e8 Fix touch events. 
Make components listen to touch events themselves.
Components can have a "listenToTouchMove" property that would report
user activity on touch moves.
Currently, the only problem left is that the MediaTechController emits
tap events to show/hide the controlbar but that causes the control bar
to not be hidden via a tap.
 2014-02-05 18:26:44 -05:00
Sandeep Goli
b23eba7c8c Fixed ARIA role attribute for button and slider 2014-02-04 11:18:51 -05:00
Aalekh Nigam
d0f8b3e87e Close GH-977: Inserts Fullscreen events .fixes #688. 2014-02-03 13:17:47 -08:00
David LaPalomento
7184cb4b49 src() called as a getter should return the video src 
It can be handy that src() returns the player object when it is invoked but it does not match the behavior of the corresponding property on the video element. Ignoring the spec however, while the video element is running the resource selection algorithm, currentSrc may be undefined. If the video source has been specified through an attribute on the video element, src() is the natural way to expose that URL programmatically. Without this change, it's necessary to bypass the player and interact with the tech directly to determine the value of the src attribute.
 2014-01-25 23:16:35 -05:00
Steve Heffernan
e25a9f3207 Merge branch 'seniorflexdeveloper-feature/grunt-swf' 2014-01-23 17:20:19 -08:00
Steve Heffernan
a8afe9c673 Merge pull request #906 from heff/feature/more-exports 
Added missing component exports
 2014-01-23 16:45:27 -08:00
David LaPalomento
dd8c25e8d5 Store last seek time in the Flash tech 
Instead of caching the last seek time at the player level, cache it in the Flash tech. The only place this value was used was in the progress controls when Flash was loaded, so this simplifies the logic in that component and pushes the hack down into a single location at least.
 2014-01-23 18:19:15 -05:00
Steve Heffernan
2825f74ba8 Merge branch 'feature/grunt-swf' of git://github.com/seniorflexdeveloper/video.js into seniorflexdeveloper-feature/grunt-swf 2014-01-15 13:52:33 -05:00
Tom Johnson
0dae44988e use SWF grunt build project. Update gruntfile for dist task to use packaged SWF. Updated sandbox for reference to SWF. 2014-01-07 07:32:16 -08:00
Steve Heffernan
0f38d27dcc Close GH-899: Fix firefox+flash mousemove bubbling. Fixes #37 2013-12-20 14:14:00 -08:00
Steve Heffernan
024b031646 Added missing component exports. fixes #903 2013-12-18 17:53:43 -08:00
MrAvenger
ec1bea41a5 Update progress-control.js 2013-12-17 15:26:56 +00:00
MrAvenger
b1f9450bb3 SeekHandle content 
I wanted to use the SeekHandle to show the current time but as far as I could tell it only contained static content, I made this change to allow the content to be updated.

Is this its intended purpose or am I playing with something that has another a different job?
 2013-12-17 15:05:03 +00:00