Skip to content

fix document.domain issue with IP hostnames #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickelsen merged 2 commits into from
Apr 13, 2016
Merged

fix document.domain issue with IP hostnames #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1417dc
sc2ranks is long gone
dsjoerg Apr 13, 2016
ae0821a
only do setdocdomain when we have an actual hostname, not just an IP …
dsjoerg Apr 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion app/assets/javascripts/setdocdomain.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
// Proxino.log("gg.js domain was " + document.domain);
// weird, was ggtracker.com even though script was served via CDN
document.domain = /(\w+)(.\w+)?$/.exec(location.hostname)[0];
if (location.hostname.match(/^[0-9.]*$/) == null) {
// only set document.domain if our location is a hostname like ggtracker.com or
// ggtracker.test. But if it's an IP address, dont bother.
document.domain = /(\w+)(.\w+)?$/.exec(location.hostname)[0];
}
// Proxino.log("now gg.js domain is " + document.domain);
1 change: 0 additions & 1 deletion app/views/players/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<h2><a href="/players/<%= @identity.id %>/<%= @identity.name %>"><%= @identity.name %></a><span ng-show="<%= @prolevel %> > 0" class="djcloak icon icon-star-white-32"></span><!--<span class="tiny prolabel">PRO</span>--></h2>
<div class="links">
<%= link_to('bnet', @identity.profile_url, {:class => 'bnet'}) if @identity.profile_url.present? %>
<%= link_to('sc2ranks', @identity.sc2ranks_url) if @identity.sc2ranks_url.present? %>
<% if controller.superuser? %>
<%= link_to('+1Month', :controller => :players, :action => :give_one_month_ggtracker_pro) %>
<% end %>
Expand Down