remove keymaster dependency

This commit is contained in:
albert
2012-09-19 16:53:36 -04:00
parent f15edff392
commit 858a8ed72a
6 changed files with 9 additions and 10 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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);
}

View File

@@ -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() });
});

View File

@@ -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();

View File

@@ -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;