localhots
/
oldhaven
1
0
Fork 0
Code Releases Activity

Fixes

This commit is contained in:
magnolia-fan 2011-11-29 03:56:02 +04:00
parent 94ae2ff3b0
commit aeea80997e
3 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/assets/javascripts/social/facebook.js
View File

@ -1,7 +1,19 @@
(function(d, s, id) { $(function(){
var js, fjs = d.getElementsByTagName(s)[0]; // window.fbAsyncInit = function() {
if (d.getElementById(id)) {return;} // FB.init({
js = d.createElement(s); js.id = id; // appId : 'YOUR_APP_ID', // App ID
js.src = "//connect.facebook.net/en_US/all.js#xfbml=1"; // channelURL : '//WWW.YOUR_DOMAIN.COM/channel.html', // Channel File
fjs.parentNode.insertBefore(js, fjs); // status : true, // check login status
}(document, 'script', 'facebook-jssdk')); // 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'));
});

12
app/controllers/application_controller.rb
View File

@ -11,7 +11,17 @@ class ApplicationController < ActionController::Base
def compile_page params def compile_page params
compiler = lambda do |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] @status = params[:status]
{ {
renderer: "unified", renderer: "unified",

2
lib/tasks/deploy.rake
View File

@ -1,6 +1,6 @@
namespace :deploy do namespace :deploy do
desc "Deploys our application on heroku" 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" desc "Rolls previous deploy revision back"
task :rollback => [:off, :push_previous, :restart, :on] task :rollback => [:off, :push_previous, :restart, :on]