codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-27 09:36:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2223 from velesin/about_me_editor_fix

Browse source 
FIX: broken Pagedown editor for About, Site Content and similar places.
This commit is contained in:
Sam 2014-04-03 18:43:04 +11:00
commit 858eb5ed9a
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
app/assets/javascripts/discourse/lib/Markdown.Editor.js
View file

@ -871,10 +871,13 @@
var prevScrollPosition = $(panels.input).scrollTop();
var caretMarkerPosition = 0;
var markerPositions = {
scroller: [0, paneContentHeight(panels.previewScroller)],
preview: [0, paneContentHeight(panels.preview)]
};
var markerPositions;
if (panels.previewScroller) {
markerPositions = {
scroller: [0, paneContentHeight(panels.previewScroller)],
preview: [0, paneContentHeight(panels.preview)]
};
}
var getCaretPosition = function() {
return Discourse.Utilities.caretPosition(panels.input);
@ -1040,9 +1043,11 @@
Ember.run(function() {
pushPreviewHtml(previewText, previewScrollerText);
cacheMarkerPositions();
cacheCaretMarkerPosition();
syncScroll(true);
if (panels.previewScroller) {
cacheMarkerPositions();
cacheCaretMarkerPosition();
syncScroll(true);
}
});
};
@ -1149,12 +1154,16 @@
};
ieSafeSet(panels.preview, previewText);
ieSafeSet(panels.previewScroller, previewScrollerText);
if (panels.previewScroller) {
ieSafeSet(panels.previewScroller, previewScrollerText);
}
}
var nonSuckyBrowserPreviewSet = function (previewText, previewScrollerText) {
panels.preview.innerHTML = previewText;
panels.previewScroller.innerHTML = previewScrollerText;
if (panels.previewScroller) {
panels.previewScroller.innerHTML = previewScrollerText;
}
}
var previewSetter;
@ -1204,7 +1213,9 @@
// TODO: make option to disable. We don't need this in discourse
// setupEvents(panels.input, applyTimeout);
setupScrollSync();
if (panels.previewScroller) {
setupScrollSync();
}
makePreviewHtml();