Matt Messinger mattymess

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.

My Angular.js partials live in public/partials.

In development mode I want them served from there, in production I want to have an Angular.js module called templates which simply popuates the template cache for me.

This isn't just about performance in production: it's making sure the partials are embedded in the assets which forces the partial's lifetime to be the same as the assets with no other caching worries when we redeploy the app.

	// JS Module Pattern:
	// http://j.mp/module-pattern

	// Redefine: $, window, document, undefined.
	var APP = (function($, window, document, undefined) {
	// Automatically calls all functions in APP.init
	$(document).ready(function() {
	APP.go();
	});

	bootstrap-tooltip.js
	bootstrap-popover.js
	bootstrap-alert.js
	bootstrap-button.js
	bootstrap-carousel.js
	bootstrap-collapse.js
	bootstrap-dropdown.js
	bootstrap-modal.js
	bootstrap-scrollspy.js
	bootstrap-tab.js

	// Source: https://groups.google.com/forum/#!topic/angular/hVrkvaHGOfc
	// jsFiddle: http://jsfiddle.net/pkozlowski_opensource/PxdSP/14/
	// author: Pawel Kozlowski

	var myApp = angular.module('myApp', []);

	//service style, probably the simplest one
	myApp.service('helloWorldFromService', function() {
	this.sayHello = function() {
	return "Hello, World!"

	Copyright (c) 2015 - Xavier Cambar <@ xcambar_gmail.com>

	Permission is hereby granted, free of charge, to any person obtaining a copy
	of this software and associated documentation files (the "Software"), to deal
	in the Software without restriction, including without limitation the rights
	to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
	copies of the Software, and to permit persons to whom the Software is
	furnished to do so, subject to the following conditions:

	The above copyright notice and this permission notice shall be included in

	<!DOCTYPE html>
	<html>
	<head>
	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"></script>
	<script type="text/javascript" src="https://platform.twitter.com/widgets.js"></script>
	</head>
	<body>
	<script>
	$(document).ready(function() {
	var url = "https://twitter.com/intent/tweet?" + $.param({

	/*
	* Decide on your cache-busting strategy. In this example, we use the current timestamp, which will
	* force a change every time the app is visited, but not every time the partial is loaded within a
	* visit. Even better would be to use a hash of the file's contents to ensure that the file is always
	* reloaded when the file changes and never reloaded when it isn't.
	*/
	var cacheBustSuffix = Date.now();

	// Optionally, expose the cache busting value as a constant so other parts of your app can use it.
	ngModule.constant("cacheBustSuffix", cacheBustSuffix);

	/**
	* testing tasks (using karma to test in the browser). Requires a karma.conf.js for full config
	* single-run testing
	* continuous testing
	*/

	/** base deps, but you may need more specifically for your application */
	var gulp = require('gulp');
	var gutil = require('gulp-util');
	var path = require('path');

	const puppeteer = require('puppeteer');

	const escapeXpathString = str => {
	const splitedQuotes = str.replace(/'/g, `', "'", '`);
	return `concat('${splitedQuotes}', '')`;
	};

	const clickByText = async (page, text) => {
	const escapedText = escapeXpathString(text);
	const linkHandlers = await page.$x(`//a[contains(text(), ${escapedText})]`);