web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into staging

Browse Source
This commit is contained in:
ansuz
2017-09-20 12:07:01 +02:00
parent 53b98c12c9 b5b84f540e
commit db4c3e7e2c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
www/code/inner.js
View File

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