From c6a6d6e1d6119f5fc63e242c17960ddeade009e8 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Fri, 8 Jul 2016 15:43:04 +0800 Subject: [PATCH] FIX: Quote reply button not taking into scrolling offset. --- .../javascripts/discourse/controllers/quote-button.js.es6 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/controllers/quote-button.js.es6 b/app/assets/javascripts/discourse/controllers/quote-button.js.es6 index 76c6cb2e3a3..cd98a4264ce 100644 --- a/app/assets/javascripts/discourse/controllers/quote-button.js.es6 +++ b/app/assets/javascripts/discourse/controllers/quote-button.js.es6 @@ -72,7 +72,9 @@ export default Ember.Controller.extend({ range.insertNode(markerElement); // retrieve the position of the marker - const markerOffset = $(markerElement).offset(), + const $markerElement = $(markerElement) + markerOffset = $markerElement.offset(), + parentScrollLeft = $markerElement.parent().scrollLeft(), $quoteButton = $('.quote-button'); // remove the marker @@ -88,6 +90,8 @@ export default Ember.Controller.extend({ let topOff = markerOffset.top; let leftOff = markerOffset.left; + if (parentScrollLeft > 0) leftOff += parentScrollLeft; + if (isMobileDevice || isIOS || isAndroid) { topOff = topOff + 20; leftOff = Math.min(leftOff + 10, $(window).width() - $quoteButton.outerWidth());