RetailCRM-Mirror/select2
1
0
Fork 0
mirror of synced 2024-11-26 14:56:07 +03:00
Code Issues Projects Releases Wiki Activity

catch up to master

Browse Source
This commit is contained in:
Igor Vaynberg 2013-04-23 08:59:12 -07:00
parent d400e03a66
commit bbdddad641
3 changed files with 48 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
select2-latest.html
View File

@ -1412,6 +1412,8 @@ $("#select").select2({
<tr><td>url</td><td>string/function</td><td>String containing the ajax url or a function that returns such a string.</td></tr> <tr><td>url</td><td>string/function</td><td>String containing the ajax url or a function that returns such a string.</td></tr>
<tr><td>dataType</td><td>string</td><td>Data type for the request. <code>ajax</code>, <code>jsonp</code>, other formats supported by jquery</td></tr> <tr><td>dataType</td><td>string</td><td>Data type for the request. <code>ajax</code>, <code>jsonp</code>, other formats supported by jquery</td></tr>
<tr><td>quietMillis</td><td>int</td><td>Number of milliseconds to wait for the user to stop typing before issuing the ajax request</td></tr> <tr><td>quietMillis</td><td>int</td><td>Number of milliseconds to wait for the user to stop typing before issuing the ajax request</td></tr>
<tr><td>cache</td><td>boolean</td><td>If set to <code>false</code>, it will force requested pages not to be cached by the browser. Default is <code>false</code></td></tr>
<tr><td>jsonpCallback</td><td>string/function</td><td>The 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.</td></tr>
<tr><td>data</td><td>function</td><td> <tr><td>data</td><td>function</td><td>
Function to generate query parameters for the ajax request. Function to generate query parameters for the ajax request.
<pre>data(term, page)</pre> <pre>data(term, page)</pre>

2
select2-master

@ -1 +1 @@
Subproject commit 4a0851bce51e4e279f4bd6edb26b3940d0c2a117 Subproject commit 5a9905bfa7ea1185b30a6612732ca5964f3f870e

51
select2-test.html
View File

@ -8,7 +8,7 @@
</style> </style>
</head> </head>
<body> <body>
<div style="height:200px;"></div>
<div style="padding: 10px; margin: 10px;"> <div style="padding: 10px; margin: 10px;">
<br/><br/><br/> <br/><br/><br/>
<input type="text" size="30"/><br/> <input type="text" size="30"/><br/>
@ -21,25 +21,31 @@
<option value="NV">Nevada</option> <option value="NV">Nevada</option>
<option value="OR">Oregon</option> <option value="OR">Oregon</option>
<option value="WA">Washington</option> <option value="WA">Washington</option>
<!--
<option value="AK1">Alaska</option>
<option value="HI1">Hawaii</option>
<option value="CA1">California</option>
<option value="NV1">Nevada</option>
<option value="OR1">Oregon</option>
<option value="WA1">Washington</option><option value="AK2">Alaska</option>
<option value="HI2">Hawaii</option>
<option value="CA2">California</option>
<option value="NV2">Nevada</option>
<option value="OR2">Oregon</option>
<option value="WA2">Washington</option>
-->
</select><br/> </select><br/>
<input type="text" size="30"/> <input type="text" size="30"/><br/>
</div> <select>
<option></option>
<option value="AK">Alaska</option>
<option value="HI">Hawaii</option>
<option value="CA">California</option>
<option value="NV">Nevada</option>
<option value="OR">Oregon</option>
<option value="WA">Washington</option>
</select><br/>
<label for="e6">Label: </label>
<input type="hidden" class="bigdrop" id="e6" style="width:600px" value="16340"/> <div class="a">INSIDE A</div>
<div class="b">INSIDE B<input type="text" value="hello" class="c"/></div>
<script>
$(function() {
$(".c").on("focus", function() {
$(this).detach().appendTo($(".a"));
this.focus();
});
});
</script>
</div>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
@ -59,6 +65,13 @@
}); });
</script> </script>
<!--
<label for="e6">Label: </label>
<input type="hidden" class="bigdrop" id="e6" style="width:600px" value="16340"/>
<script id="script_e6"> <script id="script_e6">
@ -135,7 +148,7 @@
}); });
</script> </script>
-->
<div style="position: absolute; left:0; top:0; background: white; border: 1px solid red;" id="focus-spy">hello there</div> <div style="position: absolute; left:0; top:0; background: white; border: 1px solid red;" id="focus-spy">hello there</div>
<script> <script>
$(document).ready(function() { $(document).ready(function() {