catch up to master
This commit is contained in:
parent
2537b8b0dd
commit
d9e78070d7
@ -5,8 +5,8 @@ group: navigation
|
||||
version: 3.0
|
||||
---
|
||||
|
||||
<link href="select2-master/select2.css" rel="stylesheet"/>
|
||||
<script src="select2-master/select2.js"></script>
|
||||
<link href="select2-master/select2.css" rel="stylesheet"/>
|
||||
<script src="select2-master/select2.js"></script>
|
||||
|
||||
<script id="script_e1">
|
||||
$(document).ready(function() {
|
||||
@ -533,11 +533,15 @@ $(document).ready(function() {
|
||||
$("#e8").select2();
|
||||
$("#e8_get").click(function () { alert("Selected value is: "+$("#e8").select2("val"));});
|
||||
$("#e8_set").click(function () { $("#e8").select2("val", "CA"); });
|
||||
$("#e8_get2").click(function () { alert("Selected data is: "+JSON.stringify($("#e8").select2("data")));});
|
||||
$("#e8_set2").click(function () { $("#e8").select2("data", {id: "CA", text: "California"}); });
|
||||
$("#e8_open").click(function () { $("#e8").select2("open"); });
|
||||
$("#e8_close").click(function () { $("#e8").select2("close"); });
|
||||
$("#e8_2").select2();
|
||||
$("#e8_2_get").click(function () { alert("Selected value is: "+$("#e8_2").select2("val"));});
|
||||
$("#e8_2_set").click(function () { $("#e8_2").select2("val", ["CA","MA"]); });
|
||||
$("#e8_2_get2").click(function () { alert("Selected value is: "+JSON.stringify($("#e8_2").select2("data")));});
|
||||
$("#e8_2_set2").click(function () { $("#e8_2").select2("data", [{id: "CA", text: "California"},{id:"MA", text: "Massachusetts"}]); });
|
||||
$("#e8_2_open").click(function () { $("#e8_2").select2("open"); });
|
||||
$("#e8_2_close").click(function () { $("#e8_2").select2("close"); });
|
||||
});
|
||||
@ -548,6 +552,8 @@ $("#e8_2_close").click(function () { $("#e8_2").select2("close"); });
|
||||
<p>
|
||||
<input type="button" class="btn-primary" id="e8_get" value="Alert selected value"/>
|
||||
<input type="button" class="btn-info" id="e8_set" value="Set to California"/>
|
||||
<input type="button" class="btn-primary" id="e8_get2" value="Alert selected using data"/>
|
||||
<input type="button" class="btn-info" id="e8_set2" value="Set to California using data"/>
|
||||
<input type="button" class="btn-warning" id="e8_open" value="Open"/>
|
||||
<input type="button" class="btn-warning" id="e8_close" value="Close"/>
|
||||
</p>
|
||||
@ -557,6 +563,8 @@ $("#e8_2_close").click(function () { $("#e8_2").select2("close"); });
|
||||
<p>
|
||||
<input type="button" class="btn-primary" id="e8_2_get" value="Alert selected value"/>
|
||||
<input type="button" class="btn-info" id="e8_2_set" value="Set to California and Massachusetts"/>
|
||||
<input type="button" class="btn-primary" id="e8_2_get2" value="Alert selected value using data"/>
|
||||
<input type="button" class="btn-info" id="e8_2_set2" value="Set to California and Massachusetts using data"/>
|
||||
<input type="button" class="btn-warning" id="e8_2_open" value="Open"/>
|
||||
<input type="button" class="btn-warning" id="e8_2_close" value="Close"/>
|
||||
</p>
|
||||
@ -1098,7 +1106,13 @@ $("#tags").select2({
|
||||
</table>
|
||||
Example: <pre class="prettyprint">alert("Selected value is: "+$("#e8").select2("val")); $("#e8").select2("val", {id:"CA", text:"Califoria"});</pre>
|
||||
|
||||
<div class="row">
|
||||
<div class="row">
|
||||
<div class="span12"><h3>data</h3></div>
|
||||
</div>
|
||||
<p>Gets or sets the selection. Analogous to <code>val</code> method, but works with objects instead of ids.</p>
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="span12"><h3>destroy</h3></div>
|
||||
</div>
|
||||
<p>Reverts changes to DOM done by Select2. Any selection done via Select2 will be preserved.</p>
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit 89ee75dd9d809d5bec923109330f6b6b6517aca1
|
||||
Subproject commit adc15e368294f39fc587a616cbded2c0a84d4754
|
Loading…
x
Reference in New Issue
Block a user