Permalink
Browse files

Merge branch 'hotfix/mobile-bookmarklet'

fix view layout determination for mobile bookmarklet
  • Loading branch information...
2 parents ad15897 + a26dc34 commit f45c5be95cec15c213b2c75041f81371ef3c2e4f @Raven24 Raven24 committed Oct 5, 2012
Showing with 12 additions and 2 deletions.
  1. +11 −1 app/controllers/status_messages_controller.rb
  2. +1 −1 app/views/status_messages/bookmarklet.mobile.haml
@@ -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
@@ -18,4 +18,4 @@
});
- content_for(:head) do
- = javascript_include_tag :mobile
+ = javascript_include_tag :jquery, :mobile

0 comments on commit f45c5be

Please sign in to comment.