Greg Kraus
f5b4980718
resolved conflicts with upstream master
2013-02-14 18:11:43 -05:00
Steve Heffernan
4e5a85a24a
Merge pull request #297 from ptrin/patch-1
...
Fixed a broken markdown link
2013-02-13 16:33:21 -08:00
Steve Heffernan
0373d15c2f
Merge pull request #314 from Sundrique/313-attributes
...
313 Save all video tag attributes while moving media element in DOM
2013-02-13 16:27:48 -08:00
Steve Heffernan
aa0ea90ee2
Merge pull request #316 from Sundrique/315-fullscreen-icon
...
315 Fullscreen button CSS rules for webkit and Firefox added
2013-02-13 16:23:10 -08:00
Steve Heffernan
7adede7b68
Merge pull request #320 from Sundrique/poster-visibility-fix
...
Fix poster component visibility
2013-02-13 16:20:39 -08:00
Steve Heffernan
1905e59bdb
Merge pull request #321 from Sundrique/volume-handler-fix
...
Fix volume handler initial position
2013-02-13 16:19:21 -08:00
Steve Heffernan
2f3ef4099e
Merge pull request #328 from BCjwhisenant/gruntfile-fix
...
Added code to replace Windows-style backslashes with Unix-style
2013-02-13 14:30:47 -08:00
BCjwhisenant
1da6396102
removed extraneous whitespace from Gruntfile
...
testing:
grunt and grunt test both successful
2013-02-13 15:32:48 -05:00
Greg Kraus
6c9e17dce2
Corrected duration time label to read 'time remaining'
2013-02-12 21:37:45 -05:00
Greg Kraus
07cda9583f
Corrected the call to get the player width
2013-02-12 21:24:58 -05:00
Greg Kraus
c6338728d8
Merge branch 'master' into 291-accessibility. Updating to the latest upstream code
2013-02-12 21:21:09 -05:00
jwhisenant
f0f7c8917b
Added code to replace Windows-style backslashes with Unix-style
...
forward-slashes
testing:
grunt successful
grunt test successful
2013-02-12 13:34:01 -05:00
Steve Heffernan
41d4641cea
Merge pull request #327 from gkatsev/jshint
...
update plugins.js to follow jshint.
2013-02-11 13:41:42 -08:00
Gary Katsevman
b3f6aa0078
fix test
2013-02-11 16:35:43 -05:00
Gary Katsevman
964e50a9ee
update plugins.js
2013-02-11 16:18:12 -05:00
Steve Heffernan
a2d4262c56
Merge pull request #326 from dmlap/plugin-tutorial
...
Plugin tutorial
2013-02-11 13:03:58 -08:00
Steve Heffernan
d096a7d33e
Merge pull request #325 from gkatsev/jshint
...
Add gruntfile and tests to Jshint linting
2013-02-11 12:36:56 -08:00
David LaPalomento
1636677995
Remove Up-Front Config Example
...
Get rid of the example code for configuring a plugin at creation time. There's already an example in the tutorial and it makes things a bit confusing.
2013-02-11 13:05:39 -05:00
Steve Heffernan
24ff4b1321
Merge pull request #304 from Commander147/246-Custom-Start-Time-Offset-Support
...
246 custom start time offset support
2013-02-11 09:56:35 -08:00
Steve Heffernan
eadaa2f800
Merge pull request #322 from gkatsev/plugin
...
Add plugin event ordering test
2013-02-11 09:05:04 -08:00
David LaPalomento
f4cba1649d
Up-Front Plugin Config
...
Create an example of making a dynamic video element and loading a plugin. Add that example to the tutorial.
2013-02-11 10:28:57 -05:00
David LaPalomento
c6d3481470
Remove Extra Flash Switch
...
Get rid of the extra switching logic to force Flash tech. Worth noting: it has to exist as a separate script tag because we're using document.write to insert video.js scripts.
2013-02-11 10:28:22 -05:00
David LaPalomento
1579e623b0
Plugin Doc and Example
...
Added most of a doc on building plugins. Still missing a section on up-front plugins. Created an example page that shows how to load a plugin.
2013-02-11 10:28:03 -05:00
Joseph Afework
e23cf4a1c0
Changed 'firstplay' to match event functions
...
Changed the 'firstplay' method to the same form as the other event
functions
2013-02-10 22:45:00 -08:00
Gary Katsevman
103adfc1a5
update test/unit/plugins to adhere to jshint
2013-02-08 17:30:00 -05:00
Gary Katsevman
b52cf5889e
update test/unit/player to adhere to jshint
2013-02-08 17:29:04 -05:00
Gary Katsevman
31f76092f8
update test/unit/{media.html5,setup}.js to adhere to jshint
2013-02-08 17:27:04 -05:00
Gary Katsevman
c13b96acbb
update test/unit/lib to adhere to jshint
2013-02-08 17:25:33 -05:00
Gary Katsevman
e6478e96de
Update test/unit/events to follow jshint
2013-02-08 17:20:46 -05:00
Gary Katsevman
8f6d408802
Update test/unit/core to jshint
2013-02-08 17:18:49 -05:00
Gary Katsevman
e1d4b2c827
Update test/unit/component to conform to jshint
2013-02-08 17:14:36 -05:00
Gary Katsevman
5f2b8fb831
update gruntfile to pass jshint
2013-02-08 17:08:31 -05:00
Gary Katsevman
51a22adc6a
Update grunt and jshint to lint the gruntfile and test files
2013-02-08 17:02:39 -05:00
Gary Katsevman
4cefbf6bac
check how many events were triggered
2013-02-08 16:13:35 -05:00
Gary Katsevman
b8b23d00de
Add a test using stop Propagation
2013-02-08 16:13:35 -05:00
Gary Katsevman
c6a855cf74
add plugin test for event order
2013-02-08 16:13:35 -05:00
Aleksandr Sandrovskiy
730b4723b0
Fix volume handler initial position
2013-02-08 16:06:15 +03:00
Aleksandr Sandrovskiy
701c1d210c
Fix poster component visibility
2013-02-08 15:50:56 +03:00
Joseph Afework
3353b75327
Fixed Start Time Offset
...
Implementation has been modified to utilize the firstplay event to set
the custom start time offset of the video.
If in the data-setup array an attribute of "starttime" is specified,
then the video will start playback from the passed index in seconds.
Note: Video will only start from this index on first play only.
2013-02-07 15:24:49 -08:00
Joseph Afework
bce339c405
Revert "Added Support for custom video start time"
...
This reverts commit ab5f977d62
.
2013-02-07 15:06:16 -08:00
Joseph Afework
3865d44b0e
Revert "Added Flag for loop support with custom start time"
...
This reverts commit 120790a34a
.
2013-02-07 15:06:16 -08:00
Aleksandr Sandrovskiy
ba110169f5
Adds (removes) 'vjs-fullscreen' class on fullscreenchange event fixes #315
2013-02-08 01:11:33 +03:00
Steve Heffernan
0206ba9469
Added details about including issues in pull requests.
2013-02-07 14:06:38 -08:00
Aleksandr Sandrovskiy
4b960849c7
Changed 'createElement' method to 'createEl'
2013-02-08 00:44:03 +03:00
Aleksandr Sandrovskiy
3e555d77ea
Changed V to vjs
2013-02-08 00:36:54 +03:00
Steve Heffernan
9f2b869135
Added mocha for Testling
2013-02-05 11:42:59 -08:00
Steve Heffernan
7954af0ba3
Updated sandbox example to point to correct source list
2013-02-05 11:09:07 -08:00
Aleksandr Sandrovskiy
042b81e566
315 Fullscreen button CSS rules for webkit and Firefox added
2013-02-05 21:58:17 +03:00
Aleksandr Sandrovskiy
ecb7fb6b3e
313 Save all video tag attributes while moving media element in DOM
2013-02-05 20:11:45 +03:00
Steve Heffernan
a84d1f85b8
Merge branch 'feature/plugins'
2013-02-04 16:20:29 -08:00