-
Notifications
You must be signed in to change notification settings - Fork 7.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Karma chameleon #1187
Karma chameleon #1187
Conversation
Some platforms produce frequent mousemove events whether or not the mouse has moved. This causes the UI to always be displayed since userActive_ is always `true`. By keeping track of the last mouse position and only firing if the new position is different, we can eleminate the event spam.
Conflicts: dist/video-js/video-js.css dist/video-js/video-js.min.css dist/video-js/video.js
Squashed commit of the following: commit 2c5d4d5 Author: Tom Johnson <seniorflexdeveloper@gmail.com> Date: Tue Apr 1 15:02:37 2014 -0700 update control text for liveDisplay component commit 10f21cc Author: Tom Johnson <seniorflexdeveloper@gmail.com> Date: Tue Apr 1 12:23:20 2014 -0700 whitespace fix commit 6a093d6 Author: Tom Johnson <seniorflexdeveloper@gmail.com> Date: Tue Apr 1 12:21:42 2014 -0700 remove window scope of infinity commit 2dd8284 Author: Tom Johnson <seniorflexdeveloper@gmail.com> Date: Tue Apr 1 12:12:13 2014 -0700 update to fix infinity capitalization. only do css logic on valid duration. set any duration of less than zero to window.Infinity commit f940bef Author: Tom Johnson <seniorflexdeveloper@gmail.com> Date: Tue Apr 1 10:01:27 2014 -0700 update to less than zero on player durationChange commit 554c003 Author: Tom Johnson <seniorflexdeveloper@gmail.com> Date: Mon Mar 31 17:26:13 2014 -0700 update exports, fix tests commit 2fb10cb Author: Tom Johnson <seniorflexdeveloper@gmail.com> Date: Mon Mar 31 13:39:00 2014 -0700 fix tests, remove update display list in LiveDisplay commit bc47c5e Author: Tom Johnson <seniorflexdeveloper@gmail.com> Date: Mon Mar 31 13:13:43 2014 -0700 Basic UI for Live
Included are two sanity check tests for the two areas being checked to make sure that the menu title items are being correctly placed in the actual UL element of the menu. Fixes videojs#1107
Squashed commit of the following: commit d5957da Author: David LaPalomento <dlapalomento@gmail.com> Date: Mon Mar 31 16:22:43 2014 -0400 Peg the volume control to 1.0 on init Setup styles so that the volume control initially renders at full volume. This matches browser behavior where volume is available and saves Javascript from having to manually update the volume control on init. After the initial draw, the volume control is updated dynamically the same way it was before. commit 8bc861f Author: David LaPalomento <dlapalomento@gmail.com> Date: Wed Mar 12 17:16:30 2014 -0400 Don't force sliders to get evaluated on load Since the load and play progress sliders are guaranteed to start from zero, set that through CSS. Calling Slider.prototype.update forces a re-flow because element dimensions are queried and style rules changed. That reflow consistently took around 60ms on my laptop which would mean dropped frames and "jerkiness" on initialization.
…deo.js into coursera-feature/fix-menu-title
small typo fix in code that leads to error
getElementsById -> getElementById
Conflicts: dist/video-js/video-js.css dist/video-js/video-js.min.css dist/video-js/video.js
Added information on MIME type server configuration to self-hosting instructions in setup.md
… into coursera-feature/fix-menu-title
…ff-feature/tech-error
…to heff-feature/tech-error
…ations on the variables must be enclosed in parentheses so the compiler takes as math operations and not as strings.
…owsers that also have JavaScript disabled
Added line to the changelog for PR merge.
Squashed commit of the following: commit 81d7859 Author: Steve Heffernan <steve@zencoder.com> Date: Mon May 12 12:53:59 2014 -0700 Removed unneeded comments commit c7ad732 Author: Steve Heffernan <steve@zencoder.com> Date: Fri May 9 14:29:31 2014 -0700 Addressed comments in videojs#1191 Now clearing errors on loadstart events. Added some default error messages. commit a742239 Author: Steve Heffernan <steve@zencoder.com> Date: Wed May 7 15:38:31 2014 -0700 Fixed the error display to hide by default commit 561c3f8 Author: Steve Heffernan <steve@zencoder.com> Date: Mon May 5 10:44:47 2014 -0700 Added support for displaying a message for the error. commit 2214207 Author: Steve Heffernan <steve@zencoder.com> Date: Fri May 2 17:18:22 2014 -0700 Updated spinner to hide on all errors commit 95d7e70 Author: Steve Heffernan <steve@zencoder.com> Date: Fri May 2 15:37:44 2014 -0700 Exported ErrorDisplay commit 11ca9cd Author: Steve Heffernan <steve@zencoder.com> Date: Fri May 2 15:35:46 2014 -0700 Updated flash tech to support new errors commit 56cbe66 Author: Steve Heffernan <steve@zencoder.com> Date: Fri May 2 13:06:49 2014 -0700 Started on better error handling and displaying in the UI when an error has occurred. commit 740014c Author: Steve Heffernan <steve@zencoder.com> Date: Wed Apr 30 16:11:33 2014 -0700 Added better global log/error/warn functions. Added sinon.js for stubs in tests. Updated grunt version to satisfy peer dependency warning.
I updated to allow running the tests in more browsers via the test task. I also consolidated the |
So, for |
Also, I tested that the "travis pr" thing works, still via TRAVIS_PULL_REQUEST=true grunt test |
…HTML5 tech triggers it. fixes videojs#1208 fixes videojs#1207 fixes videojs#1193
- use triple equals - don't block play call on error
|
||
files: [ | ||
'../test/karma-qunit-shim.js', | ||
"../src/js/core.js", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we can find a way to not duplicate the source file list here that'd be good.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually, yes, we can collapse this down to a glob.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unfortunately, it seems like we may not be able to collapse this into a glob because then the files won't load in the right order.
…atsev-karma-chameleon Conflicts: package.json
tasksMinified, | ||
tasksMinifiedApi; | ||
|
||
grunt.task.run(['jshint', 'less', 'build', 'minify', 'usebanner']); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've had issues with assuming grunt.task.run would happen synchronously inside a function like this. It seems to be working fine here, but just a warning.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
grunt.task.run
queues up the list of tasks to be ran after this function exits. So, basically, this function queues up
- jshint
- less
- build
- minify
- usebanner
- karma:chrome
- karma:minified_chrome
- karma:minfied_api_chrome
to be run.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh interesting. Sorry, I didn't look deep enough to realize you were manipulating the tasks array with this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
And now I understand my previous issues with grunt.task.run... :-P. I was assuming the tasks would be run inline.
chromecanary: { | ||
browsers: ['ChromeCanary'] | ||
}, | ||
chrome: { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What does having these individual browser definitions get us?
This enabled karma testing by default.
Also, it enabled karma testing via saucelabs on travis if the test is initiated by a branch from the main repository, otherwise, it runs the tests in phantomjs using karma. This is because travis ci doesn't export secure credentials on PRs created outside of the main repo.
This is the initial pass of the karma configurations. It should be good to go but it's a bit verbose. I'll be looking into how we can avoid the configuration duplication.