From fa6a88a7c83491cb3de9a8095fc97aecd2a3462a Mon Sep 17 00:00:00 2001 From: Igor Vaynberg Date: Thu, 14 Jun 2012 00:22:05 -0700 Subject: [PATCH] catch up to master --- select2-latest.html | 123 ++++++++++++++++++++++++++++++++++++++++++-- select2-master | 2 +- 2 files changed, 119 insertions(+), 6 deletions(-) diff --git a/select2-latest.html b/select2-latest.html index 280efd2e..2c833c8a 100755 --- a/select2-latest.html +++ b/select2-latest.html @@ -207,11 +207,11 @@ $("#e10_3").select2({
-

Changelog from 2.0

+

Changelog from 2.x

    -
  • Added support for disabled mode. See Disabled Mode example
    • -
  • Added ability to provide custom matcher functions. See Custom Matcher Function example
    • +
  • Dropdown div is now appended directly to body and is absolutely positioned. This should help when Select2 is inside constrained elements such as modals.
    • +
  • Optgroups are now supported.
@@ -240,10 +240,123 @@ $("#e10_3").select2({

The Basics

Select2 can take a regular select box like this:

-

+

+

and turns it into:

-
+

with support for quick option filtering via a search box

diff --git a/select2-master b/select2-master index 94ffecb8..55fd0016 160000 --- a/select2-master +++ b/select2-master @@ -1 +1 @@ -Subproject commit 94ffecb824cccab6b8df93d6ac5212e50817d6a6 +Subproject commit 55fd00169e344cfb3f49f062dc317416ba05be15