fixed parsing of swarmUrl in inject.js

[s-a]

Hello,
I added latest google chrome (21) and fixed parsing of swarmUrl in inject.js if URL with hash tag was given.

[s-a]

Regarding to https://github.com/s-a/testswarm/commit/d4191c3f0fcfc62e53aeaee1f0b1e5a6ce677870 there are many files added by mocha sources. It is for sure more usefull with a job sample loading assets from github.

However,
the main changes are here https://github.com/s-a/testswarm/blob/d4191c3f0fcfc62e53aeaee1f0b1e5a6ce677870/js/inject.js#L444

[Krinkle]

Create a new branch in your fork for this bug fix instead of doing it from the same pull request as for master. It doesn't work this way because other commits to your master now get into this merge request.

Like this:

$ git remote add upstream git://github.com/jquery/testswarm.git
$ git branch fix-inject-swarmUrl -t upstream/master
$ git checkout fix-inject-swarmUrl
# .. edit files ...
$ git add js/inject.js
$ git commit
# Push the new branch  (now in HEAD) to your GitHub account (aka "origin") 
$ git push origin HEAD

And then online at https://github.com/s-a/testswarm/tree/fix-inject-swarmUrl you can create a pull request.

Thanks!

[s-a]

Sorry, this is all new for me.
I will try it this evening! Thanks for your detailed description.
So if I understand correct I have to create branches for every pull request from upstream/master?

Or is it ok to create the next branch from "fix-inject-swarmUrl" for a second pull request?

Best regards

[Krinkle]

If you want to update the existing pull request (in other words, fix it) then commit to the same branch again, the pull request will automatically update itself (it is linked to the branch name).

When you want to make a new unrelated change, use a new branch and make sure it is fresh (-t upstream/master).

[Krinkle]

I'm going to mark this pull request "closed" because it is linked to your master. When you make the change in a branch, a new pull request will be created for you.

[s-a]

Done. I Hope its ok now. the command

git branch fix-inject-swarmUrl -t upstream/master 

ended in an error message like "not a valid object".

On git pages it looks different/correct now :)

best regards