Merge branch 'master' of github.com:tomru/Dotfiles

vim/UltiSnips/javascript-jasmine.snippets

@@ -5,37 +5,37 @@ priority -50
 #
 
 snippet des "Describe (js)" b
-describe('${1:description}', function() {
+describe('${1:description}', () => {
 	$0
 });
 endsnippet
 
 snippet it "it (js)" b
-it('${1:description}', function() {
+it('${1:description}', () => {
 	$0
 });
 endsnippet
 
 snippet bef "before each (js)" b
-beforeEach(function() {
+beforeEach(() => {
 	$0
 });
 endsnippet
 
 snippet aft "after each (js)" b
-afterEach(function() {
+afterEach(() => {
 	$0
 });
 endsnippet
 
 snippet befa "before all (js)" b
-beforeAll(function() {
+beforeAll(() => {
 	$0
 });
 endsnippet
 
 snippet afta "after all (js)" b
-afterAll(function() {
+afterAll(() => {
 	$0
 });
 endsnippet
@@ -63,7 +63,7 @@ jasmine.stringMatching("${1:matcher}")
 endsnippet
 
 snippet ru "runs (js)" b
-runs(function() {
+runs(() => {
 	$0
 });
 endsnippet

vim/UltiSnips/javascript.snippets

@@ -5,47 +5,11 @@ priority -30
 snippet def "define an AMD module"
 define([
 	'${1:backbone}'
-], function( 
-	${2:Name})
-) {
+], ( 
+	${2:Backbone})
+) => {
 	$0
 }
 endsnippet
 
-# Jasmine
-snippet des "Describe (js)" b
-describe('${1:description}', function() {
-	$0
-});
-endsnippet
-
-snippet it "it (js)" b
-it('${1:description}', function() {
-	$0
-});
-endsnippet
-
-snippet bef "before each (js)" b
-beforeEach(function() {
-	$0
-});
-endsnippet
-
-snippet aft "after each (js)" b
-afterEach(function() {
-	$0
-});
-endsnippet
-
-snippet befa "before all (js)" b
-beforeAll(function() {
-	$0
-});
-endsnippet
-
-snippet afta "after all (js)" b
-afterAll(function() {
-	$0
-});
-endsnippet
 # vim:ft=snippets:

vimrc

@@ -256,14 +256,14 @@ let g:gutentags_file_list_command = {
     \ }
 
 "" fzf
-nnoremap <leader>b :Buffers<cr>
-nnoremap <leader>f :GFiles<cr>
-nnoremap <leader>F :Files<cr>
-vnoremap <leader>f y:Files <c-r>"<cr>
-nnoremap <leader>a :Ag<space>
-vnoremap <leader>a y:Ag <c-r>"<cr>
-nnoremap <leader>A :Ag <c-r><c-w><cr>
-nnoremap <leader>c :Commits<cr>
+nnoremap <leader>fb :Buffers<cr>
+nnoremap <leader>ff :GFiles<cr>
+nnoremap <leader>FF :Files<cr>
+vnoremap <leader>ff y:Files <c-r>"<cr>
+nnoremap <leader>fa :Ag<space>
+vnoremap <leader>fa y:Ag <c-r>"<cr>
+nnoremap <leader>FA :Ag <c-r><c-w><cr>
+nnoremap <leader>fc :Commits<cr>
 
 "" minibufexpl
 map <Leader>t :MBEToggle<cr>