mirror of
https://github.com/cryptpad/cryptpad.git
synced 2026-09-14 11:05:41 +05:00
Fix dynamic resizing #1831
This commit is contained in:
parent
a13c354901
commit
f7e690e700
@ -1374,6 +1374,20 @@ define([
|
||||
|
||||
return $button;
|
||||
};
|
||||
UIElements.updateToolbarVisibility = function(markdownEditorWrapper, toolbar, editor) {
|
||||
let toggleButton = null;
|
||||
if (Util.isSmallScreen()) {
|
||||
if (!$(markdownEditorWrapper).find('.cp-markdown-toolbar-toggle-button').length) {
|
||||
toggleButton = UIElements.createMarkdownToolbarToggle(toolbar, editor);
|
||||
$(markdownEditorWrapper).append(toggleButton);
|
||||
}
|
||||
$(toolbar).hide();
|
||||
} else {
|
||||
$(markdownEditorWrapper).find('.cp-markdown-toolbar-toggle-button').remove();
|
||||
$(toolbar).show();
|
||||
}
|
||||
return toggleButton; // May return null if not created
|
||||
};
|
||||
|
||||
|
||||
/* Create a usage bar which keeps track of how much storage space is used
|
||||
|
||||
@ -1127,14 +1127,10 @@ define([
|
||||
});
|
||||
var toggleRow = h('div.cp-markdown-toggle-row');
|
||||
$(block).prepend(markdownTb.toolbar);
|
||||
if(Util.isSmallScreen()) {
|
||||
var toggleButton = UIElements.createMarkdownToolbarToggle(markdownTb.toolbar, editor);
|
||||
$(toggleRow).append(toggleButton);
|
||||
$(markdownTb.toolbar).hide();
|
||||
}
|
||||
else {
|
||||
$(markdownTb.toolbar).show();
|
||||
}
|
||||
UIElements.updateToolbarVisibility(toggleRow, markdownTb.toolbar, editor);
|
||||
$(window).on('resize', function() {
|
||||
UIElements.updateToolbarVisibility(toggleRow, markdownTb.toolbar, editor);
|
||||
});
|
||||
$(block).prepend(toggleRow);
|
||||
cm.configureTheme(APP.common, function () {});
|
||||
}
|
||||
|
||||
@ -174,20 +174,6 @@ define([
|
||||
}
|
||||
_updateBoardsThrottle(framework, kanban, boards);
|
||||
};
|
||||
|
||||
var updateToolbarVisibility = function(markdownEditorWrapper, toolbar, editor) {
|
||||
if (Util.isSmallScreen()) {
|
||||
if (!$(markdownEditorWrapper).find('.cp-markdown-toolbar-toggle-button').length) {
|
||||
var toggleButton = UIElements.createMarkdownToolbarToggle(toolbar, editor);
|
||||
$(markdownEditorWrapper).append(toggleButton);
|
||||
}
|
||||
$(toolbar).hide();
|
||||
} else {
|
||||
$(markdownEditorWrapper).find('.cp-markdown-toolbar-toggle-button').remove();
|
||||
$(toolbar).show();
|
||||
}
|
||||
};
|
||||
|
||||
var editModal;
|
||||
var PROPERTIES = ['title', 'body', 'tags', 'color'];
|
||||
var BOARD_PROPERTIES = ['title', 'color'];
|
||||
@ -299,9 +285,9 @@ define([
|
||||
editor.replaceSelection($(mt)[0].outerHTML);
|
||||
}
|
||||
});
|
||||
updateToolbarVisibility(markdownEditorWrapper, markdownTb.toolbar, editor);
|
||||
UIElements.updateToolbarVisibility(markdownEditorWrapper, markdownTb.toolbar, editor);
|
||||
$(window).on('resize', function() {
|
||||
updateToolbarVisibility(markdownEditorWrapper, markdownTb.toolbar, editor);
|
||||
UIElements.updateToolbarVisibility(markdownEditorWrapper, markdownTb.toolbar, editor);
|
||||
});
|
||||
$(markdownTb.toolbar).on('keydown', function (e) {
|
||||
if (e.which === 27) { // Escape key
|
||||
|
||||
@ -540,19 +540,17 @@ define([
|
||||
|
||||
var markdownTb = common.createMarkdownToolbar(editor);
|
||||
var toggleRow = h('div.cp-markdown-toggle-row');
|
||||
if(Util.isSmallScreen()) {
|
||||
var toggleButton = UIElements.createMarkdownToolbarToggle(markdownTb.toolbar, editor);
|
||||
$(toggleRow).append(toggleButton);
|
||||
$(markdownTb.toolbar).hide();
|
||||
$(toggleButton).removeClass('btn-toolbar-alt');
|
||||
$(toggleButton).append('<span class="toggle-label">Show tools</span>');
|
||||
}
|
||||
else {
|
||||
$(markdownTb.toolbar).show();
|
||||
}
|
||||
var toggleButton = UIElements.updateToolbarVisibility(toggleRow, markdownTb.toolbar, editor);
|
||||
$(window).on('resize', function() {
|
||||
UIElements.updateToolbarVisibility(toggleRow, markdownTb.toolbar, editor);
|
||||
});
|
||||
$(toggleButton).removeClass('btn-toolbar-alt');
|
||||
$(toggleButton).append('<span class="toggle-label">Show tools</span>');
|
||||
$(code).prepend(markdownTb.toolbar);
|
||||
$(code).prepend(toggleRow);
|
||||
|
||||
if(!Util.isSmallScreen()) {
|
||||
$(markdownTb.toolbar).show();
|
||||
}
|
||||
$(button).click(function () {
|
||||
$(code).show();
|
||||
APP.editor.refresh();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user