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

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

Browse Source
This commit is contained in:
ansuz 2017-06-12 12:32:48 +02:00
commit b3221c0fb4
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/code/code.css
View File

@ -18,11 +18,13 @@ body {
display: inline-block; display: inline-block;
height: 100%; height: 100%;
width: 50%; width: 50%;
transition: width 500ms, min-width 500ms, max-width 500ms;
min-width: 20%; min-width: 20%;
max-width: 80%; max-width: 80%;
resize: horizontal; resize: horizontal;
} }
.CodeMirror.transition {
transition: width 500ms, min-width 500ms, max-width 500ms;
}
.CodeMirror.fullPage { .CodeMirror.fullPage {
min-width: 100%; min-width: 100%;
max-width: 100%; max-width: 100%;

4
www/code/code.less
View File

@ -22,7 +22,9 @@ body {
display: inline-block; display: inline-block;
height: 100%; height: 100%;
width: 50%; width: 50%;
transition: width @slideTime, min-width @slideTime, max-width @slideTime; &.transition {
transition: width @slideTime, min-width @slideTime, max-width @slideTime;
}
min-width: 20%; min-width: 20%;
max-width: 80%; max-width: 80%;
resize: horizontal; resize: horizontal;

10
www/code/main.js
View File

@ -144,6 +144,11 @@ define([
var onModeChanged = function (mode) { var onModeChanged = function (mode) {
var $codeMirror = $iframe.find('.CodeMirror'); var $codeMirror = $iframe.find('.CodeMirror');
window.clearTimeout(APP.previewTo);
$codeMirror.addClass('transition');
APP.previewTo = window.setTimeout(function () {
$codeMirror.removeClass('transition');
}, 500);
if (mode === "markdown") { if (mode === "markdown") {
APP.$previewButton.show(); APP.$previewButton.show();
Cryptpad.getPadAttribute('previewMode', function (e, data) { Cryptpad.getPadAttribute('previewMode', function (e, data) {
@ -244,6 +249,11 @@ define([
$previewButton.attr('title', Messages.previewButtonTitle); $previewButton.attr('title', Messages.previewButtonTitle);
$previewButton.click(function () { $previewButton.click(function () {
var $codeMirror = $iframe.find('.CodeMirror'); var $codeMirror = $iframe.find('.CodeMirror');
window.clearTimeout(APP.previewTo);
$codeMirror.addClass('transition');
APP.previewTo = window.setTimeout(function () {
$codeMirror.removeClass('transition');
}, 500);
if (CodeMirror.highlightMode !== 'markdown') { if (CodeMirror.highlightMode !== 'markdown') {
$previewContainer.show(); $previewContainer.show();
} }