From 5f131ffe3bfeecff33bb3ab91145d6d1abcab563 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Sat, 12 May 2018 11:21:49 -0400 Subject: [PATCH] Set default Meteor.absoluteUrl ROOT_URL from window.location. --- packages/meteor/url_common.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/meteor/url_common.js b/packages/meteor/url_common.js index 89afa1cd7c..4d3c5d454b 100644 --- a/packages/meteor/url_common.js +++ b/packages/meteor/url_common.js @@ -50,8 +50,13 @@ var defaultOptions = Meteor.absoluteUrl.defaultOptions = {}; var location = typeof window === "object" && window.location; if (typeof __meteor_runtime_config__ === "object" && - __meteor_runtime_config__.ROOT_URL) - Meteor.absoluteUrl.defaultOptions.rootUrl = __meteor_runtime_config__.ROOT_URL; + __meteor_runtime_config__.ROOT_URL) { + defaultOptions.rootUrl = __meteor_runtime_config__.ROOT_URL; +} else if (location && + location.protocol && + location.host) { + defaultOptions.rootUrl = location.protocol + "//" + location.host; +} // Make absolute URLs use HTTPS by default if the current window.location // uses HTTPS. Since this is just a default, it can be overridden by