Fetch gmaps api keys if first load fails for protected maps.

pull/13141/head
nobuti 7 years ago
parent 3ee487ab1b
commit ef1dcb42c2

@ -58,8 +58,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', window.StaticConfig.stylesheets, window.StaticConfig.scripts);
};
var getUserConfig = function () {
@ -85,6 +84,13 @@ window.CartoConfig = window.CartoConfig || {};
if (err) {
error = data.responseJSON;
if (error && error.visualization) {
window.CartoConfig.vizdata = window.CartoConfig.vizdata || {};
window.CartoConfig.vizdata.google_maps_query_string = error.visualization.user && error.visualization.user.google_maps_query_string;
getUserConfig();
} else {
console.error(error.errors);
}
} else {
window.CartoConfig.vizdata = data;
getUserConfig();
@ -97,5 +103,4 @@ window.CartoConfig = window.CartoConfig || {};
} else {
getUserConfig();
}
})(window, document);

@ -57,7 +57,7 @@ var files = {
show_liked: true,
show_stats: true,
show_auth_tokens: true,
show_basemaps: true,
show_user_basemaps: true,
privacy: 'PUBLIC'
}
}

@ -151,7 +151,7 @@
"branch-files": "node lib/build/branchFiles/branchFiles.js",
"affected_specs": "node lib/build/branchFiles/branchFiles.js | xargs node lib/build/affectedFiles/affectedFiles.js",
"build": "NODE_ENV='production' webpack -p --config webpack.prod.config.js",
"build:static": "NODE_ENV='production' webpack -p --progress --config webpack/webpack.dev.config.js",
"build:static": "NODE_ENV='production' webpack -p --progress --config webpack/webpack.prod.config.js",
"carto-node": "NODE_ENV=production webpack -p --config webpack/carto-node/webpack.config.js",
"build:stats": "webpack --env.stats --progress --config webpack.dev.config.js",
"start": "grunt watch:css & webpack --progress --watch --config webpack.dev.config.js",

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -15,8 +15,6 @@ module.exports = {
devtool: 'source-map',
plugins: Object.keys(webpackFiles).map((entryName) => {
return new HtmlWebpackPlugin({
inject: false,
cache: false,
filename: path.resolve(__dirname, `../public/static/${entryName}/index.html`),
template: path.resolve(__dirname, '../lib/assets/javascripts/cartodb/static/index.jst.ejs'),
config: webpackFiles[entryName]

@ -0,0 +1,25 @@
const HtmlWebpackPlugin = require('html-webpack-plugin');
const path = require('path');
const webpackFiles = require('../lib/build/files/webpack_files');
const Package = require('./../package.json');
const VERSION = Package.version;
module.exports = {
entry: './lib/assets/javascripts/cartodb/static.js',
output: {
filename: `${VERSION}/javascripts/[name].js`,
path: path.resolve(__dirname, '../public/assets'),
publicPath: '/assets/'
},
devtool: 'source-map',
plugins: Object.keys(webpackFiles).map((entryName) => {
return new HtmlWebpackPlugin({
inject: false,
cache: false,
filename: path.resolve(__dirname, `../public/static/${entryName}/index.html`),
template: path.resolve(__dirname, '../lib/assets/javascripts/cartodb/static/index.jst.ejs'),
config: webpackFiles[entryName]
});
})
};
Loading…
Cancel
Save