If you want to work inside a submodule, it is possible, but first you need to checkout a branch:
1.`cd src/sizzle`
2.`git checkout master`
After you've commited your changes to the submodule, you'll update the jquery project to point to the new commit,
but remember to push the submodule changes before pushing the new jquery commit:
1.`cd src/sizzle`
2.`git push origin master`
3.`cd ..`
4.`git add src/sizzle`
5.`git commit`
The makefile has some targets to simplify submodule handling:
#### `make update_submodules` ####
checks out the commit pointed to byu jquery, but merges your local changes, if any. This target is executed
when you are doing a normal `make`.
#### `make pull_submodules` ####
updates the content of the submoduels to what is probably the latest upstream code
#### `make pull` ####
make a `make pull_submodules` and after that a `git pull`. if you have no remote tracking in your master branch, you can
execute this command as `make pull REMOTE=origin BRANCH=master` instead.
### cleaning ###
If you want to purge your working directory back to the status of upstream, following commands can be used (remember everything you've worked on is gone after these):
1.`git reset --hard upstream/master`
2.`git clean -fdx`
### rebasing ###
For feature/topic branches, you should always used the `--rebase` flag to `git pull`, or if you are usually handling many temporary "to be in a github pull request" branches, run following to automate this:
*`git config branch.autosetuprebase local` (see `man git-config` for more information)
### handling merge conflicts ###
If you're getting merge conflicts when merging, instead of editing the conflicted files manually, you can use the feature
`git mergetool`. Even though the default tool `xxdiff` looks awful/old, it's rather useful.
Following are some commands that can be used there:
*`Ctrl + Alt + M` - automerge as much as possible
*`b` - jump to next merge conflict
*`s` - change the order of the conflicted lines
*`u` - undo an merge
*`left mouse button` - mark a block to be the winner
*`middle mouse button` - mark a line to be the winner
equals(jQuery, $, "ready doesn't provide an event object, instead it provides a reference to the jQuery function, see http://docs.jquery.com/Events/ready#fn");
try{
start();
tab.trigger("back:forth");
});
ok(true,"colon events don't throw");
}catch(e){
ok(false,"colon events die");
};
tab.remove();
});
});
(function(){
// This code must be run before DOM ready!
varnotYetReady,noEarlyExecution,
order=[],
args={};
notYetReady=!jQuery.isReady;
test("jQuery.isReady",function(){
expect(2);
equals(notYetReady,true,"jQuery.isReady should not be true before DOM ready");
equals(jQuery.isReady,true,"jQuery.isReady should be true once DOM is ready");
});
// Create an event handler.
functionmakeHandler(testId){
// When returned function is executed, push testId onto `order` array
// to ensure execution order. Also, store event handler arg to ensure
// the correct arg is being passed into the event handler.
// This assumes that QUnit tests are run on DOM ready!
test("jQuery ready",function(){
expect(10);
ok(noEarlyExecution,"Handlers bound to DOM ready should not execute before DOM ready");
// Ensure execution order.
same(order,["a","b","d","e","c","f"],"Bound DOM ready handlers should execute in bind-order, but those bound with jQuery(document).bind( 'ready', fn ) will always execute last");
// Ensure handler argument is correct.
equals(args.a,jQuery,"Argument passed to fn in jQuery( fn ) should be jQuery");
equals(args.b,jQuery,"Argument passed to fn in jQuery(document).ready( fn ) should be jQuery");
ok(args.cinstanceofjQuery.Event,"Argument passed to fn in jQuery(document).bind( 'ready', fn ) should be an event object");
order=[];
// Now that the ready event has fired, again bind to the ready event
// in every possible way. These event handlers should execute immediately.
jQuery(makeHandler("g"));
equals(order.pop(),"g","Event handler should execute immediately");
equals(args.g,jQuery,"Argument passed to fn in jQuery( fn ) should be jQuery");
jQuery(document).ready(makeHandler("h"));
equals(order.pop(),"h","Event handler should execute immediately");
equals(args.h,jQuery,"Argument passed to fn in jQuery(document).ready( fn ) should be jQuery");
