infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Merge branch 'staging' into staging

Browse Source
pull/1/head
yflory 8 years ago committed by GitHub
parent 3e9c4d0901 1bb87164f0
commit 53f4f8826e
5 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File

2
customize.dist/translations/messages.es.js
Unescape Escape View File

@ -299,7 +299,7 @@ define(function () {
out.fm_categoryError = "No se pudo abrir la categoría seleccionada, mostrando la raíz.";
out.settings_userFeedbackHint1 = "CryptPad suministra informaciones muy básicas al servidor, para ayudarnos a mejorar vuestra experiencia.";
out.settings_userFeedbackHint2 = "El contenido de tu pad nunca será compartido con el servidor.";
out.settings_userFeedback = "Desactivar feedback"; // "Disable user feedback"
out.settings_userFeedback = "Activar feedback"; // "Disable user feedback"
out.settings_anonymous = "No has iniciado sesión. Tus ajustes se aplicarán solo a este navegador.";
out.blog = "Blog";
out.initialState = "<p>Esto es <strong>CryptPad</strong>, el editor collaborativo en tiempo real zero knowledge.<br>Lo que escribes aquí es cifrado, con lo cual solo las personas con el enlace pueden accederlo.<br>Incluso el servido no puede ver lo que escribes.</p><p><small><i>Lo que ves aquí, lo que escuchas aquí, cuando sales, se queda aquí</i></small></p>";

2
customize.dist/translations/messages.fr.js
Unescape Escape View File

@ -256,7 +256,7 @@ define(function () {
out.settings_userFeedbackHint1 = "CryptPad peut envoyer des retours d'expérience très limités vers le serveur, de manière à nous permettre d'améliorer l'expérience des utilisateurs.";
out.settings_userFeedbackHint2 = "Le contenu de vos pads et les clés de déchiffrement ne seront jamais partagés avec le serveur.";
out.settings_userFeedback = "Désactiver l'envoi de retours d'expérience";
out.settings_userFeedback = "Activer l'envoi de retours d'expérience";
out.settings_anonymous = "Vous n'êtes pas connectés. Ces préférences seront utilisées pour ce navigateur.";

2
customize.dist/translations/messages.js
Unescape Escape View File

@ -258,7 +258,7 @@ define(function () {
out.settings_userFeedbackHint1 = "CryptPad provides some very basic feedback to the server, to let us know how to improve your experience.";
out.settings_userFeedbackHint2 = "Your pad's content will never be shared with the server.";
out.settings_userFeedback = "Disable user feedback";
out.settings_userFeedback = "Enable user feedback";
out.settings_anonymous = "You are not logged in. Settings here are specific to this browser.";

2
package.json
Unescape Escape View File

@ -1,7 +1,7 @@
{
"name": "cryptpad",
"description": "realtime collaborative visual editor with zero knowlege server",
"version": "0.1.0",
"version": "1.1.0",
"dependencies": {
"express": "~4.10.1",
"ws": "^1.0.1",

35
www/drive/main.js
Unescape Escape View File

@ -236,6 +236,10 @@ define([
}
};
var findDataHolder = function ($el) {
return $el.is('.element-row') ? $el : $el.closest('.element-row');
};
var removeSelected = function () {
$iframe.find('.selected').removeClass("selected");
var $container = $driveToolbar.find('#contextButtonsContainer');
@ -243,8 +247,6 @@ define([
$container.html('');
};
var removeInput = function () {
$iframe.find('li > span:hidden').removeAttr('style');
$iframe.find('li > input').remove();
$iframe.find('.element-row > input').remove();
$iframe.find('.element-row > span:hidden').removeAttr('style');
};
@ -376,7 +378,7 @@ define([
var updateContextButton = function () {
var $li = $content.find('.selected');
if ($li.length !== 1) {
$li = $tree.find('.element.active').closest('li');
$li = findDataHolder($tree.find('.element.active'));
}
var $button = $driveToolbar.find('#contextButton');
if ($button.length) { // mobile
@ -437,10 +439,7 @@ define([
if (!e || !e.ctrlKey) {
removeSelected();
}
if (!$element.is('li')) {
$element = $element.closest('li');
}
if ($element.find('>.element-row').length) { $element = $element.find('>.element-row'); }
$element = findDataHolder($element);
if (!$element.length) {
log(Messages.fm_selectError);
return;
@ -459,8 +458,7 @@ define([
module.hideMenu();
e.stopPropagation();
var $element = $(e.target).closest('li');
if ($element.find('>.element-row').length) { $element = $element.find('>.element-row'); }
var $element = findDataHolder($(e.target));
if (!$element.length) {
logError("Unable to locate the .element tag", e.target);
$menu.hide();
@ -514,7 +512,7 @@ define([
};
var openTrashContextMenu = function (e) {
var path = $(e.target).closest('li').data('path');
var path = findDataHolder($(e.target)).data('path');
if (!path) { return; }
$trashContextMenu.find('li').show();
openContextMenu(e, $trashContextMenu);
@ -608,8 +606,7 @@ define([
// The data transferred is a stringified JSON containing the path of the dragged element
var onDrag = function (ev, path) {
var paths = [];
var $element = $(ev.target).closest('li');
if ($element.find('>.element-row').length) { $element = $element.find('>.element-row'); }
var $element = findDataHolder($(ev.target));
if ($element.hasClass('selected')) {
var $selected = $iframe.find('.selected');
$selected.each(function (idx, elmt) {
@ -665,7 +662,8 @@ define([
}
});
var newPath = $(ev.target).data('path') || $(ev.target).parent('.element-row').data('path') || $(ev.target).parent('li').data('path');
var $el = findDataHolder($(ev.target));
var newPath = $el.data('path');
if (!newPath) { return; }
if (movedPaths && movedPaths.length) {
moveElements(movedPaths, newPath, null, refresh);
@ -796,7 +794,8 @@ define([
$icon = filesOp.isFolderEmpty(root[key]) ? $folderEmptyIcon.clone() : $folderIcon.clone();
}
var $element = $('<li>', {
draggable: true
draggable: true,
'class': 'element-row'
});
if (isFolder) {
addFolderData(element, key, $element);
@ -1261,7 +1260,7 @@ define([
var idx = files[rootName].indexOf(href);
var $icon = getFileIcon(href);
var $element = $('<li>', {
'class': 'file-element element',
'class': 'file-element element element-row',
draggable: draggable
});
addFileData(href, file.title, $element, false);
@ -1293,7 +1292,7 @@ define([
var sortedFiles = sortElements(false, [FILES_DATA], keys, Cryptpad.getLSAttribute(SORT_FILE_BY), !getSortFileDesc(), false, true);
sortedFiles.forEach(function (file) {
var $icon = getFileIcon(file.href);
var $element = $('<li>', { 'class': 'file-element element' });
var $element = $('<li>', { 'class': 'file-element element element-row' });
addFileData(file.href, file.title, $element, false);
$element.data('path', [FILES_DATA, allfiles.indexOf(file)]);
$element.data('element', file.href);
@ -1415,7 +1414,7 @@ define([
e.stopPropagation();
var $li = $content.find('.selected');
if ($li.length !== 1) {
$li = $tree.find('.element.active').closest('li');
$li = findDataHolder($tree.find('.element.active'));
}
// Close if already opened
if ($iframe.find('.contextMenu:visible').length) {
@ -1474,7 +1473,7 @@ define([
};
var refreshFilesData = function () {
$content.find('li').each(function (i, e) {
$content.find('.element-row').each(function (i, e) {
var $el = $(e);
if ($el.data('path')) {
var path = $el.data('path');

Write Preview
Loading…
Cancel
Save