Eliazer Braun adardesign

HOWTO: Using FileMerge (opendiff) with Git on OSX

FileMerge (opendiff) can really come in handy when you need to visually compare merging conflicts. Other times it's just a nice visual way to review your days work.

The following method works by creating a simple bash script (git-diff-cmd.sh) that sets us up with the proper command line arguments for Git to pass off files to FileMerge.

Sublime Text 2 – Useful Shortcuts (Mac OS X)

General

⌘T	go to file
⌘⌃P	go to project
⌘R	go to methods
⌃G	go to line
⌘KB	toggle side bar
⌘⇧P	command prompt

About

minimal example of using [phantomjs] with [qunit]

$ phantomjs run-qunit.js file://`pwd`/test.html
'waitFor()' finished in 200ms.
Tests completed in 21 milliseconds.
5 tests of 5 passed, 0 failed.

	(function($) {
	$.fn.clippy = function(text, bgcolor) {
	if (!bgcolor) {
	var node = $(this);
	while (node.css('background-color') == 'transparent' && node.length) {
	node = node.parent();
	}
	if (!node.length) {
	bgcolor = '#ffffff';
	} else {

	/*
	To avoid polluting the global namespace this uses an anonymous
	function which is called with either the URL for an external
	JavaScript file or a function. In either case jQuery will be loaded
	from the Google CDN before your code is executed so it's free to
	depend on jQuery without checking for it and can do things like
	jQuery.getScript() to load other components (e.g. jQuery UI),
	stylesheets, etc.
	*/
	(function (target, msg) {

	// 1: how could you rewrite the following to make it shorter?
	if (foo) {
	bar.doSomething(el);
	} else {
	bar.doSomethingElse(el);
	}

	/* Dynamically create a page and navigate to it.
	(and include the page in browser history ) */

	//create markup
	var newPage = $("<div data-role=page data-url=yay><div data-role=header><h1>YAY!!!!</h1></div><div data-role=content><img src=http://bukk.it/yay.gif /></div></div");

	//append it to the page container
	newPage.appendTo( $.mobile.pageContainer );

	//go to it

	DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
	Version 2, December 2004

	Copyright (C) 2011 Mathieu 'p01' Henri - http://www.p01.org/releases/

	Everyone is permitted to copy and distribute verbatim or modified
	copies of this license document, and changing it is allowed as long
	as the name is changed.

	DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE

	# Add to ~/.bash_profile
	function chrome() {
	open $@ --args --allow-file-access-from-files
	}

	# Usage - chrome index.html

	# now you don't have to worry about those pesky local XHR issues in Chrome.

	var json;

	json = [
	{
	foo: {
	bar: ['ka', 'boom']
	}
	}, {
	foo: {
	bar: ['sna', 'fu']

Eliazer Braun adardesign

HOWTO: Using FileMerge (opendiff) with Git on OSX

Sublime Text 2 – Useful Shortcuts (Mac OS X)

General

About

Installation