* markdown v2, 修复笔记内容覆盖
This commit is contained in:
2
public/js/markdown-v2.min.js
vendored
2
public/js/markdown-v2.min.js
vendored
File diff suppressed because one or more lines are too long
@ -16576,8 +16576,17 @@ define('core',[
|
|||||||
if (window.lightMode) {
|
if (window.lightMode) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
var scrollTop = aceEditor.renderer.getScrollTop();
|
|
||||||
var pos = aceEditor.getCursorPosition();
|
var scrollTop;
|
||||||
|
var pos;
|
||||||
|
if (aceEditor) {
|
||||||
|
scrollTop = aceEditor.renderer.getScrollTop();
|
||||||
|
pos = aceEditor.getCursorPosition();
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
scrollTop = 0;
|
||||||
|
pos = 0;
|
||||||
|
}
|
||||||
var content = MD.getContent();
|
var content = MD.getContent();
|
||||||
|
|
||||||
core._resetToolBar();
|
core._resetToolBar();
|
||||||
@ -16604,6 +16613,7 @@ define('core',[
|
|||||||
$editorElt.val(content);
|
$editorElt.val(content);
|
||||||
|
|
||||||
window.lightMode = true;
|
window.lightMode = true;
|
||||||
|
aceEditor = null;
|
||||||
MD.clearUndo();
|
MD.clearUndo();
|
||||||
eventMgr.onToggleMode(editor);
|
eventMgr.onToggleMode(editor);
|
||||||
core._moveCursorTo(pos.row, pos.column);
|
core._moveCursorTo(pos.row, pos.column);
|
||||||
@ -16695,7 +16705,7 @@ define('core',[
|
|||||||
documentContent = undefined;
|
documentContent = undefined;
|
||||||
var initDocumentContent = fileDesc.content;
|
var initDocumentContent = fileDesc.content;
|
||||||
|
|
||||||
if(aceEditor !== undefined) {
|
if(!window.lightMode) {
|
||||||
aceEditor.setValue(initDocumentContent, -1);
|
aceEditor.setValue(initDocumentContent, -1);
|
||||||
// 重新设置undo manage
|
// 重新设置undo manage
|
||||||
// aceEditor.getSession().setUndoManager(new ace.UndoManager());
|
// aceEditor.getSession().setUndoManager(new ace.UndoManager());
|
||||||
@ -16706,7 +16716,9 @@ define('core',[
|
|||||||
|
|
||||||
// If the editor is already created
|
// If the editor is already created
|
||||||
if(editor !== undefined) {
|
if(editor !== undefined) {
|
||||||
aceEditor && fileDesc.editorSelectRange && aceEditor.selection.setSelectionRange(fileDesc.editorSelectRange);
|
if(!window.lightMode) {
|
||||||
|
aceEditor && fileDesc.editorSelectRange && aceEditor.selection.setSelectionRange(fileDesc.editorSelectRange);
|
||||||
|
}
|
||||||
// aceEditor ? aceEditor.focus() : $editorElt.focus();
|
// aceEditor ? aceEditor.focus() : $editorElt.focus();
|
||||||
editor.refreshPreview();
|
editor.refreshPreview();
|
||||||
|
|
||||||
@ -16782,7 +16794,7 @@ define('core',[
|
|||||||
|
|
||||||
function checkDocumentChanges() {
|
function checkDocumentChanges() {
|
||||||
var newDocumentContent = $editorElt.val();
|
var newDocumentContent = $editorElt.val();
|
||||||
if(aceEditor !== undefined) {
|
if(!window.lightMode && aceEditor) {
|
||||||
newDocumentContent = aceEditor.getValue();
|
newDocumentContent = aceEditor.getValue();
|
||||||
}
|
}
|
||||||
if(documentContent !== undefined && documentContent != newDocumentContent) {
|
if(documentContent !== undefined && documentContent != newDocumentContent) {
|
||||||
|
2
public/md/main-v2.min.js
vendored
2
public/md/main-v2.min.js
vendored
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user