RetailCRM-Mirror/select2
1
0
Fork 0
mirror of synced 2024-11-22 13:06:08 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2444 from surgeforward/undefined-top

Browse Source 
Fix error: Cannot read property 'top' of undefined
This commit is contained in:
Kevin Brown 2014-06-15 16:22:04 -04:00
commit 5a7d250071
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
select2.js
View File

@ -1483,7 +1483,7 @@ the specific language governing permissions and limitations under the Apache Lic
// abstract // abstract
ensureHighlightVisible: function () { ensureHighlightVisible: function () {
var results = this.results, children, index, child, hb, rb, y, more; var results = this.results, children, index, child, hb, rb, y, more, topOffset;
index = this.highlight(); index = this.highlight();
@ -1503,7 +1503,9 @@ the specific language governing permissions and limitations under the Apache Lic
child = $(children[index]); child = $(children[index]);
hb = child.offset().top + child.outerHeight(true); topOffset = (child.offset() || {}).top || 0;
hb = topOffset + child.outerHeight(true);
// if this is the last child lets also make sure select2-more-results is visible // if this is the last child lets also make sure select2-more-results is visible
if (index === children.length - 1) { if (index === children.length - 1) {
@ -1517,7 +1519,7 @@ the specific language governing permissions and limitations under the Apache Lic
if (hb > rb) { if (hb > rb) {
results.scrollTop(results.scrollTop() + (hb - rb)); results.scrollTop(results.scrollTop() + (hb - rb));
} }
y = child.offset().top - results.offset().top; y = topOffset - results.offset().top;
// make sure the top of the element is visible // make sure the top of the element is visible
if (y < 0 && child.css('display') != 'none' ) { if (y < 0 && child.css('display') != 'none' ) {