RetailCRM-Mirror/select2
1
0
Fork 0
mirror of synced 2024-11-22 21:16:10 +03:00
Code Issues Projects Releases Wiki Activity

catch up to master

Browse Source
This commit is contained in:
Igor Vaynberg 2013-02-09 20:24:39 -08:00
parent 71e0ea57e8
commit 83733bb879
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
select2-latest.html
View File

@ -636,6 +636,7 @@ $("#e11")
.on("change", function(e) { log("change "+JSON.stringify({val:e.val, added:e.added, removed:e.removed})); }) .on("change", function(e) { log("change "+JSON.stringify({val:e.val, added:e.added, removed:e.removed})); })
.on("opening", function() { log("opening"); }) .on("opening", function() { log("opening"); })
.on("open", function() { log("open"); }) .on("open", function() { log("open"); })
.on("close", function() { log("close"); })
.on("highlight", function(e) { log ("highlighted val="+ e.val+" choice="+ JSON.stringify(e.choice));}) .on("highlight", function(e) { log ("highlighted val="+ e.val+" choice="+ JSON.stringify(e.choice));})
.on("selected", function(e) { log ("selected val="+ e.val+" choice="+ JSON.stringify(e.choice));}) .on("selected", function(e) { log ("selected val="+ e.val+" choice="+ JSON.stringify(e.choice));})
.on("removed", function(e) { log ("removed val="+ e.val+" choice="+ JSON.stringify(e.choice));}); .on("removed", function(e) { log ("removed val="+ e.val+" choice="+ JSON.stringify(e.choice));});
@ -643,6 +644,7 @@ $("#e11_2")
.on("change", function(e) { log("change "+JSON.stringify({val:e.val, added:e.added, removed:e.removed})); }) .on("change", function(e) { log("change "+JSON.stringify({val:e.val, added:e.added, removed:e.removed})); })
.on("opening", function() { log("opening"); }) .on("opening", function() { log("opening"); })
.on("open", function() { log("open"); }) .on("open", function() { log("open"); })
.on("close", function() { log("close"); })
.on("highlight", function(e) { log ("highlighted val="+ e.val+" choice="+ JSON.stringify(e.choice));}) .on("highlight", function(e) { log ("highlighted val="+ e.val+" choice="+ JSON.stringify(e.choice));})
.on("selected", function(e) { log ("selected val="+ e.val+" choice="+ JSON.stringify(e.choice));}) .on("selected", function(e) { log ("selected val="+ e.val+" choice="+ JSON.stringify(e.choice));})
.on("removed", function(e) { log ("removed val="+ e.val+" choice="+ JSON.stringify(e.choice));}); .on("removed", function(e) { log ("removed val="+ e.val+" choice="+ JSON.stringify(e.choice));});
@ -1317,6 +1319,7 @@ $("#tags").select2({
<pre>query(options)</pre> <pre>query(options)</pre>
<table class="table table-bordered table-striped"> <table class="table table-bordered table-striped">
<tr><th>Parameter</th><th>Type</th><th>Description</th></tr> <tr><th>Parameter</th><th>Type</th><th>Description</th></tr>
<tr><td>options.element</td><td>jquery object</td><td>The element Select2 is attached to</td></tr>
<tr><td>options.term</td><td>string</td><td>Search string entered by user</td></tr> <tr><td>options.term</td><td>string</td><td>Search string entered by user</td></tr>
<tr><td>options.page</td><td>int</td><td>1-based page number tracked by Select2 for use with infinite scrolling of results</td></tr> <tr><td>options.page</td><td>int</td><td>1-based page number tracked by Select2 for use with infinite scrolling of results</td></tr>
<tr><td>options.context</td><td>object</td><td>An object that persists across the lifecycle of queries for the same search term (the query to retrieve the initial results, and subsequent queries to retrieve more result pages for the same search term). When this function is first called for a new search term this object will be null. The user may choose to set any object in the <code>results.context</code> field - this object will then be used as the context parameter for all calls to the <code>query</code> method that will load more search results for the initial search term. The object will be reset back to null when a new search term is queried. This feature is useful when a page number is not easily mapped against the server side paging mechanism. For example, some server side paging mechanism may return a &quot;continuation token&quot; that needs to be passed back to them in order to retrieve the next page of search results.</td></tr> <tr><td>options.context</td><td>object</td><td>An object that persists across the lifecycle of queries for the same search term (the query to retrieve the initial results, and subsequent queries to retrieve more result pages for the same search term). When this function is first called for a new search term this object will be null. The user may choose to set any object in the <code>results.context</code> field - this object will then be used as the context parameter for all calls to the <code>query</code> method that will load more search results for the initial search term. The object will be reset back to null when a new search term is queried. This feature is useful when a page number is not easily mapped against the server side paging mechanism. For example, some server side paging mechanism may return a &quot;continuation token&quot; that needs to be passed back to them in order to retrieve the next page of search results.</td></tr>

2
select2-master

@ -1 +1 @@
Subproject commit a4c76f2dfb0b9a438c59a8a7409d2e7bf1ef16bf Subproject commit f15583a5550a6f4289d9c8088873bfd2ba18f46f