Gkatsev karma chameleon #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Added information on MIME type server configuration to self-hosting instructions in setup.md
…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
Conflicts: src/js/lib.js
Updates for videojs#1093
Included self-hosting MIME type instructions
Added a more explicit MIME type note in setup. Moved to a footnote and made comment more verbose to avoid confusion.
Added line to the changelog for PR merge.
Squashed commit of the following: commit 81d7859 Author: Steve Heffernan <[email protected]> Date: Mon May 12 12:53:59 2014 -0700 Removed unneeded comments commit c7ad732 Author: Steve Heffernan <[email protected]> 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 <[email protected]> Date: Wed May 7 15:38:31 2014 -0700 Fixed the error display to hide by default commit 561c3f8 Author: Steve Heffernan <[email protected]> Date: Mon May 5 10:44:47 2014 -0700 Added support for displaying a message for the error. commit 2214207 Author: Steve Heffernan <[email protected]> Date: Fri May 2 17:18:22 2014 -0700 Updated spinner to hide on all errors commit 95d7e70 Author: Steve Heffernan <[email protected]> Date: Fri May 2 15:37:44 2014 -0700 Exported ErrorDisplay commit 11ca9cd Author: Steve Heffernan <[email protected]> Date: Fri May 2 15:35:46 2014 -0700 Updated flash tech to support new errors commit 56cbe66 Author: Steve Heffernan <[email protected]> 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 <[email protected]> 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.
…HTML5 tech triggers it. fixes videojs#1208 fixes videojs#1207 fixes videojs#1193
- use triple equals - don't block play call on error
…atsev-karma-chameleon Conflicts: package.json
| @@ -51,6 +51,7 @@ module.exports = function(config) { | |||
|
|
|||
| files: [ | |||
| '../test/karma-qunit-shim.js', | |||
| '../node_modules/sinon/pkg/sinon.js', | |||
There was a problem hiding this comment.
There's a karma plugin for sinon that handles this. You include the plugin and say you're using the sinon framework. Supposedly better than just including the file here.
|
Yeah, |
gkatsev
pushed a commit
that referenced
this pull request
Jul 17, 2014
Made the src method return the player when setting
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I merged with master to test, but you might want to rebase this instead. After merging I was able to fix issues with missing Sinon and component files shown in the last commit.
I wasn't able to fix an issue where player().trigger appears to be undefined for some reason. It only fails in the Karma tests, not the qunit tests. Can you see if that happens for you too?