big fat batch of changes #97
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
…cces function to cleanup timeout and make sure complete is also run.
…node test (test gives error on multiple cookies)
Conflicts: reqwest.js
| @@ -1,7 +1,8 @@ | |||
| .PHONY: boosh test | |||
|
|
|||
| boosh: | |||
| node_modules/smoosh/bin/smoosh make build.json | |||
| @node -e "var json = require('./build');json.JSHINT_OPTS=JSON.parse(require('fs').readFileSync('./.jshintrc'));require('fs').writeFileSync('./build.json', JSON.stringify(json, null, 2))" | |||
There was a problem hiding this comment.
keep build.json and .jshintrc consistent.
| try { | ||
| ok(err && err.status === 0, 'correctly caught timeout') | ||
| } catch (e) { | ||
| ok(true, 'IE is a troll') |
There was a problem hiding this comment.
this is for the can't touch properties on aborted xhr in IE thing. caveat emptor, not our problem.
|
most of the rest of the changes are either reformatting or @bartsidee's original changes |
|
I don't remember where this is at so I'm just going to press the merge button and cross my fingers. |
|
HAHAHAHAHHAA |
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.
Pulled in #96 then got caught in a death-spiral of JSHint, reformatting and fixing bugs and tests for other (and older) browsers; some recent tests were obviously just targeting Chrome.
Submitting as a PR rather than just merging cause it's kind of major and you might want to have a browse over it @ded.
Will comment inline.