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

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

pull/1/head
Caleb James DeLisle 2018-01-16 11:53:41 +01:00
parent 137c6428e8 3118dd8312
commit 79fa732128
8 changed files with 22 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
customize.dist/translations/messages.es.js
View File

@ -234,7 +234,8 @@ define(function () {
out.login_invalUser = "Nombre de usuario requerido";
out.login_invalPass = "Contraseña requerida";
out.login_unhandledError = "Ha ocurrido un error inesperado :(";
out.register_importRecent = "Importar historial (recomendado)";
out.register_importRecent = "Importe el historial de tu sesión anónima";
out.register_acceptTerms = "Acepto los <a href='/terms.html' tabindex='-1'>términos de servicio</a>";
out.register_passwordsDontMatch = "Las contraseñas no corresponden";
out.register_mustAcceptTerms = "Tienes que aceptar los términos de servicio";

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

@ -462,7 +462,7 @@ define(function () {
out.login_invalPass = 'Mot de passe requis';
out.login_unhandledError = "Une erreur inattendue s'est produite :(";
out.register_importRecent = "Importer l'historique (Recommandé)";
out.register_importRecent = "Importer les pads de votre session anonyme";
out.register_acceptTerms = "J'accepte <a href='/terms.html' tabindex='-1'>les conditions d'utilisation</a>";
out.register_passwordsDontMatch = "Les mots de passe doivent être identiques!";
out.register_passwordTooShort = "Les mots de passe doivent contenir au moins {0} caractères.";

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

@ -464,7 +464,7 @@ define(function () {
out.login_invalPass = 'Password required';
out.login_unhandledError = 'An unexpected error occurred :(';
out.register_importRecent = "Import pad history (Recommended)";
out.register_importRecent = "Import pads from your anonymous session";
out.register_acceptTerms = "I accept <a href='/terms.html' tabindex='-1'>the terms of service</a>";
out.register_passwordsDontMatch = "Passwords do not match!";
out.register_passwordTooShort = "Passwords must be at least {0} characters long.";

19
www/code/inner.js
View File

@ -4,6 +4,7 @@ define([
'/bower_components/nthen/index.js',
'/common/sframe-common.js',
'/common/sframe-app-framework.js',
'/common/sframe-common-codemirror.js',
'/common/common-util.js',
'/common/common-hash.js',
'/common/modes.js',
@ -42,6 +43,7 @@ define([
nThen,
SFCommon,
Framework,
SFCodeMirror,
Util,
Hash,
Modes,
@ -258,11 +260,11 @@ define([
mkFilePicker(framework, editor, evModeChange);
if (!framework.isReadOnly()) {
CodeMirror.configureTheme(function () {
CodeMirror.configureLanguage(null, evModeChange.fire);
CodeMirror.configureTheme(common, function () {
CodeMirror.configureLanguage(common, null, evModeChange.fire);
});
} else {
CodeMirror.configureTheme();
CodeMirror.configureTheme(common);
}
////
@ -345,7 +347,6 @@ define([
var main = function () {
var CodeMirror;
var editor;
var common;
var framework;
nThen(function (waitFor) {
@ -370,20 +371,14 @@ define([
nThen(function (waitFor) {
$(waitFor());
// TODO(cjd): This is crap but we cannot bring up codemirror until after
// the CryptPad Common is up and we can't bring up framework
// without codemirror.
SFCommon.create(waitFor(function (c) { common = c; }));
}).nThen(function () {
CodeMirror = common.initCodeMirrorApp(null, CMeditor);
CodeMirror = SFCodeMirror.create(null, CMeditor);
$('#cp-app-code-container').addClass('cp-app-code-fullpage');
editor = CodeMirror.editor;
}).nThen(waitFor());
}).nThen(function (waitFor) {
common.getSframeChannel().onReady(waitFor());
}).nThen(function (/*waitFor*/) {
common.isPresentUrl(function (err, val) {
framework._.sfCommon.isPresentUrl(function (err, val) {
andThen2(editor, CodeMirror, framework, val);
});
});

2
www/common/sframe-chainpad-netflux-inner.js
View File

@ -40,7 +40,7 @@ define([
var patchTransformer = config.patchTransformer;
var validateContent = config.validateContent;
var avgSyncMilliseconds = config.avgSyncMilliseconds;
var logLevel = typeof(config.logLevel) !== 'undefined'? config.logLevel : 1;
var logLevel = typeof(config.logLevel) !== 'undefined'? config.logLevel : 2;
var readOnly = config.readOnly || false;
var sframeChan = config.sframeChan;
var metadataMgr = config.metadataMgr;

6
www/common/sframe-common-codemirror.js
View File

@ -103,7 +103,7 @@ define([
return text.trim();
};
module.create = function (Common, defaultMode, CMeditor) {
module.create = function (defaultMode, CMeditor) {
var exp = {};
var CodeMirror = exp.CodeMirror = CMeditor;
@ -195,7 +195,7 @@ define([
return module.getHeadingText(editor);
};
exp.configureLanguage = function (cb, onModeChanged) {
exp.configureLanguage = function (Common, cb, onModeChanged) {
var options = [];
Modes.list.forEach(function (l) {
options.push({
@ -227,7 +227,7 @@ define([
if (cb) { cb(); }
};
exp.configureTheme = function (cb) {
exp.configureTheme = function (Common, cb) {
/* Remember the user's last choice of theme using localStorage */
var themeKey = ['codemirror', 'theme'];

7
www/common/sframe-common.js
View File

@ -329,13 +329,10 @@ define([
Object.freeze(funcs);
return { create: function (cb) {
// TODO(cjd): This is crap but this gets loaded multiple places by /code/ and it is
// not ok with being loaded more than once.
if (window.CryptPad_sframe_common) {
setTimeout(function () { cb(window.CryptPad_sframe_common); });
return;
throw new Error("Sframe-common should only be created once");
}
window.CryptPad_sframe_common = funcs;
window.CryptPad_sframe_common = true;
nThen(function (waitFor) {
SFrameChannel.create(window.parent, waitFor(function (sfc) { ctx.sframeChan = sfc; }), true);

15
www/slide/inner.js
View File

@ -5,6 +5,7 @@ define([
'/common/sframe-common.js',
'/slide/slide.js',
'/common/sframe-app-framework.js',
'/common/sframe-common-codemirror.js',
'/common/common-util.js',
'/common/common-hash.js',
'/common/common-interface.js',
@ -48,6 +49,7 @@ define([
SFCommon,
Slide,
Framework,
SFCodeMirror,
Util,
Hash,
UI,
@ -464,7 +466,7 @@ define([
mkSlidePreviewPane(framework, $contentContainer);
mkMarkdownToolbar(framework, editor);
CodeMirror.configureTheme();
CodeMirror.configureTheme(common);
framework.onContentUpdate(function (newContent) {
CodeMirror.contentUpdate(newContent);
@ -550,7 +552,6 @@ define([
var main = function () {
var CodeMirror;
var editor;
var common;
var framework;
nThen(function (waitFor) {
@ -573,20 +574,14 @@ define([
nThen(function (waitFor) {
$(waitFor());
// TODO(cjd): This is crap but we cannot bring up codemirror until after
// the CryptPad Common is up and we can't bring up framework
// without codemirror.
SFCommon.create(waitFor(function (c) { common = c; }));
}).nThen(function () {
CodeMirror = common.initCodeMirrorApp(null, CMeditor);
CodeMirror = SFCodeMirror.create(null, CMeditor);
$('.CodeMirror').addClass('fullPage');
editor = CodeMirror.editor;
}).nThen(waitFor());
}).nThen(function (waitFor) {
common.getSframeChannel().onReady(waitFor());
}).nThen(function (/*waitFor*/) {
common.isPresentUrl(function (err, val) {
framework._.sfCommon.isPresentUrl(function (err, val) {
andThen2(editor, CodeMirror, framework, val);
});
});