diff --git a/autoload/SpaceVim/layers/lang/javascript.vim b/autoload/SpaceVim/layers/lang/javascript.vim
index 0ef0ddff2..78c7c0527 100644
--- a/autoload/SpaceVim/layers/lang/javascript.vim
+++ b/autoload/SpaceVim/layers/lang/javascript.vim
@@ -1,17 +1,29 @@
 function! SpaceVim#layers#lang#javascript#plugins() abort
-    let plugins = []
-    call add(plugins,['pangloss/vim-javascript', { 'on_ft' : ['javascript']}])
-    if has('nvim')
-        call add(plugins,['carlitux/deoplete-ternjs',           { 'on_ft' : ['javascript']}])
-    else
-        call add(plugins,['ternjs/tern_for_vim',                { 'on_ft' : ['javascript'],
-                    \ 'build' : 'npm install',
-                    \ }])
-    endif
-    call add(plugins,['othree/javascript-libraries-syntax.vim', { 'on_ft' : ['javascript','coffee','ls','typescript']}])
-    call add(plugins,['mmalecki/vim-node.js',                   { 'on_ft' : ['javascript']}])
-    call add(plugins,['othree/yajs.vim',                        { 'on_ft' : ['javascript']}])
-    call add(plugins,['othree/es.next.syntax.vim',              { 'on_ft' : ['javascript']}])
-    call add(plugins,['maksimr/vim-jsbeautify',                 { 'on_ft' : ['javascript']}])
-    return plugins
+  let plugins = []
+  call add(plugins,['pangloss/vim-javascript', { 'on_ft' : ['javascript']}])
+  if has('nvim')
+    call add(plugins,['carlitux/deoplete-ternjs',           { 'on_ft' : ['javascript']}])
+  endif
+  call add(plugins,['ternjs/tern_for_vim',                { 'on_ft' : ['javascript'],
+        \ 'build' : 'npm install',
+        \ }])
+  call add(plugins,['othree/javascript-libraries-syntax.vim', { 'on_ft' : ['javascript','coffee','ls','typescript']}])
+  call add(plugins,['mmalecki/vim-node.js',                   { 'on_ft' : ['javascript']}])
+  call add(plugins,['othree/yajs.vim',                        { 'on_ft' : ['javascript']}])
+  call add(plugins,['othree/es.next.syntax.vim',              { 'on_ft' : ['javascript']}])
+  call add(plugins,['maksimr/vim-jsbeautify',                 { 'on_ft' : ['javascript']}])
+  return plugins
 endfunction
+
+function! SpaceVim#layers#lang#javascript#config() abort
+  call SpaceVim#mapping#gd#add('javascript', function('s:gotodef'))
+endfunction
+
+function! s:gotodef() abort
+  if exists(':TernDef')
+    TernDef
+  endif
+endfunction
+
+
+" vim:set et sw=2 cc=80:
diff --git a/config/plugins/deoplete.vim b/config/plugins/deoplete.vim
index 25e6e70cd..a242f93af 100644
--- a/config/plugins/deoplete.vim
+++ b/config/plugins/deoplete.vim
@@ -39,7 +39,10 @@ let g:deoplete#omni#input_patterns.perl = get(g:deoplete#omni#input_patterns, 'p
       \])
 
 " javascript
-let g:deoplete#omni#input_patterns.javascript = get(g:deoplete#omni#input_patterns, 'javascript', ['[^. \t0-9]\.\w*'])
+"let g:deoplete#omni#input_patterns.javascript = get(g:deoplete#omni#input_patterns, 'javascript', ['[^. \t0-9]\.\w*'])
+let g:deoplete#ignore_sources.javascript = get(g:deoplete#ignore_sources, 'javascript', ['omni'])
+call deoplete#custom#set('ternjs', 'mark', 'tern')
+call deoplete#custom#set('ternjs', 'rank', 9999)
 
 " php
 let g:deoplete#omni#input_patterns.php = get(g:deoplete#omni#input_patterns, 'php', [