Merge branch 'hotfix/mobile-bookmarklet'

fix view layout determination for mobile bookmarklet
diaspora · Oct 5, 2012 · f45c5be · f45c5be
2 parents ad15897 + a26dc34
commit f45c5be
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb
@@ -11,7 +11,17 @@ class StatusMessagesController < ApplicationController
              :mobile,
              :json
 
-  layout 'blank', :only => [ :bookmarklet ]
+  layout :bookmarklet_layout, :only => :bookmarklet
+
+  # Define bookmarklet layout depending on whether
+  # user is in mobile or desktop mode
+  def bookmarklet_layout
+    if request.format == :mobile
+      'application'
+    else
+      'blank'
+    end
+  end
 
   # Called when a user clicks "Mention" on a profile page
   # @param person_id [Integer] The id of the person to be mentioned

diff --git a/app/views/status_messages/bookmarklet.mobile.haml b/app/views/status_messages/bookmarklet.mobile.haml
@@ -18,4 +18,4 @@
   });
 
 - content_for(:head) do
-  = javascript_include_tag :mobile
+  = javascript_include_tag :jquery, :mobile