Merge branch 'master' into staging

This commit is contained in:
ansuz
2017-09-20 12:07:01 +02:00

View File

@@ -230,7 +230,7 @@ define([
if (data !== false) {
$previewContainer.show();
APP.$previewButton.addClass('active');
$codeMirror.removeClass('fullPage');
$codeMirror.removeClass('cp-app-code-fullpage');
}
});
return;
@@ -238,7 +238,7 @@ define([
APP.$previewButton.hide();
$previewContainer.hide();
APP.$previewButton.removeClass('active');
$codeMirror.addClass('fullPage');
$codeMirror.addClass('cp-app-code-fullpage');
};
config.onInit = function (info) {
@@ -604,7 +604,7 @@ define([
SFCommon.create(waitFor(function (c) { APP.common = common = c; }));
}).nThen(function (/*waitFor*/) {
CodeMirror = common.initCodeMirrorApp(null, CM);
$('.CodeMirror').addClass('fullPage');
$('.CodeMirror').addClass('cp-app-code-fullpage');
editor = CodeMirror.editor;
Cryptpad.onError(function (info) {
if (info && info.type === "store") {