From bbdddad6415e9413868eadd1909507e1af2b5a55 Mon Sep 17 00:00:00 2001 From: Igor Vaynberg Date: Tue, 23 Apr 2013 08:59:12 -0700 Subject: [PATCH] catch up to master --- select2-latest.html | 2 ++ select2-master | 2 +- select2-test.html | 77 ++++++++++++++++++++++++++------------------- 3 files changed, 48 insertions(+), 33 deletions(-) diff --git a/select2-latest.html b/select2-latest.html index d1ecdb66..399b92b1 100644 --- a/select2-latest.html +++ b/select2-latest.html @@ -1412,6 +1412,8 @@ $("#select").select2({ urlstring/functionString containing the ajax url or a function that returns such a string. dataTypestringData type for the request. ajax, jsonp, other formats supported by jquery quietMillisintNumber of milliseconds to wait for the user to stop typing before issuing the ajax request + cachebooleanIf set to false, it will force requested pages not to be cached by the browser. Default is false + jsonpCallbackstring/functionThe callback function name for a JSONP request. This value will be used instead of the random name automatically generated by jQuery. It is preferable to let jQuery generate a unique name as it'll make it easier to manage the requests and provide callbacks and error handling. You may want to specify the callback when you want to enable better browser caching of GET requests. datafunction Function to generate query parameters for the ajax request. 
data(term, page)
diff --git a/select2-master b/select2-master index 4a0851bc..5a9905bf 160000 --- a/select2-master +++ b/select2-master @@ -1 +1 @@ -Subproject commit 4a0851bce51e4e279f4bd6edb26b3940d0c2a117 +Subproject commit 5a9905bfa7ea1185b30a6612732ca5964f3f870e diff --git a/select2-test.html b/select2-test.html index 5cfdba5d..46d18611 100644 --- a/select2-test.html +++ b/select2-test.html @@ -8,7 +8,7 @@ - +




@@ -21,43 +21,56 @@ -
- +
+
+ + +
INSIDE A
+
INSIDE B
+ +
+ + +
hello there