From d2e13c1f910381ad25dd9061722e725d431f65b6 Mon Sep 17 00:00:00 2001 From: Igor Vaynberg Date: Sat, 22 Jun 2013 08:00:50 -0700 Subject: [PATCH] catch up to master --- select2-latest.html | 2 +- select2-master | 2 +- select2-test.html | 12 ++++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/select2-latest.html b/select2-latest.html index 727f5751..e971e4c2 100644 --- a/select2-latest.html +++ b/select2-latest.html @@ -1678,7 +1678,7 @@ $("#select").select2({

The event object contains the following custom properties:

-
data
data that was used to populate the results
+
items
data that was used to populate the results

diff --git a/select2-master b/select2-master index 455067ed..1415567a 160000 --- a/select2-master +++ b/select2-master @@ -1 +1 @@ -Subproject commit 455067ed4e60208eaf7195ad4f09d349bd20256e +Subproject commit 1415567a70fc0e95d4bfaf2ec8f66962ece36582 diff --git a/select2-test.html b/select2-test.html index d1fb860a..59e1cd55 100644 --- a/select2-test.html +++ b/select2-test.html @@ -11,6 +11,18 @@



+ + + + + + + +
+