From 5ee6c4eecbdb93d4f921f4b816fc2334345bf5f6 Mon Sep 17 00:00:00 2001 From: Igor Vaynberg Date: Mon, 6 Aug 2012 20:36:16 -0700 Subject: [PATCH] catch up to master --- select2-latest.html | 9 +++++++++ select2-master | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/select2-latest.html b/select2-latest.html index cbb92dc6..c66446c3 100755 --- a/select2-latest.html +++ b/select2-latest.html @@ -1013,6 +1013,15 @@ $("#e18,#e18_2").select2(); <returns>stringMessage html + formatSearchingfunction + Function used to render the "Searching..." message that is displayed while + search is in progress +
formatSearching()
+ + + +
ParameterTypeDescription
<returns>stringMessage html
+ formatInputTooShortfunction Function used to render the "Search input too short" message
formatInputTooShort(term, minLength)
diff --git a/select2-master b/select2-master index 3a1dcd14..921bf064 160000 --- a/select2-master +++ b/select2-master @@ -1 +1 @@ -Subproject commit 3a1dcd14f36dcf3d385fa4fa30d42478827d8bb0 +Subproject commit 921bf0643452b2bd3e1cb059ef9426fd611b7ea8