Permalink
Browse files

Merge pull request #8739 from franckverrot/remove_activexobject

Remove the fallback onto `ActiveXObject("Microsoft.XMLHTTP")`.
  • Loading branch information...
2 parents a951136 + 8ea480b commit c9402c0258e85f125ce7cdc292381eb8b9dcbbe0 @guilleiguaran guilleiguaran committed Jan 4, 2013
Showing with 2 additions and 6 deletions.
  1. +2 −6 railties/lib/rails/templates/rails/welcome/index.html.erb
@@ -173,12 +173,8 @@
</style>
<script>
function about() {
- var info = document.getElementById('about-content');
- var xhr;
- if (window.XMLHttpRequest)
- { xhr = new XMLHttpRequest(); }
- else
- { xhr = new ActiveXObject("Microsoft.XMLHTTP"); }
+ var info = document.getElementById('about-content'),
+ xhr = new XMLHttpRequest();
xhr.open("GET","rails/info/properties",false);
xhr.send("");
info.innerHTML = xhr.responseText;

0 comments on commit c9402c0

Please sign in to comment.