zhongjin
/
cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix gmaps keys.

Browse Source
pull/13141/head
nobuti 7 years ago
parent ce967bd69c
commit b5a75d798c
8 changed files with 175 additions and 172 deletions
Show Stats Download Patch File Download Diff File

302
lib/assets/javascripts/cartodb/public_map/index.js
Unescape View File

@ -41,168 +41,166 @@ var FACEBOOK_CARD_IMG_WIDTH = 1200;
var FACEBOOK_CARD_IMG_HEIGHT = 630;
var element = $('#app');
$(function () {
cdb.init(function () {
function showPasswordProtectedForm () {
var assetsVersion = AssetsVersionHelper.getAssetsVersion(VERSION);
var data = window.CartoConfig.data;
var config = data.config;
cdb.templates.namespace = 'cartodb/';
cdb.config.set(config);
document.title = TITLE({
title: _t('protected_map.title')
});
var view = new PasswordProtectedView({
vizID: getPublicMapPageId(),
data: data,
assetsVersion: assetsVersion,
handleRedirection: function (password) {
if (window.CartoConfig.data && window.CartoConfig.vizdata) {
showPublicVisualization(password);
} else if (!window.CartoConfig.vizdata) {
getVisualization(password);
}
}
});
element.html(view.render().el);
}
function showForbiddenView () {
var assetsVersion = AssetsVersionHelper.getAssetsVersion(VERSION);
var data = window.CartoConfig.data;
var config = data.config;
function showPasswordProtectedForm () {
var assetsVersion = AssetsVersionHelper.getAssetsVersion(VERSION);
var data = window.CartoConfig.data;
var config = data.config;
cdb.templates.namespace = 'cartodb/';
cdb.config.set(config);
document.title = TITLE({
title: _t('forbidden_map.title')
});
cdb.templates.namespace = 'cartodb/';
cdb.config.set(config);
var view = new ForbiddenView({
data: data,
assetsVersion: assetsVersion
});
document.title = TITLE({
title: _t('protected_map.title')
});
element.html(view.render().el);
var view = new PasswordProtectedView({
vizID: getPublicMapPageId(),
data: data,
assetsVersion: assetsVersion,
handleRedirection: function (password) {
if (window.CartoConfig.data && window.CartoConfig.vizdata) {
showPublicVisualization(password);
} else if (!window.CartoConfig.vizdata) {
getVisualization(password);
}
}
});
function getVisualization (password) {
var params = {
show_permission: true,
show_liked: true,
show_stats: true,
fetch_user: true,
fetch_related_canonical_visualizations: true
};
if (password != null) {
params = _.extend({}, params, {
password: password
});
}
element.html(view.render().el);
}
var vizID = UrlHelper.getVizID();
client.getVisualization(vizID, params, function (err, response, data) {
var error;
if (err) {
error = data.responseJSON;
}
if (err && error.errors_cause && error.errors_cause === 'privacy_password') {
showPasswordProtectedForm();
} else if (err && error.errors === 'Visualization not viewable') {
showForbiddenView();
} else {
window.CartoConfig.vizdata = data;
getDerivedVisualizations(data, password);
}
});
}
function showForbiddenView () {
var assetsVersion = AssetsVersionHelper.getAssetsVersion(VERSION);
var data = window.CartoConfig.data;
var config = data.config;
cdb.templates.namespace = 'cartodb/';
cdb.config.set(config);
document.title = TITLE({
title: _t('forbidden_map.title')
});
function getDerivedVisualizations (vizdata, password) {
var visualizationsNumber = 3;
var options = {
per_page: visualizationsNumber,
password: password
};
client.getDerivedVisualizations(options, function (err, response, data) {
if (err) {
console.error(err);
return err;
} else {
window.CartoConfig.visualizations = data.visualizations;
showPublicVisualization(password);
}
});
var view = new ForbiddenView({
data: data,
assetsVersion: assetsVersion
});
element.html(view.render().el);
}
function getVisualization (password) {
var params = {
show_permission: true,
show_liked: true,
show_stats: true,
fetch_user: true,
fetch_related_canonical_visualizations: true
};
if (password != null) {
params = _.extend({}, params, {
password: password
});
}
var vizID = UrlHelper.getVizID();
client.getVisualization(vizID, params, function (err, response, data) {
var error;
if (err) {
error = data.responseJSON;
}
function showPublicVisualization (password) {
var data = window.CartoConfig.data;
var vizdata = window.CartoConfig.vizdata;
var visualizations = window.CartoConfig.visualizations;
var assetsVersion = AssetsVersionHelper.getAssetsVersion(VERSION);
var assetsBaseUrl = data.config.app_assets_base_url;
var currentUser = data.user_data
? new cdb.admin.User(data.user_data)
: null;
var mapOwnerUser = vizdata.permission.owner
? new cdb.admin.User(vizdata.permission.owner)
: null;
cdb.templates.namespace = 'cartodb/';
cdb.config.set(data.config);
if (currentUser) {
cdb.config.set('user', currentUser);
cdb.config.set('url_prefix', currentUser.get('base_url'));
}
StaticHeaderMetaTagsHelper
.addPublicMapMeta(assetsBaseUrl, vizdata, mapOwnerUser)
.addTwitterMeta(vizdata, mapOwnerUser, TWITTER_CARD_IMG_WIDTH, TWITTER_CARD_IMG_HEIGHT)
.addFacebookMeta(vizdata, mapOwnerUser, FACEBOOK_CARD_IMG_WIDTH, FACEBOOK_CARD_IMG_HEIGHT);
$('#app').empty();
var publicMapView = new PublicMapWindow({
el: '#app',
assetsVersion: assetsVersion,
collection: new cdb.admin.Visualizations(),
config: cdb.config,
currentUser: currentUser,
mapOwnerUser: mapOwnerUser,
data: data,
isMobileDevice: MapOptionsHelper.isMobileDevice(),
mapId: MAP_ID,
mapOptions: {},
vizdata: vizdata,
visualizations: visualizations,
password: password
});
publicMapView.render();
if (err && error.errors_cause && error.errors_cause === 'privacy_password') {
showPasswordProtectedForm();
} else if (err && error.errors === 'Visualization not viewable') {
showForbiddenView();
} else {
window.CartoConfig.vizdata = data;
getDerivedVisualizations(data, password);
}
});
}
function getDerivedVisualizations (vizdata, password) {
var visualizationsNumber = 3;
var options = {
per_page: visualizationsNumber,
password: password
};
client.getDerivedVisualizations(options, function (err, response, data) {
if (err) {
console.error(err);
return err;
} else {
window.CartoConfig.visualizations = data.visualizations;
showPublicVisualization(password);
}
});
}
function showPublicVisualization (password) {
var data = window.CartoConfig.data;
var vizdata = window.CartoConfig.vizdata;
var visualizations = window.CartoConfig.visualizations;
var assetsVersion = AssetsVersionHelper.getAssetsVersion(VERSION);
var assetsBaseUrl = data.config.app_assets_base_url;
var currentUser = data.user_data
? new cdb.admin.User(data.user_data)
: null;
var mapOwnerUser = vizdata.permission.owner
? new cdb.admin.User(vizdata.permission.owner)
: null;
cdb.templates.namespace = 'cartodb/';
cdb.config.set(data.config);
if (currentUser) {
cdb.config.set('user', currentUser);
cdb.config.set('url_prefix', currentUser.get('base_url'));
}
StaticHeaderMetaTagsHelper
.addPublicMapMeta(assetsBaseUrl, vizdata, mapOwnerUser)
.addTwitterMeta(vizdata, mapOwnerUser, TWITTER_CARD_IMG_WIDTH, TWITTER_CARD_IMG_HEIGHT)
.addFacebookMeta(vizdata, mapOwnerUser, FACEBOOK_CARD_IMG_WIDTH, FACEBOOK_CARD_IMG_HEIGHT);
$('#app').empty();
var publicMapView = new PublicMapWindow({
el: '#app',
assetsVersion: assetsVersion,
collection: new cdb.admin.Visualizations(),
config: cdb.config,
currentUser: currentUser,
mapOwnerUser: mapOwnerUser,
data: data,
isMobileDevice: MapOptionsHelper.isMobileDevice(),
mapId: MAP_ID,
mapOptions: {},
vizdata: vizdata,
visualizations: visualizations,
password: password
});
var getConfig = function () {
client.getConfig(function (err, response, data) {
if (err) {
console.error(err);
return err;
} else {
window.CartoConfig.data = data;
getVisualization();
}
});
};
getConfig();
publicMapView.render();
}
var getConfig = function () {
client.getConfig(function (err, response, data) {
if (err) {
console.error(err);
return err;
} else {
window.CartoConfig.data = data;
getVisualization();
}
});
};
cdb.init(function () {
getConfig();
});

33
lib/assets/javascripts/cartodb/static.js
Unescape View File

@ -22,21 +22,17 @@ window.CartoConfig = window.CartoConfig || {};
spinnerEl.parentNode.classList.add('is-hidden');
};
var addGMaps = function (googleMapsQueryString) {
var s = document.createElement('script');
var t = document.getElementsByTagName('script')[0];
s.async = false;
s.type = 'text/javascript';
s.src = GOOGLE_MAPS_SCRIPT_SRC + '&' + googleMapsQueryString;
t.parentNode.insertBefore(s, t);
};
var addAssets = function () {
(function (w, d, a, favicon, stylesheets, scripts, l, h, s, t) {
var googleMapsQueryString = w.CartoConfig.vizdata
? w.CartoConfig.vizdata.user.google_maps_query_string
: null;
if (googleMapsQueryString) {
s = d.createElement('script');
t = d.getElementsByTagName('script')[0];
s.async = false;
s.type = 'text/javascript';
s.src = GOOGLE_MAPS_SCRIPT_SRC + '&' + googleMapsQueryString;
t.parentNode.insertBefore(s, t);
}
l = d.createElement('link');
l.rel = 'shortcut icon';
l.href = a + favicon;
@ -63,6 +59,7 @@ window.CartoConfig = window.CartoConfig || {};
var getUserConfig = function () {
client.getConfig(function (err, response, data) {
var google_maps_query_string = window.CartoConfig.vizdata.user.google_maps_query_string;
window.CartoConfig.data = data;
if (err) {
@ -72,19 +69,27 @@ window.CartoConfig = window.CartoConfig || {};
assetsUrl = AssetsVersionHelper.getAssetsUrl(version);
addSpinner();
if (google_maps_query_string != null) {
addGMaps(google_maps_query_string);
}
addAssets();
});
};
var getVisualization = function (params) {
var vizID = UrlHelper.getVizID();
var error;
client.getVisualization(vizID, params, function (err, response, data) {
if (err) {
error = data.responseJSON;
if (error && error.visualization) {
window.CartoConfig.vizdata = window.CartoConfig.vizdata || {};
window.CartoConfig.vizdata = error.visualization;
window.CartoConfig.vizdata.user = window.CartoConfig.vizdata.user || {};
window.CartoConfig.vizdata.user.google_maps_query_string = error.visualization.user && error.visualization.user.google_maps_query_string;
getUserConfig();
} else {
console.error(error.errors);
}

2
public/static/account/index.html
View File

File diff suppressed because one or more lines are too long

2
public/static/dashboard/index.html
View File

File diff suppressed because one or more lines are too long

2
public/static/embed_map/index.html
View File

File diff suppressed because one or more lines are too long

2
public/static/profile/index.html
View File

File diff suppressed because one or more lines are too long

2
public/static/public_map/index.html
View File

File diff suppressed because one or more lines are too long

2
public/static/show/index.html
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save