Skip to content

O
origin-web-common
Commit 84d3f16f by Jessica Forrester Committed by GitHub
Options

Merge pull request #5 from jwforres/make-protocol-optional 

Make the protocol on additionalServers actually optional
parents 3f23c6fe 44d6f854
Showing with 2 additions and 2 deletions
dist/origin-web-common.js
......@@ -135,7 +135,7 @@ hawtioPluginLoader.registerPreBootstrapTask(function(next) {
// There can not be any conflicts in the groups/resources from these API servers.
var additionalDeferreds = [];
_.each(window.OPENSHIFT_CONFIG.additionalServers, function(server) {
var baseURL = server.protocol + "://" + server.hostPort + server.prefix;
var baseURL = (server.protocol ? (server.protocol + "://") : protocol) + server.hostPort + server.prefix;
additionalDeferreds.push($.get(baseURL)
.then(_.partial(getGroups, baseURL, server), function(data, textStatus, jqXHR) {
API_DISCOVERY_ERRORS.push({
......
dist/origin-web-common.min.js
This source diff could not be displayed because it is too large. You can view the blob instead.
src/openshiftCommon.module.js
......@@ -135,7 +135,7 @@ hawtioPluginLoader.registerPreBootstrapTask(function(next) {
// There can not be any conflicts in the groups/resources from these API servers.
var additionalDeferreds = [];
_.each(window.OPENSHIFT_CONFIG.additionalServers, function(server) {
var baseURL = server.protocol + "://" + server.hostPort + server.prefix;
var baseURL = (server.protocol ? (server.protocol + "://") : protocol) + server.hostPort + server.prefix;
additionalDeferreds.push($.get(baseURL)
.then(_.partial(getGroups, baseURL, server), function(data, textStatus, jqXHR) {
API_DISCOVERY_ERRORS.push({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment