From 593dadec54a8f0ae2e2e5990e86da6a6c8fff550 Mon Sep 17 00:00:00 2001 From: Igor Vaynberg Date: Thu, 28 Jun 2012 05:34:26 -0700 Subject: [PATCH] trigger loadmoreifneeded on first and other pages --- select2.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/select2.js b/select2.js index 38111166..70776650 100755 --- a/select2.js +++ b/select2.js @@ -81,7 +81,7 @@ } if (k.metaKey) return true; - + return false; }, isFunctionKey: function (k) { @@ -883,12 +883,11 @@ self.opts.populateResults.call(this, results, data.results, {term: term, page: page, context:context}); + more.remove(); + if (data.more===true) { - more.detach(); - results.children().filter(":last").append(more); - more.removeClass("select2-active"); - } else { - more.remove(); + results.children().filter(":last").append("
  • " + self.opts.formatLoadMore(page+1) + "
  • "); + window.setTimeout(function() { self.loadMoreIfNeeded(); }, 10); } self.resultsPage = page; })}); @@ -960,6 +959,7 @@ if (data.more === true) { results.children().filter(":last").append("
  • " + opts.formatLoadMore(this.resultsPage) + "
  • "); + window.setTimeout(function() { self.loadMoreIfNeeded(); }, 10); } this.postprocessResults(data, initial);