V2.0 swift jazzcat merge #117

Merged
merged 11 commits into from Mar 21, 2013

Conversation

2 participants
Contributor

jansepar commented Mar 20, 2013

!!! DO NOT MERGE SPACE CADET !!!

This pull request is open to review the differences between new jazzcat and old jazzcat.

Contributor

jansepar commented Mar 21, 2013

Thanks @romanrudenko for your efforts on the updated Jazzcat! I've also brought in all of the tests and hacked them together to work with 2.0, so we have just as much coverage as we had before. This is ready to merge into the swift branch. 👍

jansepar added a commit that referenced this pull request Mar 21, 2013

@jansepar jansepar merged commit f44bcdf into v2.0-swift-feature-branch Mar 21, 2013

1 check passed

default
Details
@@ -354,6 +354,12 @@ Capture.prototype.escapedHTMLString = function() {
* Rewrite the document with a new html string
*/
Capture.prototype.render = function(htmlString) {
+ if (!htmlString) {
@johnboxall

johnboxall Mar 22, 2013

Owner

@jansepar hoist this var declaration?

@jansepar

jansepar Mar 22, 2013

Contributor

TOO BAD ITS ALREADY MERGED SUCKAAA. lol jk sure I'll make the change in the branch that this has been merged into.

@tedtate tedtate deleted the v2.0-swift-jazzcat-merge branch Dec 8, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment