1856 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
heff	915a6b90f2	Added a prerelease task to contrib.json	2015-04-30 14:17:16 -07:00
heff	c7265e3d9d	Merge branch 'master' into review-dmlap-test-and-build-improvements	2015-04-30 12:03:52 -07:00
heff	476b8a4cf8	Merge branch 'master' into review-eXon-feature/watchify ... Conflicts: Gruntfile.js	2015-04-30 11:44:57 -07:00
heff	a131a00c4c	Added a prerelease grunt task. Updated packages to correct version.	2015-04-29 16:21:05 -07:00
David LaPalomento	54519da32c	Grunt improvements ... Get test/index.html working when loaded directly into a browser. Remove extra browserifying via karma. Add timing info to to grunt output.	2015-04-29 15:02:14 -07:00
David LaPalomento	b5968f13e2	@dmlap added an error message if techOrder is not in options. closes #2097	2015-04-29 14:05:22 -07:00
Steve Heffernan	f7b1492332	Merge pull request #2088 from mmcc/add-scss-to-dist ... Added scss files to dist folder	2015-04-29 13:19:40 -07:00
Matthew McClure	9e953a2681	removing scss from dist	2015-04-29 13:18:22 -07:00
Matthew McClure	f21f840afb	added scss files to dist folder	2015-04-29 13:16:18 -07:00
Steve Heffernan	a40b0049ed	Merge pull request #2096 from mmcc/heff-puts-dist-back-in-a-corner ... Removing dist again in favor of some dark git magic	2015-04-29 12:48:18 -07:00
Matthew McClure	dcb24ce744	Removing dist again in favor of some dark git magic	2015-04-29 11:09:17 -07:00
Brandon Bay	bb9fde0f82	@bc-bbay rename onEvent methods to handleEvent. closes #2093	2015-04-29 10:17:46 -07:00
Brandon Bay	4fa6a942d9	@bc-bbay Load plugins before controls. closes #2094	2015-04-29 10:15:15 -07:00
jforbes	013d59db76	@forbesjo added a vjs-button class to button controls. closes #2084	2015-04-28 17:47:42 -07:00
Steve Heffernan	8e84adb612	Merge pull request #2087 from dmlap/minified-doc-updates ... Update minified video.js name in guides and examples	2015-04-28 17:25:08 -07:00
David LaPalomento	e234375168	Update minified video.js name ... Change the docs to point to the new minified name for video.js. For #1013.	2015-04-28 17:00:10 -07:00
Steve Heffernan	258687fee4	Merge pull request #2086 from mmcc/nobody-puts-dist-in-a-corner ... Nobody puts dist in a corner	2015-04-28 16:38:16 -07:00
Matthew McClure	1eae8697e6	Bumping to 5.0 prerelease	2015-04-28 16:04:12 -07:00
Matthew McClure	4cdca881d4	expose the dist file and derequire the bundle	2015-04-28 15:57:13 -07:00
Steve Heffernan	cf25d3a857	Merge pull request #2085 from dfreamon/patch-1 ... Update the copyright	2015-04-28 15:16:23 -07:00
Darius Freamon	b4fbdc24d5	update copyright	2015-04-28 16:14:05 -06:00
heff	ae0eec312c	Switched to box-sizing:border-box for all player elements ... This doesn't immediately break anything (I know of) because the controls were originally designed to work in both border-box and content-box environments. Extra elements were added to create internally padding. This does open the door for some simplification of the HTML, though the extra elements could still be useful for extra skin design options. closes #2082 closes #1444	2015-04-28 13:45:59 -07:00
jforbes	69738a86dc	@forbesjo added the `scrubbing` property. closes #2080	2015-04-28 13:33:55 -07:00
heff	f19d13b9bb	@heff added and `extends` function for external subclassing. closes #2078	2015-04-28 11:50:09 -07:00
Gary Katsevman	94f33c8d43	@gkatsev removed event.isDefaultPrevented in favor of event.defaultPrevented. closes #2081	2015-04-28 11:45:06 -07:00
Matthew McClure	4ac762cf48	@mmcc added a new default skin, switched to SASS, modified the html closes #1999 ... - removed old less style. no going back now. - switched back to video-js.scss naming and added a base-style injection class - cleaned up and simplified big play btn - Flexbox straight flexin. - move to using variables for text and icon font families - use table layout for IE 8 and 9 - moved to using extend for icons - Switched to SASS, added a new default theme, updated the html - added horizontal classes - added connect-watch grunt task - show all the things in the control bar so everything is available by default (and hidden via css - reignore dist for now - removing trailing comma to get the tests passing - Switched to using libsass and removed incompatible "black magic" - updating to es6 syntax - removed old separator, added grunt task for dev, and updated example - singular time-control and live-control. remove playing class on pause - updated separator control styles - Show full control bar when a player goes to fullscreen. Also added a grunt task specifically for skin development (only watches sass file changes and runs sass) - allow poster image to toggle playback - This allows the poster image to toggle play / pause on audio-only sources - fixed issue with scrollbars in Chrome on Linux - make the control bar not-quite-black - added back some focus highlights until we decide on another path	2015-04-28 09:52:27 -07:00
Deirdre Connolly	c62aa10637	@dconnolly replaced JSON.parse with a safe non-eval JSON parse. closes #2077	2015-04-27 17:05:39 -07:00
Matthew McClure	232daaed54	Merge pull request #1838 from mmcc/feature/control-bar-separator ... Feature/control bar separator	2015-04-24 11:21:50 -07:00
Matthew McClure	4f52a47d7e	generalized separator class and created specific insertion point class ... split spacer into two files and converted to es6 insertion-point-spacer -> custom-control-spacer	2015-04-24 11:21:26 -07:00
Matthew McClure	493f4d5df4	Created generic spacer component meant to make it easier to create ... control bar layouts	2015-04-24 11:20:52 -07:00
eXon	621108ec03	Replaced grunt-watchify by watch option in grunt-browserify	2015-04-23 19:05:31 -04:00
eXon	65dddf7a0b	Added watchify task	2015-04-23 06:43:50 -04:00
Matthew McClure	e1e69941a1	@mmcc added ES6 default args and template strings. closes #2015	2015-04-22 15:26:37 -07:00
heff	a02ee27802	@heff converted all classes to use ES6 classes. closes #1993	2015-04-14 13:08:32 -07:00
heff	7f70f09621	Added a line to the changelog for #1976	2015-04-03 17:05:14 -07:00
Steve Heffernan	6e29bccd01	Merge pull request #1976 from mmcc/es6ification ... ES6ification	2015-04-03 17:02:05 -07:00
Matthew McClure	f3036dd528	cleanup and fixed options shadowing in player	2015-04-03 15:25:58 -07:00
Matthew McClure	44953cf99b	remove minified tests from grunt test task	2015-04-02 11:33:51 -07:00
Matthew McClure	dfa791581f	Check travis env before checking if it's a PR	2015-04-02 11:33:51 -07:00
heff	6e5fc8d687	More build and testing cleanup. Also some reorganization.	2015-04-02 11:33:51 -07:00
Matthew McClure	0c9d53321f	Report test coverage analytics during test runs	2015-04-02 11:33:50 -07:00
heff	f298d18023	Most of test conversion for es6ification	2015-04-02 11:33:50 -07:00
Matthew McClure	2e689f85e5	Starting ES6 conversion up to functional player	2015-04-02 11:33:50 -07:00
Steve Heffernan	c9b53c5cfe	Merge pull request #2001 from dmlap/changelog-for-1974 ... Update changelog for #1974	2015-04-02 09:04:46 -07:00
David LaPalomento	3fd1a58357	Update changelog ... Add entry for #1974.	2015-04-02 10:30:29 -04:00
David LaPalomento	7a9c4cc3be	Merge pull request #1974 from carpasse/feature/canhandlesource ... Extended canHandleSource in media files to consistently guess mime types. Fixes #1833	2015-04-01 23:56:20 -04:00
Matthew McClure	ed76c5b709	Lowercase .js for consistency	2015-04-01 16:51:14 -07:00
Matthew McClure	6cc1b5191b	Update README to warn about master being for 5.0	2015-03-30 16:48:04 -07:00
Steve Heffernan	634d8c39f2	Merge pull request #1964 from LagunaCompany/patch-2 ... Fix spelling error in component.js	2015-03-30 12:49:46 -07:00
Matthew McClure	4805e41ee0	Merge pull request #1927 from juniorlisboa/master ... Legend in pt-Br is wrong.	2015-03-30 12:47:21 -07:00