RetailCRM-Mirror/select2
1
0
Fork 0
mirror of synced 2025-02-19 21:43:15 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #541 from brendanheywood/master

Browse Source 
Fixed bug with closeOnSelecet is false
This commit is contained in:
Igor Vaynberg 2012-11-02 08:57:15 -07:00
commit aa686aa47e
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
select2.js
View File

@ -1088,7 +1088,7 @@ the specific language governing permissions and limitations under the Apache Lic
y = child.offset().top - results.offset().top; y = child.offset().top - results.offset().top;
// make sure the top of the element is visible // make sure the top of the element is visible
if (y < 0) { if (y < 0 && child.css('display') != 'none' ) {
results.scrollTop(results.scrollTop() + y); // y is negative results.scrollTop(results.scrollTop() + y); // y is negative
} }
}, },
@ -2166,12 +2166,14 @@ the specific language governing permissions and limitations under the Apache Lic
} }
}); });
choices.each2(function (i, choice) { if (this.highlight() == -1){
if (!choice.hasClass("select2-disabled") && choice.hasClass("select2-result-selectable")) { choices.each2(function (i, choice) {
self.highlight(0); if (!choice.hasClass("select2-disabled") && choice.hasClass("select2-result-selectable")) {
return false; self.highlight(0);
} return false;
}); }
});
}
}, },