Merge pull request #2012 from TracksApp/revert-1986-no-domain-name-for-relative-to-root

Revert "Don't include a protocol or domain for relative_to_root"
This commit is contained in:
Matt Rogers 2016-05-20 22:52:15 -05:00
commit 6230280d69

View file

@ -15,7 +15,7 @@
var defaultTags = <%= default_tags_for_autocomplete.html_safe rescue '{}' %>; var defaultTags = <%= default_tags_for_autocomplete.html_safe rescue '{}' %>;
var dateFormat = '<%= date_format_for_date_picker %>'; var dateFormat = '<%= date_format_for_date_picker %>';
var weekStart = '<%= current_user.prefs.week_starts %>'; var weekStart = '<%= current_user.prefs.week_starts %>';
function relative_to_root(path) { return '/' + path; }; function relative_to_root(path) { return '<%= root_url %>'+path; };
<% if current_user.prefs.refresh != 0 -%> <% if current_user.prefs.refresh != 0 -%>
setup_auto_refresh(<%= current_user.prefs["refresh"].to_i*60000 %>); setup_auto_refresh(<%= current_user.prefs["refresh"].to_i*60000 %>);
<% end -%> <% end -%>