Netsyms/easy-markdown-editor
2
0
Fork 0
mirror of https://github.com/Ionaru/easy-markdown-editor synced 2025-07-02 23:54:28 -06:00
Code Issues Releases Wiki Activity

Move from multiple "no-fullscreen" classes to one using inheritance

Browse Source
This commit is contained in:
Steve 2021-03-16 09:08:54 -07:00
parent d76872f4ff
commit 7069fd1031
2 changed files with 14 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/css/easymde.css
View File

@ -41,7 +41,7 @@
width: 50% !important; width: 50% !important;
} }
.EasyMDEContainer .CodeMirror-sided.sided--no-fullscreen { .EasyMDEContainer.sided--no-fullscreen .CodeMirror-sided {
border-right: none!important; border-right: none!important;
border-bottom-right-radius: 0px; border-bottom-right-radius: 0px;
position: relative; position: relative;
@ -118,7 +118,7 @@
padding: 0; padding: 0;
} }
.editor-toolbar.sided--no-fullscreen { .EasyMDEContainer.sided--no-fullscreen .editor-toolbar {
width: 100%; width: 100%;
} }
@ -201,7 +201,7 @@
text-align: right; text-align: right;
} }
.editor-statusbar.sided--no-fullscreen { .EasyMDEContainer.sided--no-fullscreen .editor-statusbar {
width: 100%; width: 100%;
} }
@ -253,7 +253,7 @@
display: block display: block
} }
.editor-preview-active-side.sided--no-fullscreen { .EasyMDEContainer.sided--no-fullscreen .editor-preview-active-side {
flex: 1 1 auto; flex: 1 1 auto;
height: auto; height: auto;
position: static; position: static;

40
src/js/easymde.js
View File

@ -884,38 +884,18 @@ function toggleSideBySide(editor, onlyCleanup) {
var toolbarButton = editor.toolbarElements && editor.toolbarElements['side-by-side']; var toolbarButton = editor.toolbarElements && editor.toolbarElements['side-by-side'];
var useSideBySideListener = false; var useSideBySideListener = false;
var noFullscreenItems = [ var easyMDEContainer = wrapper.parentNode;
wrapper.parentNode, // easyMDEContainer
editor.gui.toolbar,
wrapper,
preview,
editor.gui.statusbar,
];
function addNoFullscreenClass(el) {
if (el != null) {
el.className += ' sided--no-fullscreen';
}
}
function removeNoFullscreenClass(el) {
if (el != null) {
el.className = el.className.replace(
// retain spaces after the class
// in case there are subsequent classes
/\s*sided--no-fullscreen(\s*)/g, '$1'
);
}
}
// helper method to add/remove no-fullscreen classes as appropriate // helper method to add/remove no-fullscreen classes as appropriate
function setupNoFullscreenClasses(sidePreviewActive) { function setNoFullscreenClass (sidePreviewActive) {
if (editor.options.sideBySideFullscreen === false) { if (editor.options.sideBySideFullscreen === false) {
if (!cm.getOption('fullScreen') && sidePreviewActive) { if (!cm.getOption('fullScreen') && sidePreviewActive) {
easyMDEContainer.className += ' sided--no-fullscreen';
// only apply classes if !fullScreen and side preview is (or will be) active // only apply classes if !fullScreen and side preview is (or will be) active
noFullscreenItems.forEach(addNoFullscreenClass);
} else { } else {
noFullscreenItems.forEach(removeNoFullscreenClass); // retain spaces after the class
// in case there are subsequent classes
easyMDEContainer.className = easyMDEContainer.className.replace(/\s*sided--no-fullscreen(\s*)/g, '$1');
} }
} }
} }
@ -924,10 +904,10 @@ function toggleSideBySide(editor, onlyCleanup) {
if (onlyCleanup) { if (onlyCleanup) {
// if not toggling, handle noFullscreen classes as needed // if not toggling, handle noFullscreen classes as needed
setupNoFullscreenClasses(sidePreviewActive); setNoFullscreenClass(sidePreviewActive);
} else if (sidePreviewActive) { } else if (sidePreviewActive) {
// close side-by-side, and cleanup noFullscreen classes as needed // close side-by-side, and cleanup noFullscreen classes as needed
setupNoFullscreenClasses(false); setNoFullscreenClass(false);
preview.className = preview.className.replace( preview.className = preview.className.replace(
/\s*editor-preview-active-side\s*/g, '' /\s*editor-preview-active-side\s*/g, ''
); );
@ -941,7 +921,7 @@ function toggleSideBySide(editor, onlyCleanup) {
setTimeout(function () { setTimeout(function () {
if (!cm.getOption('fullScreen')) { if (!cm.getOption('fullScreen')) {
if (editor.options.sideBySideFullscreen === false) { if (editor.options.sideBySideFullscreen === false) {
setupNoFullscreenClasses(true); setNoFullscreenClass(true);
} else { } else {
toggleFullScreen(editor); toggleFullScreen(editor);
} }
@ -956,7 +936,7 @@ function toggleSideBySide(editor, onlyCleanup) {
// Hide normal (full-pane) preview if active // Hide normal (full-pane) preview if active
var previewNormal = wrapper.lastChild; var previewNormal = wrapper.lastChild;
if (!dontToggle && /editor-preview-active/.test(previewNormal.className)) { if (/editor-preview-active/.test(previewNormal.className)) {
previewNormal.className = previewNormal.className.replace( previewNormal.className = previewNormal.className.replace(
/\s*editor-preview-active\s*/g, '' /\s*editor-preview-active\s*/g, ''
); );