Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

I have no objection to the removing of haml, but breaking our templates ... bad

This commit is contained in:
Sam Saffron 2013-02-08 08:49:58 +11:00
parent 5ee91cc296
commit 470ecf97cc
6 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/facebook/complete.haml
View File

@ -1,6 +0,0 @@
%html
%head
%body
:javascript
window.opener.Discourse.authenticationComplete(#{@data.to_json});
window.close();

2
app/views/facebook/complete.html.erb
View File

@ -2,7 +2,7 @@
<head></head>
<body>
<script type="text/javascript">
window.opener.Discourse.authenticationComplete(#{@data.to_json});
window.opener.Discourse.authenticationComplete(<%=@data.to_json.html_safe%>);
window.close();
</script>
</body>

6
app/views/twitter/complete.haml
View File

@ -1,6 +0,0 @@
%html
%head
%body
:javascript
window.opener.Discourse.authenticationComplete(#{@data.to_json});
window.close();

2
app/views/twitter/complete.html.erb
View File

@ -2,7 +2,7 @@
<head></head>
<body>
<script type="text/javascript">
window.opener.Discourse.authenticationComplete(#{@data.to_json});
window.opener.Discourse.authenticationComplete(<%=@data.to_json.to_json%>);
window.close();
</script>
</body>

6
app/views/user_open_ids/complete.haml
View File

@ -1,6 +0,0 @@
%html
%head
%body
:javascript
window.opener.Discourse.authenticationComplete(#{@data.to_json});
window.close();

4
app/views/user_open_ids/complete.html.erb
View File

@ -2,8 +2,8 @@
<head></head>
<body>
<script type="text/javascript">
window.opener.Discourse.authenticationComplete(#{@data.to_json});
window.opener.Discourse.authenticationComplete(<%=@data.to_json.html_safe%>);
window.close();
</script>
</body>
</html>
</html>