From 910568983c2563342405237e966f238e94e325fc Mon Sep 17 00:00:00 2001
From: Igor Vaynberg
Date: Tue, 24 Apr 2012 10:46:44 -0700
Subject: [PATCH] catch up to master
---
index.html | 15 ++++++++++++++-
select2-master | 2 +-
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/index.html b/index.html
index bb9d10e8..74c9b7a9 100755
--- a/index.html
+++ b/index.html
@@ -123,7 +123,7 @@ $("#e5").select2({
$(document).ready(function() {
$("#e6").select2({
placeholder: {title: "Search for a movie", id: ""},
- minimumInputLength: 3,
+ minimumInputLength: 1,
ajax: { // instead of writing the function to execute the request we use Select2's convenient helper
url: "http://api.rottentomatoes.com/api/public/v1.0/movies.json",
dataType: 'jsonp',
@@ -747,6 +747,19 @@ $("#e14_destroy").click(function() { $("#e14").select2("destroy"); });
+
+ closeOnSelect |
+ boolean |
+
+
+ If set to true the dropdown is not closed after a selection is made, allowing for rapid selection of multiple items. By default this option is disabled.
+
+
+
+ Only applies when configured in multi-select mode.
+
+ |
+
formatSelection | function |
Function used to render the current selection.
diff --git a/select2-master b/select2-master
index 5ccee14c..293bd830 160000
--- a/select2-master
+++ b/select2-master
@@ -1 +1 @@
-Subproject commit 5ccee14cee027102beabc3e578509512b0fb8fd7
+Subproject commit 293bd830b29f0e9eaded8db25fecaa8bfaa72a9a
|