depau/HackMD
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix getCaretPosition in text complete might get undefined position error

Browse source
This commit is contained in:
Wu Cheng-Han 2016-10-12 17:50:01 +08:00
parent 12b7646f24
commit f3d4b55856
1 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
public/vendor/jquery-textcomplete/jquery.textcomplete.js vendored
View file

@ -863,9 +863,7 @@ if (typeof jQuery === 'undefined') {
// //
// FIXME: Calculate the left top corner of `this.option.appendTo` element. // FIXME: Calculate the left top corner of `this.option.appendTo` element.
getCaretPosition: function () { getCaretPosition: function () {
//var position = this._getCaretRelativePosition(); if ($('.CodeMirror-cursor').length > 0) {
//var offset = this.$el.offset();
//var offset = $('.CodeMirror-cursor').offset();
var position = $('.CodeMirror-cursor').position(); var position = $('.CodeMirror-cursor').position();
var menu = $('.cursor-menu .dropdown-menu'); var menu = $('.cursor-menu .dropdown-menu');
var offsetLeft = parseFloat(menu.attr('data-offset-left')); var offsetLeft = parseFloat(menu.attr('data-offset-left'));
@ -873,6 +871,23 @@ if (typeof jQuery === 'undefined') {
position.left += offsetLeft; position.left += offsetLeft;
position.top += offsetTop; position.top += offsetTop;
return position; return position;
} else {
var position = this._getCaretRelativePosition();
var offset = this.$el.offset();
// Calculate the left top corner of `this.option.appendTo` element.
var $parent = this.option.appendTo;
if ($parent) {
if (!($parent instanceof $)) { $parent = $($parent); }
var parentOffset = $parent.offsetParent().offset();
offset.top -= parentOffset.top;
offset.left -= parentOffset.left;
}
position.top += offset.top;
position.left += offset.left;
return position;
}
}, },
// Focus on the element. // Focus on the element.