Merge remote-tracking branch 'upstream/master'

sources_non_forked/vim-snippets/snippets/javascript/javascript-requirejs.snippets

@@ -0,0 +1,14 @@
+snippet def
+	define(["${1:#dependencies1}"], function (${2:#dependencies2}) {
+		return ${0:TARGET};
+	});
+
+snippet defn
+	define("${1:#name}", ["${2:#dependencies1}"], function (${3:#dependencies2}) {
+		return ${0:TARGET};
+	});
+
+snippet reqjs
+	require(["${1:#dependencies1}"], function (${2:#dependencies2}) {
+		return ${0:TARGET};
+	});

sources_non_forked/vim-snippets/snippets/javascript/javascript.node.snippets

@@ -0,0 +1,50 @@
+# module exports
+snippet ex
+	module.exports = ${1};
+# require
+snippet re
+	var ${1} = require("${2:module_name}");
+# EventEmitter
+snippet on
+	on('${1:event_name}', function(${2:stream}) {
+	  ${3}
+	});
+snippet emit
+	emit('${1:event_name}', ${2:args});
+snippet once
+	once('${1:event_name}', function(${2:stream}) {
+	  ${3}
+	});
+# http. User js function snippet as handler
+snippet http
+	http.createServer(${1:handler}).listen(${2:port_number});
+# net 
+snippet net
+	net.createServer(function(${1:socket}){
+		${1}.on('data', function('data'){
+		  ${2}
+		]});
+		${1}.on('end', function(){
+		  ${3}
+		});
+	}).listen(${4:8124});
+# Stream snippets
+snippet pipe
+	pipe(${1:stream})${2}
+# Express snippets
+snippet eget
+	${1:app}.get('${2:route}', ${3:handler});
+snippet epost
+	${1:app}.post('${2:route}', ${3:handler});
+snippet eput
+	${1:app}.put('${2:route}', ${3:handler});
+snippet edel
+	${1:app}.delete('${2:route}', ${3:handler});
+# process snippets
+snippet stdin
+	process.stdin
+snippet stdout
+	process.stdout
+snippet stderr
+	process.stderr
+