Merge branch '14311-statics-feature-flag' into new-dashboard-scaffolding

pull/14331/head
jesusbotella 6 years ago
commit e0fdcae732

@ -28,7 +28,35 @@ window.CartoConfig = window.CartoConfig || {};
spinnerEl.parentNode.classList.add('is-hidden');
};
var addAssets = function () {
var getEndpointFeatureFlags = function (staticConfig) {
var featureFlagsData = window.StaticConfig.feature_flags;
if (!featureFlagsData) {
return [];
}
return Object.keys(featureFlagsData);
};
var getAssetsToLoad = function (userData) {
var endpointFeatureFlags = getEndpointFeatureFlags(window.StaticConfig);
var userFeatureFlags = userData.feature_flags;
var featureFlagToUse = endpointFeatureFlags.filter(function (featureFlag) {
return userFeatureFlags.indexOf(featureFlag) !== -1;
})[0];
if (featureFlagToUse) {
return window.StaticConfig.feature_flags[featureFlagToUse];
}
return {
stylesheets: window.StaticConfig.stylesheets,
scripts: window.StaticConfig.scripts
};
};
var addAssets = function (options) {
(function (w, d, a, favicon, stylesheets, scripts, l, h, s, t) {
var googleMapsQueryString = w.CartoConfig.vizdata
? w.CartoConfig.vizdata.user.google_maps_query_string
@ -73,7 +101,7 @@ window.CartoConfig = window.CartoConfig || {};
s.src = a + src;
t.parentNode.insertBefore(s, t);
});
})(window, document, assetsUrl, '/favicons/favicon.ico', window.StaticConfig.stylesheets, window.StaticConfig.scripts);
})(window, document, assetsUrl, '/favicons/favicon.ico', options.stylesheets, options.scripts);
};
var getUserConfig = function (visualizationError) {
@ -95,7 +123,12 @@ window.CartoConfig = window.CartoConfig || {};
window.CartoConfig.data = data;
assetsUrl = AssetsVersionHelper.getAssetsUrl(version);
addSpinner();
addAssets();
var assets = getAssetsToLoad(userData);
addAssets({
stylesheets: assets.stylesheets,
scripts: assets.scripts
});
});
};

Loading…
Cancel
Save