From 44a70ceb561c7751e30e9995062ed35c21dd374f Mon Sep 17 00:00:00 2001 From: benweet Date: Tue, 3 Sep 2013 23:44:25 +0100 Subject: [PATCH] Upgrade to Bootstrap 3 --- cache.manifest | 2 +- res-min/main.js | 34 +++++++++++++++++++++------------- res/extensions/scrollLink.js | 12 ++++++++++++ 3 files changed, 34 insertions(+), 14 deletions(-) diff --git a/cache.manifest b/cache.manifest index 48009393..dc6a43ea 100644 --- a/cache.manifest +++ b/cache.manifest @@ -1,5 +1,5 @@ CACHE MANIFEST -#Date Tue Sep 03 2013 23:30:01 +#Date Tue Sep 03 2013 23:44:13 CACHE: index.html diff --git a/res-min/main.js b/res-min/main.js index 9965cbb9..e7557789 100644 --- a/res-min/main.js +++ b/res-min/main.js @@ -9999,21 +9999,29 @@ function(e) { t.each(a, function(e, t) { t !== a.length - 1 ? e = 0 === e.length ? void 0 : e.substring(0, e.length - 1) : i += o(s.css("padding-bottom")), n(e); - }), d = []; - var h = 0, m = l.scrollTop(); - l.find(".preview-content > .wmd-title").each(function() { - var t = e(this), n = t.position().top + m + o(t.css("margin-top")); - d.push({ - startOffset: h, - endOffset: n, - height: n - h - }), h = n; }); - var g = l.prop("scrollHeight"); + var h = t.last(u).endOffset, m = s[0].scrollHeight, g = m / h; + u = t.map(u, function(e) { + return { + startOffset: e.startOffset * g, + endOffset: e.endOffset * g, + height: e.height * g + }; + }), d = []; + var b = 0, y = l.scrollTop(); + l.find(".preview-content > .wmd-title").each(function() { + var t = e(this), n = t.position().top + y + o(t.css("margin-top")); + d.push({ + startOffset: b, + endOffset: n, + height: n - b + }), b = n; + }); + var x = l.prop("scrollHeight"); d.push({ - startOffset: h, - endOffset: g, - height: g - h + startOffset: b, + endOffset: x, + height: x - b }), p = -10, f = -10, v(); }, 500), m = !1, g = !1, v = t.debounce(function() { function e(e, n, i, o, r, a) { diff --git a/res/extensions/scrollLink.js b/res/extensions/scrollLink.js index a1ebf1be..9ef876c2 100644 --- a/res/extensions/scrollLink.js +++ b/res/extensions/scrollLink.js @@ -67,6 +67,18 @@ define([ } addMdSection(sectionText); }); + + // Apply a coef to manage divergence in some browsers + var theoricalHeight = _.last(mdSectionList).endOffset; + var realHeight = $editorElt[0].scrollHeight; + var coef = realHeight/theoricalHeight; + mdSectionList = _.map(mdSectionList, function(mdSection) { + return { + startOffset: mdSection.startOffset * coef, + endOffset: mdSection.endOffset * coef, + height: mdSection.height * coef, + }; + }); // Try to find corresponding sections in the preview htmlSectionList = [];