Merge e96fddffcbc73f95c44be81deb16bfd1f13fa50d into 5f3a67dae25f8e855a2cf8a617cc116267223e02

This commit is contained in:
7cat 2015-12-18 08:40:11 +00:00
commit 7a72572c0a

View File

@ -333,7 +333,7 @@ function toggleSideBySide(editor) {
var wrapper = cm.getWrapperElement(); var wrapper = cm.getWrapperElement();
var preview = wrapper.nextSibling; var preview = wrapper.nextSibling;
var toolbarButton = editor.toolbarElements["side-by-side"]; var toolbarButton = editor.toolbarElements["side-by-side"];
var toggleOn = false;
if(/editor-preview-active-side/.test(preview.className)) { if(/editor-preview-active-side/.test(preview.className)) {
preview.className = preview.className.replace( preview.className = preview.className.replace(
/\s*editor-preview-active-side\s*/g, "" /\s*editor-preview-active-side\s*/g, ""
@ -351,6 +351,7 @@ function toggleSideBySide(editor) {
}, 1); }, 1);
toolbarButton.className += " active"; toolbarButton.className += " active";
wrapper.className += " CodeMirror-sided"; wrapper.className += " CodeMirror-sided";
toggleOn = true;
} }
// Hide normal preview if active // Hide normal preview if active
@ -365,13 +366,21 @@ function toggleSideBySide(editor) {
toolbar_div.className = toolbar_div.className.replace(/\s*disabled-for-preview*/g, ""); toolbar_div.className = toolbar_div.className.replace(/\s*disabled-for-preview*/g, "");
} }
// Start preview with the current text var renderfunc = function() {
preview.innerHTML = editor.options.previewRender(editor.value(), preview);
// Updates preview
cm.on("update", function() {
preview.innerHTML = editor.options.previewRender(editor.value(), preview); preview.innerHTML = editor.options.previewRender(editor.value(), preview);
}); };
//register the function it to cm object it can be reffered by next toggle.
if(!cm.renderfunc) {
cm.renderfunc = renderfunc;
}
//if toggle off should remove the old listener avoid register a new listener each click 'toggleSideBySide' button
if(toggleOn) {
preview.innerHTML = editor.options.previewRender(editor.value(), preview);
cm.on("update", cm.renderfunc);
} else {
cm.off("update", cm.renderfunc);
}
} }