Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

pull/1/head
ansuz 6 years ago
commit 0783944e1c

@ -2,11 +2,12 @@ define([
'jquery', 'jquery',
'/api/config', '/api/config',
'/common/hyperscript.js', '/common/hyperscript.js',
'/common/common-feedback.js',
'/customize/messages.js', '/customize/messages.js',
'/customize/application_config.js', '/customize/application_config.js',
'/common/outer/local-store.js', '/common/outer/local-store.js',
'/customize/pages.js' '/customize/pages.js'
], function ($, Config, h, Msg, AppConfig, LocalStore, Pages) { ], function ($, Config, h, Feedback, Msg, AppConfig, LocalStore, Pages) {
var urlArgs = Config.requireConf.urlArgs; var urlArgs = Config.requireConf.urlArgs;
var isAvailableType = function (x) { var isAvailableType = function (x) {
@ -84,6 +85,7 @@ define([
$(crowdFunding).click(function () { $(crowdFunding).click(function () {
_link.click(); _link.click();
Feedback.send('HOME_SUPPORT_CRYPTPAD');
}); });
var blocks = h('div.container',[ var blocks = h('div.container',[

@ -1311,21 +1311,27 @@ define([
var urls = common.getMetadataMgr().getPrivateData().accounts; var urls = common.getMetadataMgr().getPrivateData().accounts;
var makeDonateButton = function () { var makeDonateButton = function () {
$('<a>', { var $a = $('<a>', {
'class': 'cp-limit-upgrade btn btn-success', 'class': 'cp-limit-upgrade btn btn-success',
href: urls.donateURL, href: urls.donateURL,
rel: "noreferrer noopener", rel: "noreferrer noopener",
target: "_blank", target: "_blank",
}).text(Messages.supportCryptpad).appendTo($container); }).text(Messages.supportCryptpad).appendTo($container);
$a.click(function () {
Feedback.send('SUPPORT_CRYPTPAD');
});
}; };
var makeUpgradeButton = function () { var makeUpgradeButton = function () {
$('<a>', { var $a = $('<a>', {
'class': 'cp-limit-upgrade btn btn-success', 'class': 'cp-limit-upgrade btn btn-success',
href: urls.upgradeURL, href: urls.upgradeURL,
rel: "noreferrer noopener", rel: "noreferrer noopener",
target: "_blank", target: "_blank",
}).text(Messages.upgradeAccount).appendTo($container); }).text(Messages.upgradeAccount).appendTo($container);
$a.click(function () {
Feedback.send('UPGRADE_ACCOUNT');
});
}; };
if (!Config.removeDonateButton) { if (!Config.removeDonateButton) {

Loading…
Cancel
Save