diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-01-04 05:53:25 -0800 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-01-04 05:53:25 -0800 |
| commit | c9402c0258e85f125ce7cdc292381eb8b9dcbbe0 (patch) | |
| tree | e764f63e83774490440e41283c14b9834bbe27c2 /railties/lib/rails | |
| parent | a9511364e0bdf99ae32eddb153f6b1e8f7d73791 (diff) | |
| parent | 8ea480b516872eac1ceb07d89bab5caa89b8134d (diff) | |
| download | rails-c9402c0258e85f125ce7cdc292381eb8b9dcbbe0.tar.gz rails-c9402c0258e85f125ce7cdc292381eb8b9dcbbe0.tar.bz2 rails-c9402c0258e85f125ce7cdc292381eb8b9dcbbe0.zip | |
Merge pull request #8739 from franckverrot/remove_activexobject
Remove the fallback onto `ActiveXObject("Microsoft.XMLHTTP")`.
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/templates/rails/welcome/index.html.erb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/railties/lib/rails/templates/rails/welcome/index.html.erb b/railties/lib/rails/templates/rails/welcome/index.html.erb index b102561848..4dee366a76 100644 --- a/railties/lib/rails/templates/rails/welcome/index.html.erb +++ b/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; |