1
0
mirror of https://github.com/videojs/video.js.git synced 2024-12-04 10:34:51 +02:00
Commit Graph

646 Commits

Author SHA1 Message Date
Steve Heffernan
31033659bc Updated code samples to support github highlighting 2012-11-14 14:51:31 -08:00
Steve Heffernan
2c3f7f7177 Testing code highlighting 2012-11-14 14:42:06 -08:00
Steve Heffernan
dfbd21f111 Removed jekyll headers from docs. 2012-11-14 14:34:13 -08:00
Steve Heffernan
fc6d1b1229 Merge branch 'hotfix/fix-chrome-seeking-spinner' fixes #240
Conflicts:
	src/controls.js
2012-11-12 17:32:44 -08:00
Steve Heffernan
efb357f841 Adding line to CHANGELOG: Fixed chrome spinner continuing on seek 2012-11-12 17:29:12 -08:00
Steve Heffernan
a3038226f1 Bumping version to 3.2.3. 2012-11-12 17:28:53 -08:00
Steve Heffernan
a722498191 Merge branch 'dan/fix_chrome_seeking_spinner' of git://github.com/onyxrev/video-js into hotfix/fix-chrome-seeking-spinner 2012-11-12 17:18:07 -08:00
Dan Connor
180c75b3a2 fix for loading spinner persisting on screen after programatic seek in Chrome 2012-11-06 16:38:35 -08:00
Annika Lindstedt
609ecf1f10 Update src/player.js
A nice feedback message for users who don't have a compatible HTML5 browser or Flash Player.
2012-10-31 16:19:20 +01:00
Steve Heffernan
8eba022c0c Merge pull request #215 from heff/jhurliman-youtube
Jhurliman youtube
2012-08-13 13:50:08 -07:00
Steve Heffernan
fffa9ddcab Updated youtube.html to work 2012-08-13 13:46:01 -07:00
Steve Heffernan
0edfae58eb Re-organized playback tech location in source. 2012-08-13 13:34:40 -07:00
Steve Heffernan
d71b0858d4 Added jhurliman's YouTube updates. 2012-08-10 17:25:14 -07:00
Steve Heffernan
9343610596 Merge pull request #185 from program247365/patch-1
Updated firebug-lite to the latest release.
2012-08-07 16:27:06 -07:00
Steve Heffernan
5e8b6c8455 Merge pull request #192 from eikes/master
Make the components available in the "ready" callback
2012-08-07 16:12:15 -07:00
Steve Heffernan
f18cbffaa5 Merge pull request #208 from caioariede/master
loadingSpinner is not showing off after seek
2012-08-07 15:47:29 -07:00
Steve Heffernan
9d49f1487d small change 2012-08-01 14:35:08 -07:00
Steve Heffernan
8827b4c9cb small test change 2012-08-01 14:24:33 -07:00
Caio Ariede
51181f6a5d Removes loadingSpinner when seek is complete 2012-07-26 10:08:55 -03:00
Steve Heffernan
5758472d2f Merge branch 'feature/disable-components' 2012-06-28 16:37:26 -07:00
Steve Heffernan
c9fa0be0e0 Adding line to CHANGELOG: Allow disabling of default components 2012-06-28 16:37:25 -07:00
Steve Heffernan
94044afe74 Allow disabling of default components. 2012-06-28 16:36:40 -07:00
Steve Heffernan
448a70d2cc Added paused to docs. 2012-06-20 10:29:07 -07:00
Eike Send
7502785062 make the components available in the ready callback as well 2012-05-25 11:59:53 +02:00
Kevin Ridgway
b98ecb7fbc Updated firebug-lite to the latest release. 2012-05-10 15:40:48 -03:00
Steve Heffernan
c189332ca3 Removed merge file. 2012-05-03 12:35:14 -07:00
Steve Heffernan
11a9e88d42 Merge branch 'hotfix/multiple-control-fades-fix'
Conflicts:
	src/controls.js
2012-05-02 20:57:49 -07:00
Steve Heffernan
3540fcfee8 Merge branch 'hotfix/multiple-control-fades-fix' into stable 2012-05-02 20:55:57 -07:00
Steve Heffernan
f82312e5fb Adding line to CHANGELOG: Fixed error with multiple controls fading listeners 2012-05-02 20:55:57 -07:00
Steve Heffernan
aa7d5a2839 Bumping version to 3.2.2. 2012-05-02 20:55:35 -07:00
Steve Heffernan
a787b5ca3a Fixed multiple event listeners added for controls fading on play event. fixes #173 2012-05-02 20:54:40 -07:00
Steve Heffernan
290d1c1ba4 Nothing. 2012-05-02 20:45:33 -07:00
Steve Heffernan
048b808153 Merge branch 'feature/duration-cacheing' 2012-04-25 15:20:07 -07:00
Steve Heffernan
8bd70b6060 Adding line to CHANGELOG: Duration is now setable (need ed for HLS m3u8 files) 2012-04-25 15:20:07 -07:00
Steve Heffernan
8c73d8f62c Made duration setable and cached. 2012-04-25 15:15:33 -07:00
Steve Heffernan
b0061f0e30 Merge branch 'feature/event-binding-return-player' 2012-04-18 15:56:38 -07:00
Steve Heffernan
2ee7ae0448 Adding line to CHANGELOG: Event binders (on/off/one) now return the player instance 2012-04-18 15:56:38 -07:00
Steve Heffernan
610ad964d0 Made event binders return the player object. 2012-04-18 15:55:39 -07:00
Steve Heffernan
452669e80a Merge branch 'feature/stop-restart-on-ended' 2012-04-12 15:22:36 -07:00
Steve Heffernan
cfd6b4d670 Adding line to CHANGELOG: Stopped player from going back to beginningg on ended event. 2012-04-12 15:22:36 -07:00
Steve Heffernan
dd8c2a2140 Added pause back in on ended so play button goes back to triangle and playing event is fired again. 2012-04-12 15:21:30 -07:00
Steve Heffernan
7d9b0e2629 Stopped player from going back to the beginning on end. 2012-04-12 15:20:14 -07:00
Steve Heffernan
6658c51474 Merge branch 'feature/fluid-width' 2012-04-09 14:56:36 -07:00
Steve Heffernan
7839f2e427 Adding line to CHANGELOG: Added support for percent width/height and fluid layouts 2012-04-09 14:56:36 -07:00
Steve Heffernan
4fb7af6b53 Adjusted width/height to support percents. fixes #163 2012-04-09 14:53:03 -07:00
Steve Heffernan
937b52d9bf Fixed bug that was skipping width/height from tag attributes. 2012-04-09 11:02:51 -07:00
Steve Heffernan
b3d16d1437 Removed unused values ref. 2012-04-06 17:16:16 -07:00
Steve Heffernan
ec07398114 Merge branch 'feature/better-element-load' 2012-04-06 17:15:44 -07:00
Steve Heffernan
1a6c5ffcb9 Adding line to CHANGELOG: Improved load order of elements to reduce reflow. 2012-04-06 17:15:44 -07:00
Steve Heffernan
980b4738f4 Improved load order of page elements to protect againt reflows. 2012-04-06 17:14:45 -07:00