From 4851682ea34bf0665a6c9f566ca4eddc3d5a9253 Mon Sep 17 00:00:00 2001 From: Igor Vaynberg Date: Tue, 17 Apr 2012 08:37:46 -0700 Subject: [PATCH] catch up to master --- index.html | 3 ++- select2-master | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index dc7a0e0c..bb9d10e8 100755 --- a/index.html +++ b/index.html @@ -655,7 +655,6 @@ $("#e14_destroy").click(function() { $("#e14").select2("destroy"); });


-

Example Code

@@ -714,6 +713,8 @@ $("#e14_destroy").click(function() { $("#e14").select2("destroy"); }); non-multi-value select boxes an empty first option element must be provided (<option></option>) for the placeholder to work.

+ +

When Select2 is used in multi-select mode the placeholder must be a string.

allowClear diff --git a/select2-master b/select2-master index c87e5706..5ccee14c 160000 --- a/select2-master +++ b/select2-master @@ -1 +1 @@ -Subproject commit c87e5706e7e7a1c5bb6aa0239cdd56a897968530 +Subproject commit 5ccee14cee027102beabc3e578509512b0fb8fd7