From b1933dc363b48bd57890612e5dfb696ad05a8af0 Mon Sep 17 00:00:00 2001
From: r888888888 <r888888888@gmail.com>
Date: Tue, 16 Jul 2013 17:04:42 -0700
Subject: [PATCH] fixes #1860

---
 app/assets/javascripts/notes.js           |  2 ++
 app/controllers/application_controller.rb | 11 +++++++++++
 2 files changed, 13 insertions(+)

diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js
index bf6d1f578..df2f3ef94 100644
--- a/app/assets/javascripts/notes.js
+++ b/app/assets/javascripts/notes.js
@@ -467,6 +467,7 @@ Danbooru.Note = {
         return;
       }
 
+      $("#image").css("cursor", "crosshair");
       Danbooru.Note.TranslationMode.active = true;
       $(document.body).addClass("mode-translation");
       $("#original-file-link").click();
@@ -479,6 +480,7 @@ Danbooru.Note = {
 
     stop: function() {
       Danbooru.Note.TranslationMode.active = false;
+      $("#image").css("cursor", "auto");
       $("#image").unbind("mousedown", Danbooru.Note.TranslationMode.Drag.start);
       $(window).unbind("mouseup", Danbooru.Note.TranslationMode.Drag.stop);
       $(document.body).removeClass("mode-translation");
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 5b2f3c741..370bc669e 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -8,6 +8,7 @@ class ApplicationController < ActionController::Base
   before_filter :normalize_search
   before_filter :set_started_at_session
   before_filter :api_check
+  before_filter :secure_cookies_check
   layout "default"
 
   rescue_from User::PrivilegeError, :with => :access_denied
@@ -102,4 +103,14 @@ protected
       params[:search] ||= {}
     end
   end
+
+  def secure_cookies_check
+    if true || request.ssl?
+      Danbooru::Application.config.session_store :cookie_store, :key => '_danbooru_session', :secure => true
+    else
+      Danbooru::Application.config.session_store :cookie_store, :key => '_danbooru_session', :secure => false
+    end
+    ap cookies
+    true
+  end
 end