From deb2a5ab60c8781cc1248f838884026565d7a536 Mon Sep 17 00:00:00 2001 From: Igor Vaynberg Date: Wed, 6 Jun 2012 23:09:10 -0700 Subject: [PATCH] catch up to latest trunk --- select2-latest.html | 46 +++++++++++++++++++++++++++++++++++++-------- select2-master | 2 +- 2 files changed, 39 insertions(+), 9 deletions(-) diff --git a/select2-latest.html b/select2-latest.html index ffb9ffea..084244d6 100755 --- a/select2-latest.html +++ b/select2-latest.html @@ -194,6 +194,7 @@ $("#e10_3").select2({
  • Pragmatic control
  • Events: Change
  • Events: Reacting to External Changes
    • +
  • Disabled Mode
  • Documentation
    • @@ -202,20 +203,16 @@ $("#e10_3").select2({ - +
    @@ -589,6 +586,30 @@ $("#e15").select2("container").find("ul.select2-choices").sortable({ +
    + +
    +

    Select2 Disabled Mode

    +


    +


    +

    +
    +
    +

    Example Code

    + 
    +
    +
    +
    + + +
    @@ -899,7 +920,16 @@ $("#tags").select2({

    Closes the dropdown

    -

    container

    +

    disable

    +
    +

    Disables Select2. During this mode the user is not allowed to manipulate the selection.

    +
    +

    enable

    +
    +

    Enables Select2.

    + +
    +

    container

    Retrieves the main container element that wraps all of DOM added by Select2 Example: console.log($("#tags").select2("container"));

    diff --git a/select2-master b/select2-master index c27880c1..98903a46 160000 --- a/select2-master +++ b/select2-master @@ -1 +1 @@ -Subproject commit c27880c19c90821138fe4e754a449f35a2ce9aa9 +Subproject commit 98903a4621be8c8e2219b325caee430acb058555