From 485c7f18006f13f2c1f831d727855051ca0a5722 Mon Sep 17 00:00:00 2001
From: Yan Pritzker <yan@pritzker.ws>
Date: Fri, 16 Nov 2012 09:31:59 -0600
Subject: [PATCH] Bundles for better javascript highlighting and tag
 highlighting

---
 .gitmodules                         | 10 ++++++++++
 vim/bundle/itspriddle-vim-jquery    |  1 +
 vim/bundle/vim-scripts-TagHighlight |  1 +
 vim/plugin/settings/jquery.vim      |  1 +
 vim/plugin/settings/solarized.vim   | 17 +++++++++++++++++
 vim/plugin/settings/yadr-keymap.vim |  4 +++-
 6 files changed, 33 insertions(+), 1 deletion(-)
 create mode 160000 vim/bundle/itspriddle-vim-jquery
 create mode 160000 vim/bundle/vim-scripts-TagHighlight
 create mode 100644 vim/plugin/settings/jquery.vim

diff --git a/.gitmodules b/.gitmodules
index 75d1c740..cc7cf1e6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -362,3 +362,13 @@
 	path = vim/bundle/tpope-vim-ragtag
 	url = https://github.com/tpope/vim-ragtag
   ignore = dirty
+[submodule "vim/bundle/vim-scripts-TagHighlight"]
+	path = vim/bundle/vim-scripts-TagHighlight
+	url = https://github.com/vim-scripts/TagHighlight.git
+  ignore = dirty
+[submodule "vim/bundle/jelera-vim-javascript-syntax"]
+	path = vim/bundle/jelera-vim-javascript-syntax
+	url = https://github.com/jelera/vim-javascript-syntax.git
+[submodule "vim/bundle/itspriddle-vim-jquery"]
+	path = vim/bundle/itspriddle-vim-jquery
+	url = https://github.com/itspriddle/vim-jquery.git
diff --git a/vim/bundle/itspriddle-vim-jquery b/vim/bundle/itspriddle-vim-jquery
new file mode 160000
index 00000000..61890d8e
--- /dev/null
+++ b/vim/bundle/itspriddle-vim-jquery
@@ -0,0 +1 @@
+Subproject commit 61890d8e5ba8a873526fb91c6484aa445cc20b56
diff --git a/vim/bundle/vim-scripts-TagHighlight b/vim/bundle/vim-scripts-TagHighlight
new file mode 160000
index 00000000..9ee76028
--- /dev/null
+++ b/vim/bundle/vim-scripts-TagHighlight
@@ -0,0 +1 @@
+Subproject commit 9ee760281ab6e8443ea9bb9ae484b0233b3f0e29
diff --git a/vim/plugin/settings/jquery.vim b/vim/plugin/settings/jquery.vim
new file mode 100644
index 00000000..e651d7e0
--- /dev/null
+++ b/vim/plugin/settings/jquery.vim
@@ -0,0 +1 @@
+autocmd BufRead,BufNewFile *.js set ft=javascript syntax=jquery
diff --git a/vim/plugin/settings/solarized.vim b/vim/plugin/settings/solarized.vim
index 48ab2cdc..c8583317 100644
--- a/vim/plugin/settings/solarized.vim
+++ b/vim/plugin/settings/solarized.vim
@@ -16,5 +16,22 @@ hi! link rubyRailsARValidationMethod Title
 hi! link rubyRailsMethod Title
 hi! link MatchParen DiffText
 
+hi! link CTagsModule Type
+hi! link CTagsClass Type
+hi! link CTagsMethod Identifier
+
+hi! link javascriptFuncName Type
+hi! link javascriptFunction Statement
+hi! link javascriptThis Statement
+hi! link javascriptParens Normal
+hi! link jOperators javascriptStringD
+hi! link jId Title
+hi! link jClass Title
+
+" Brighten the regular text
+hi! Normal guifg=#93a1a1
+hi! Constant guifg=#00ADCE
+hi! link htmlLink Include
+
 " Enforce the colors set here
 au VimEnter * so ~/.vim/plugin/settings/solarized.vim
diff --git a/vim/plugin/settings/yadr-keymap.vim b/vim/plugin/settings/yadr-keymap.vim
index e0b783bf..9d3ee930 100644
--- a/vim/plugin/settings/yadr-keymap.vim
+++ b/vim/plugin/settings/yadr-keymap.vim
@@ -112,7 +112,9 @@ nnoremap <silent> <D-k> {
 autocmd FileType ruby map <buffer> <D-j> ]m
 autocmd FileType ruby map <buffer> <D-k> [m
 autocmd FileType rspec map <buffer> <D-j> }
-autocmd FileType rspec map <buffer> <D-k> {
+autocmd FileType rspec map <buffer> <D-j> }
+autocmd FileType javascript map <buffer> <D-k> {
+autocmd FileType javascript map <buffer> <D-k> {
 
 
 " Command-/ to toggle comments