nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots

Browse source
This commit is contained in:
Raphael 2010-08-17 18:52:35 -07:00
commit 1c91faa2c5
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/views/js/_websocket_js.haml
View file

@ -1,8 +1,7 @@
- if user_signed_in? - if user_signed_in?
- unless request.user_agent.include? "Safari" ||"Chrome" = javascript_include_tag 'FABridge', 'swfobject', 'web_socket'
= javascript_include_tag 'FABridge', 'swfobject', 'web_socket' :javascript
:javascript WebSocket.__swfLocation = "/javascripts/WebSocketMain.swf";
WebSocket.__swfLocation = "/javascripts/WebSocketMain.swf";
:javascript :javascript
$(document).ready(function(){ $(document).ready(function(){
function debug(str){ $("#debug").append("<p>" + str); }; function debug(str){ $("#debug").append("<p>" + str); };