Merge pull request #180 from A-312/no-previous-function

Add `toolbar` variable instead `wrapper.previousSibling`
pull/203/head
Jeroen Akkerman 4 years ago committed by GitHub
commit df3d6511c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -306,12 +306,10 @@ function toggleFullScreen(editor) {
// Update toolbar class // Update toolbar class
var wrap = cm.getWrapperElement(); if (!/fullscreen/.test(editor.toolbar_div.className)) {
editor.toolbar_div.className += ' fullscreen';
if (!/fullscreen/.test(wrap.previousSibling.className)) {
wrap.previousSibling.className += ' fullscreen';
} else { } else {
wrap.previousSibling.className = wrap.previousSibling.className.replace(/\s*fullscreen\b/, ''); editor.toolbar_div.className = editor.toolbar_div.className.replace(/\s*fullscreen\b/, '');
} }
@ -859,7 +857,7 @@ function toggleSideBySide(editor) {
/\s*editor-preview-active\s*/g, '' /\s*editor-preview-active\s*/g, ''
); );
var toolbar = editor.toolbarElements.preview; var toolbar = editor.toolbarElements.preview;
var toolbar_div = wrapper.previousSibling; var toolbar_div = editor.toolbar_div;
toolbar.className = toolbar.className.replace(/\s*active\s*/g, ''); toolbar.className = toolbar.className.replace(/\s*active\s*/g, '');
toolbar_div.className = toolbar_div.className.replace(/\s*disabled-for-preview*/g, ''); toolbar_div.className = toolbar_div.className.replace(/\s*disabled-for-preview*/g, '');
} }
@ -896,7 +894,7 @@ function toggleSideBySide(editor) {
function togglePreview(editor) { function togglePreview(editor) {
var cm = editor.codemirror; var cm = editor.codemirror;
var wrapper = cm.getWrapperElement(); var wrapper = cm.getWrapperElement();
var toolbar_div = wrapper.previousSibling; var toolbar_div = editor.toolbar_div;
var toolbar = editor.options.toolbar ? editor.toolbarElements.preview : false; var toolbar = editor.options.toolbar ? editor.toolbarElements.preview : false;
var preview = wrapper.lastChild; var preview = wrapper.lastChild;
if (!preview || !/editor-preview-full/.test(preview.className)) { if (!preview || !/editor-preview-full/.test(preview.className)) {
@ -2336,6 +2334,7 @@ EasyMDE.prototype.createToolbar = function (items) {
})(items[i]); })(items[i]);
} }
self.toolbar_div = bar;
self.toolbarElements = toolbarData; self.toolbarElements = toolbarData;
var cm = this.codemirror; var cm = this.codemirror;

Loading…
Cancel
Save