Skip to content

Commit

Permalink
Merge branch 'release/0.5.8'
Browse files Browse the repository at this point in the history
  • Loading branch information
potomak committed Apr 15, 2012
2 parents b1fa937 + 2653afa commit afa37b1
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
1 change: 0 additions & 1 deletion public/stylesheets/style.css
Expand Up @@ -947,7 +947,6 @@ p.sep a {
width: 25px; width: 25px;
height: 25px; height: 25px;
margin-right: 15px; margin-right: 15px;
margin-bottom: 30px;
} }


#requests .isometric::after { #requests .isometric::after {
Expand Down
2 changes: 1 addition & 1 deletion version.rb
@@ -1 +1 @@
DRAW_VERSION = "0.5.7".freeze unless defined?(DRAW_VERSION) DRAW_VERSION = "0.5.8".freeze unless defined?(DRAW_VERSION)
7 changes: 4 additions & 3 deletions views/shared/facebook.haml
Expand Up @@ -9,7 +9,9 @@
frictionlessRequests: true frictionlessRequests: true
}); });


manageRequests(#{params[:request_ids].split(',').to_json if params[:request_ids]}); $(document).ready(function() {
manageRequests(#{params[:request_ids].split(',').to_json if params[:request_ids]});
});
}; };


(function() { (function() {
Expand All @@ -28,8 +30,7 @@
$('#requests').append( $('#requests').append(
"<div class='request block' id='request_" + response.id + "'>" + "<div class='request block' id='request_" + response.id + "'>" +
"<div class='from left isometric'><img class='avatar' width='25' src='http://graph.facebook.com/" + response.from.id + "/picture?type=square'></div>" + "<div class='from left isometric'><img class='avatar' width='25' src='http://graph.facebook.com/" + response.from.id + "/picture?type=square'></div>" +
"<div class='from_name'>" + response.from.name + "</div>" + "<div class='from_name'>" + response.from.name + ": <i>Would you like to fork <a href='" + response.data + "'>my drawing</a>?</i></div>" +
"<div class='object'>Would you like to fork <a href='" + response.data + "'>my drawing</a>?</div>" +
"<div class='delete'><a href='#' onclick='deleteRequest(\"" + response.id + "\")'>Delete notification</a></div>" + "<div class='delete'><a href='#' onclick='deleteRequest(\"" + response.id + "\")'>Delete notification</a></div>" +
"</div>" "</div>"
); );
Expand Down

0 comments on commit afa37b1

Please sign in to comment.