Ability to disable thumbnails
This commit is contained in:
parent
5dff9a32b6
commit
2a3a5c4342
@ -488,6 +488,13 @@ define(function () {
|
|||||||
out.settings_resetTipsButton = "Réinitialiser les astuces visibles dans CryptDrive";
|
out.settings_resetTipsButton = "Réinitialiser les astuces visibles dans CryptDrive";
|
||||||
out.settings_resetTipsDone = "Toutes les astuces sont de nouveau visibles.";
|
out.settings_resetTipsDone = "Toutes les astuces sont de nouveau visibles.";
|
||||||
|
|
||||||
|
out.settings_thumbnails = "Vignettes";
|
||||||
|
out.settings_disableThumbnailsAction = "Désactiver la création de vignettes dans CryptDrive";
|
||||||
|
out.settings_disableThumbnailsDescription = "Des vignettes de vos pads sont automatiquement créées et stockées dans votre navigateur. Vous pouvez désactiver cette fonctionnalité.";
|
||||||
|
out.settings_resetThumbnailsAction = "Nettoyer";
|
||||||
|
out.settings_resetThumbnailsDescription = "Nettoyer toutes les vignettes stockées dans votre navigateur.";
|
||||||
|
out.settings_resetThumbnailsDone = "Toutes les vignettes ont été effacées.";
|
||||||
|
|
||||||
out.settings_importTitle = "Importer les pads récents de ce navigateur dans votre CryptDrive";
|
out.settings_importTitle = "Importer les pads récents de ce navigateur dans votre CryptDrive";
|
||||||
out.settings_import = "Importer";
|
out.settings_import = "Importer";
|
||||||
out.settings_importConfirm = "Êtes-vous sûr de vouloir importer les pads récents de ce navigateur dans le CryptDrive de votre compte utilisateur ?";
|
out.settings_importConfirm = "Êtes-vous sûr de vouloir importer les pads récents de ce navigateur dans le CryptDrive de votre compte utilisateur ?";
|
||||||
|
|||||||
@ -493,6 +493,13 @@ define(function () {
|
|||||||
out.settings_resetTipsButton = "Reset the available tips in CryptDrive";
|
out.settings_resetTipsButton = "Reset the available tips in CryptDrive";
|
||||||
out.settings_resetTipsDone = "All the tips are now visible again.";
|
out.settings_resetTipsDone = "All the tips are now visible again.";
|
||||||
|
|
||||||
|
out.settings_thumbnails = "Thumbnails";
|
||||||
|
out.settings_disableThumbnailsAction = "Disable thumbnails creation in your CryptDrive";
|
||||||
|
out.settings_disableThumbnailsDescription = "Thumbnails are automatically created and stored in your browser when you visit a new pad. You can disable this feature here.";
|
||||||
|
out.settings_resetThumbnailsAction = "Clean";
|
||||||
|
out.settings_resetThumbnailsDescription = "Clean all the pads thumbnails stored in your browser.";
|
||||||
|
out.settings_resetThumbnailsDone = "All the thumbnails have been erased.";
|
||||||
|
|
||||||
out.settings_importTitle = "Import this browser's recent pads in your CryptDrive";
|
out.settings_importTitle = "Import this browser's recent pads in your CryptDrive";
|
||||||
out.settings_import = "Import";
|
out.settings_import = "Import";
|
||||||
out.settings_importConfirm = "Are you sure you want to import recent pads from this browser to your user account's CryptDrive?";
|
out.settings_importConfirm = "Are you sure you want to import recent pads from this browser to your user account's CryptDrive?";
|
||||||
|
|||||||
@ -268,9 +268,9 @@ define([
|
|||||||
|
|
||||||
Cryptpad.removeLoadingScreen(emitResize);
|
Cryptpad.removeLoadingScreen(emitResize);
|
||||||
|
|
||||||
if (options.thumbnail) {
|
var privateDat = cpNfInner.metadataMgr.getPrivateData();
|
||||||
|
if (options.thumbnail && privateDat.thumbnails) {
|
||||||
var oldThumbnailState;
|
var oldThumbnailState;
|
||||||
var privateDat = cpNfInner.metadataMgr.getPrivateData();
|
|
||||||
var hash = privateDat.availableHashes.editHash ||
|
var hash = privateDat.availableHashes.editHash ||
|
||||||
privateDat.availableHashes.viewHash;
|
privateDat.availableHashes.viewHash;
|
||||||
var href = privateDat.pathname + '#' + hash;
|
var href = privateDat.pathname + '#' + hash;
|
||||||
|
|||||||
@ -130,6 +130,7 @@ define([
|
|||||||
settings: proxy.settings || {},
|
settings: proxy.settings || {},
|
||||||
isPresent: parsed.hashData && parsed.hashData.present,
|
isPresent: parsed.hashData && parsed.hashData.present,
|
||||||
isEmbed: parsed.hashData && parsed.hashData.embed,
|
isEmbed: parsed.hashData && parsed.hashData.embed,
|
||||||
|
thumbnails: !((proxy.settings || {}).general || {}).disableThumbnails,
|
||||||
accounts: {
|
accounts: {
|
||||||
donateURL: Cryptpad.donateURL,
|
donateURL: Cryptpad.donateURL,
|
||||||
upgradeURL: Cryptpad.upgradeURL
|
upgradeURL: Cryptpad.upgradeURL
|
||||||
|
|||||||
@ -42,6 +42,7 @@ define([
|
|||||||
'languageSelector',
|
'languageSelector',
|
||||||
'logoutEverywhere',
|
'logoutEverywhere',
|
||||||
'resetTips',
|
'resetTips',
|
||||||
|
'thumbnails',
|
||||||
'userFeedback'
|
'userFeedback'
|
||||||
],
|
],
|
||||||
'drive': [
|
'drive': [
|
||||||
@ -220,6 +221,60 @@ define([
|
|||||||
|
|
||||||
return $div;
|
return $div;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
var createThumbnails = function (obj) {
|
||||||
|
var $div = $('<div>', {'class': 'thumbnails element'});
|
||||||
|
$('<label>').text(Messages.settings_thumbnails).appendTo($div);
|
||||||
|
|
||||||
|
// Disable
|
||||||
|
$('<span>', {'class': 'description'})
|
||||||
|
.text(Messages.settings_disableThumbnailsDescription).appendTo($div);
|
||||||
|
var $label = $('<label>', { 'for': 'disableThumbnails', 'class': 'noTitle' })
|
||||||
|
.text(Messages.settings_disableThumbnailsAction);
|
||||||
|
|
||||||
|
var $ok = $('<span>', {'class': 'fa fa-check', title: Messages.saved});
|
||||||
|
var $spinner = $('<span>', {'class': 'fa fa-spinner fa-pulse'});
|
||||||
|
|
||||||
|
var $checkbox = $('<input>', {
|
||||||
|
'type': 'checkbox',
|
||||||
|
id: 'disableThumbnails'
|
||||||
|
}).on('change', function () {
|
||||||
|
$spinner.show();
|
||||||
|
$ok.hide();
|
||||||
|
if (!obj.proxy.settings) { obj.proxy.settings = {}; }
|
||||||
|
if (!obj.proxy.settings.general) { obj.proxy.settings.general = {}; }
|
||||||
|
obj.proxy.settings.general.disableThumbnails = $checkbox.is(':checked') || false;
|
||||||
|
Cryptpad.whenRealtimeSyncs(obj.info.realtime, function () {
|
||||||
|
$spinner.hide();
|
||||||
|
$ok.show();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
$checkbox.appendTo($div);
|
||||||
|
$label.appendTo($div);
|
||||||
|
|
||||||
|
$ok.hide().appendTo($div);
|
||||||
|
$spinner.hide().appendTo($div);
|
||||||
|
|
||||||
|
if (obj.proxy.settings && obj.proxy.settings.general
|
||||||
|
&& obj.proxy.settings.general.disableThumbnails) {
|
||||||
|
$checkbox[0].checked = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reset
|
||||||
|
/*$('<span>', {'class': 'description'})
|
||||||
|
.text(Messages.settings_resetThumbnailsDescription).appendTo($div);
|
||||||
|
var $button = $('<button>', {'id': 'resetThumbnails', 'class': 'btn btn-primary'})
|
||||||
|
.text(Messages.settings_resetThumbnailsAction).appendTo($div);
|
||||||
|
|
||||||
|
$button.click(function () {
|
||||||
|
// TODO we need to have access to the sandbox localforage first...
|
||||||
|
Cryptpad.alert(Messages.settings_resetThumbnailsDone);
|
||||||
|
});*/
|
||||||
|
|
||||||
|
return $div;
|
||||||
|
};
|
||||||
|
|
||||||
var createBackupDrive = function (store) {
|
var createBackupDrive = function (store) {
|
||||||
var obj = store.proxy;
|
var obj = store.proxy;
|
||||||
var $div = $('<div>', {'class': 'backupDrive element'});
|
var $div = $('<div>', {'class': 'backupDrive element'});
|
||||||
@ -467,6 +522,7 @@ define([
|
|||||||
$rightside.append(createLogoutEverywhere(obj));
|
$rightside.append(createLogoutEverywhere(obj));
|
||||||
}
|
}
|
||||||
$rightside.append(createResetTips());
|
$rightside.append(createResetTips());
|
||||||
|
$rightside.append(createThumbnails(obj));
|
||||||
$rightside.append(createBackupDrive(obj));
|
$rightside.append(createBackupDrive(obj));
|
||||||
$rightside.append(createImportLocalPads(obj));
|
$rightside.append(createImportLocalPads(obj));
|
||||||
$rightside.append(createResetDrive(obj));
|
$rightside.append(createResetDrive(obj));
|
||||||
|
|||||||
@ -5,8 +5,8 @@
|
|||||||
.cp {
|
.cp {
|
||||||
#container {
|
#container {
|
||||||
#rightSide {
|
#rightSide {
|
||||||
.userFeedback {
|
.userFeedback, .thumbnails {
|
||||||
input {
|
input[type="checkbox"] {
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
margin-right: 5px;
|
margin-right: 5px;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user