From 858a8ed72aa684d4470055d0b3d325a1f4c7dafd Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Wed, 19 Sep 2012 16:53:36 -0400
Subject: [PATCH] remove keymaster dependency

---
 INSTALL.debian                        | 2 +-
 app/assets/javascripts/application.js | 1 -
 app/assets/javascripts/notes.js       | 2 +-
 app/assets/javascripts/paginator.js   | 4 ++--
 app/assets/javascripts/posts.js       | 4 ++--
 script/install/nginx.conf             | 6 +++---
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/INSTALL.debian b/INSTALL.debian
index 64ebc4fac..6ae9bfc30 100644
--- a/INSTALL.debian
+++ b/INSTALL.debian
@@ -74,7 +74,7 @@ sudo -u danbooru bash -l -c 'gem install --no-ri --no-rdoc capistrano-ext'
 sudo -u danbooru bash -l -c 'gem install --no-ri --no-rdoc bundler'
 
 # Install Passenger
-sudo -u danbooru bash -l -c 'gem install --no-ri --no-rdoc -v 3.0.14 passenger'
+sudo -u danbooru bash -l -c 'gem install --no-ri --no-rdoc -v 3.0.17 passenger'
 /home/danbooru/.rbenv/versions/$RUBY_VERSION/bin/passenger-install-nginx-module --auto --auto-download --prefix=/opt/nginx
 rm -f /opt/nginx/conf/*.default
 
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 43d65516f..47eb5a79d 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -1,6 +1,5 @@
 //= require jquery-1.7.1.min.js
 //= require jquery-ui-1.8.12.custom.min.js
-//= require keymaster.min.js
 //= require jquery.hotkeys.js
 //= require jquery.timeout.js
 //= require rails.js
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js
index 8c23b43a1..3f0005cec 100644
--- a/app/assets/javascripts/notes.js
+++ b/app/assets/javascripts/notes.js
@@ -489,7 +489,7 @@ Danbooru.Note = {
 $(function() {
   if ($("#c-posts").length && $("#a-show").length) {
     $("#translate").one("click", Danbooru.Note.TranslationMode.start);
-    key("n", Danbooru.Note.TranslationMode.start);
+    $(document).bind("keypress", "n", Danbooru.Note.TranslationMode.start);
     Danbooru.Note.load_all();
     $("#image").click(Danbooru.Note.Box.toggle_all);
   }
diff --git a/app/assets/javascripts/paginator.js b/app/assets/javascripts/paginator.js
index 373f3db1d..1d2f55bf8 100644
--- a/app/assets/javascripts/paginator.js
+++ b/app/assets/javascripts/paginator.js
@@ -15,7 +15,7 @@
 })();
 
 $(function() {
-  key('right', function(){ Danbooru.Paginator.next_page() });
-  key('left', function(){ Danbooru.Paginator.prev_page() });
+  $(document).bind("keypress", 'right', function(){ Danbooru.Paginator.next_page() });
+  $(document).bind("keypress", 'left', function(){ Danbooru.Paginator.prev_page() });
 });
 
diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js
index f37c506a9..be864dd50 100644
--- a/app/assets/javascripts/posts.js
+++ b/app/assets/javascripts/posts.js
@@ -22,13 +22,13 @@
   }
   
   Danbooru.Post.initialize_shortcuts = function() {
-    key('/', function(e) {
+    $(document).bind("keypress", '/', function(e) {
       $("#tags").trigger("focus"); 
       e.preventDefault();
     });
     
     if ($("#a-show").length) {
-      key('e', function(e) {
+      $(document).bind("keypress", 'e', function(e) {
         $("#post-edit-link").trigger("click");
         $("#post_tag_string").trigger("focus");
         e.preventDefault();
diff --git a/script/install/nginx.conf b/script/install/nginx.conf
index fcec19aee..6007b0c92 100755
--- a/script/install/nginx.conf
+++ b/script/install/nginx.conf
@@ -6,8 +6,8 @@ events {
 }
 
 http {
-    passenger_root /usr/local/rvm/gems/ruby-1.9.3-p125/gems/passenger-3.0.12;
-    passenger_ruby /usr/local/rvm/wrappers/default/ruby;
+    passenger_root /home/danbooru/.rbenv/versions/1.9.3-p194/lib/ruby/gems/1.9.1/gems/passenger-3.0.17;
+    passenger_ruby /home/danbooru/.rbenv/versions/1.9.3-p194/bin/ruby;
     passenger_user_switching on;
     passenger_default_user danbooru;
     rails_spawn_method smart;
@@ -16,7 +16,7 @@ http {
     include       mime.types;
     default_type  application/octet-stream;
 
-    sendfile        on;
+    sendfile      on;
 
     gzip on;
     gzip_http_version 1.1;