From 039a1596ca79f0873b526e0c588186127b61fb75 Mon Sep 17 00:00:00 2001
From: Sameer Rahmani <lxsameer@gnu.org>
Date: Sat, 11 Jul 2015 15:31:46 +0430
Subject: [PATCH] default package.el user dir altered to ./packages

---
 .gitignore                        |  3 ++-
 lib/extensions/javascript.el      |  2 ++
 lib/extensions/javascript/init.el | 15 ++++++++-------
 lib/fg42.el                       |  1 +
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index f279128..aba0ca9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ kuso.d/*
 .build/*
 *~
 build.log
-.cask/*
\ No newline at end of file
+.cask/*
+packages/
\ No newline at end of file
diff --git a/lib/extensions/javascript.el b/lib/extensions/javascript.el
index 5960730..1eb19a5 100644
--- a/lib/extensions/javascript.el
+++ b/lib/extensions/javascript.el
@@ -8,6 +8,8 @@
 (depends-on 'js2-refactor)
 (depends-on 'tern)
 (depends-on 'company-tern)
+(depends-on 'jquery-doc)
+
 ;; Extension -------------------------------------
 (extension javascript
 	   :version "2.31"
diff --git a/lib/extensions/javascript/init.el b/lib/extensions/javascript/init.el
index 2a548cc..bd8ab0c 100644
--- a/lib/extensions/javascript/init.el
+++ b/lib/extensions/javascript/init.el
@@ -1,4 +1,9 @@
 ;; Functions -------------------------------------------------
+;;;###autoload
+(defun javascript-callback ()
+  (js2-minor-mode t)
+  (tern-mode t)
+  (jquery-doc-setup))
 
 ;;;###autoload
 (defun extensions/javascript-initialize ()
@@ -11,18 +16,14 @@
            (autoload 'js2-mode "js2-mode" "Javascript mode")
            (autoload 'tern-mode "tern.el" nil t)
 
+
            (add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode))
-           (add-to-list 'auto-mode-alist '("\\.jsx\\'" . js2-mode))
+           ;(add-to-list 'auto-mode-alist '("\\.jsx\\'" . js2-mode))
            (add-to-list 'auto-mode-alist '("\\.json\\'" . js2-mode))
 
-           (add-hook 'js-mode-hook 'js2-minor-mode)
-           (add-hook 'js-mode-hook (lambda () (tern-mode t)))
 
            (add-to-list 'company-backends 'company-tern)
-           (setq js2-highlight-level 3)
-
-
-           (add-hook 'web-mode-hook 'extensions/web-activate-modes)))
+           (setq js2-highlight-level 3)))
 
 
 
diff --git a/lib/fg42.el b/lib/fg42.el
index 2a85b98..aa28b46 100644
--- a/lib/fg42.el
+++ b/lib/fg42.el
@@ -32,6 +32,7 @@
 
 (defun fg42-initialize ()
   "Initialize FG42 editor."
+  (setq package-user-dir (concat fg42-home "/packages"))
   (fpkg-initialize)
   (initialize-extensions))