From aeea80997edbe2c12ea02ab6da788e5be6856c64 Mon Sep 17 00:00:00 2001
From: magnolia-fan <magnolia_fan@me.com>
Date: Tue, 29 Nov 2011 03:56:02 +0400
Subject: [PATCH] Fixes

---
 app/assets/javascripts/social/facebook.js | 26 +++++++++++++++++------
 app/controllers/application_controller.rb | 12 ++++++++++-
 lib/tasks/deploy.rake                     |  2 +-
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/social/facebook.js b/app/assets/javascripts/social/facebook.js
index e6a8ccd..ec471ec 100644
--- a/app/assets/javascripts/social/facebook.js
+++ b/app/assets/javascripts/social/facebook.js
@@ -1,7 +1,19 @@
-(function(d, s, id) {
-  var js, fjs = d.getElementsByTagName(s)[0];
-  if (d.getElementById(id)) {return;}
-  js = d.createElement(s); js.id = id;
-  js.src = "//connect.facebook.net/en_US/all.js#xfbml=1";
-  fjs.parentNode.insertBefore(js, fjs);
-}(document, 'script', 'facebook-jssdk'));
\ No newline at end of file
+$(function(){
+  // window.fbAsyncInit = function() {
+  //   FB.init({
+  //     appId      : 'YOUR_APP_ID', // App ID
+  //     channelURL : '//WWW.YOUR_DOMAIN.COM/channel.html', // Channel File
+  //     status     : true, // check login status
+  //     cookie     : true, // enable cookies to allow the server to access the session
+  //     oauth      : true, // enable OAuth 2.0
+  //     xfbml      : true  // parse XFBML
+  //   });
+  // };
+  (function(d, s, id) {
+    var js, fjs = d.getElementsByTagName(s)[0];
+    if (d.getElementById(id)) {return;}
+    js = d.createElement(s); js.id = id;
+    js.src = "//connect.facebook.net/en_US/all.js#xfbml=1";
+    fjs.parentNode.insertBefore(js, fjs);
+  }(document, 'script', 'facebook-jssdk'));
+});
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 94d0772..c93e5d8 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -11,7 +11,17 @@ class ApplicationController < ActionController::Base
   
   def compile_page params
     compiler = lambda do |params|
-      @data = params[:data].is_a?(Proc) ? params[:data].call : params[:data].serialize unless params[:data].nil?
+      @data = {}
+      unless params[:data].nil?
+        if params[:data].is_a?(Proc)
+          @data = params[:data].call
+        elsif params[:data].is_a?(Hash)
+          @data = params[:data]
+        else
+          @data = params[:data].serialize
+        end
+      end
+      
       @status = params[:status]
       {
         renderer: "unified",
diff --git a/lib/tasks/deploy.rake b/lib/tasks/deploy.rake
index 65dcef7..527be47 100644
--- a/lib/tasks/deploy.rake
+++ b/lib/tasks/deploy.rake
@@ -1,6 +1,6 @@
 namespace :deploy do
   desc "Deploys our application on heroku"
-  task :run => [:off, :push, :migrate, :restart, :on, :tag]
+  task :run => [:off, :push, :migrate, :restart, :on]
 
   desc "Rolls previous deploy revision back"
   task :rollback => [:off, :push_previous, :restart, :on]