Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Overlapping quote reply button on Android.

This commit is contained in:
Guo Xiang Tan 2016-03-23 16:06:09 +08:00
parent 3ae1df63d5
commit fa56082f94
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/controllers/quote-button.js.es6
View File

@ -62,7 +62,9 @@ export default Ember.Controller.extend({
markerElement.appendChild(document.createTextNode("\ufeff")); markerElement.appendChild(document.createTextNode("\ufeff"));
const isMobileDevice = this.site.isMobileDevice; const isMobileDevice = this.site.isMobileDevice;
const isIOS = this.capabilities.isIOS; const capabilities = this.capabilities,
isIOS = capabilities.isIOS,
isAndroid = capabilities.isAndroid;
// collapse the range at the beginning/end of the selection // collapse the range at the beginning/end of the selection
range.collapse(!isMobileDevice); range.collapse(!isMobileDevice);
@ -86,7 +88,7 @@ export default Ember.Controller.extend({
let topOff = markerOffset.top; let topOff = markerOffset.top;
let leftOff = markerOffset.left; let leftOff = markerOffset.left;
if (isMobileDevice || isIOS) { if (isMobileDevice || isIOS || isAndroid) {
topOff = topOff + 20; topOff = topOff + 20;
leftOff = Math.min(leftOff + 10, $(window).width() - $quoteButton.outerWidth()); leftOff = Math.min(leftOff + 10, $(window).width() - $quoteButton.outerWidth());
} else { } else {