catch up to latest trunk
This commit is contained in:
Igor Vaynberg
parent
302fc9aa18
commit
deb2a5ab60
@ -194,6 +194,7 @@ $("#e10_3").select2({
|
|||||||
<li><a href="#pragmatic">Pragmatic control</a></li>
|
<li><a href="#pragmatic">Pragmatic control</a></li>
|
||||||
<li><a href="#event_change">Events: Change</a></li>
|
<li><a href="#event_change">Events: Change</a></li>
|
||||||
<li><a href="#event_ext_change">Events: Reacting to External Changes</a></li>
|
<li><a href="#event_ext_change">Events: Reacting to External Changes</a></li>
|
||||||
|
<li><a href="#disabled">Disabled Mode</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
<li><a href="#documentation">Documentation</a></li>
|
<li><a href="#documentation">Documentation</a></li>
|
||||||
@ -202,20 +203,16 @@ $("#e10_3").select2({
|
|||||||
</div>
|
</div>
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
<!--
|
|
||||||
<section id="changelog">
|
<section id="changelog">
|
||||||
<h2>Changelog from 2.0</h2>
|
<h2>Changelog from 2.0</h2>
|
||||||
<div class="row"><div class="span12">
|
<div class="row"><div class="span12">
|
||||||
<ul>
|
<ul>
|
||||||
<li>Support for selection of multiple values. See <code>multiple</code> option in the docs.</li>
|
<li>Added support for disabled mode. See <a href="#disabled">Disabled Mode</a> example</li>
|
||||||
<li>Built-in tagging support. See the <strong>Tagging</strong> example.</li>
|
|
||||||
<li>Ability to reset back to placeholder once a selection has been made. See <code>allowClear</code> option in the docs.</li>
|
|
||||||
<li>Simplified paging of remote datasets by tracking the page number automatically.</li>
|
|
||||||
<li>Minimum required jQuery version changed from 1.7+ to 1.4.2</li>
|
|
||||||
</ul>
|
</ul>
|
||||||
</div></div>
|
</div></div>
|
||||||
</section>
|
</section>
|
||||||
-->
|
|
||||||
|
|
||||||
<section>
|
<section>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
@ -589,6 +586,30 @@ $("#e15").select2("container").find("ul.select2-choices").sortable({
|
|||||||
</article>
|
</article>
|
||||||
|
|
||||||
|
|
||||||
|
<article class="row zebra" id="disabled">
|
||||||
|
<script id="script_e16">
|
||||||
|
$(document).ready(function () {
|
||||||
|
$("#e16").select2();
|
||||||
|
$("#e16_2").select2();
|
||||||
|
$("#e16_enable").click(function() { $("#e16,#e16_2").select2("enable"); });
|
||||||
|
$("#e16_disable").click(function() { $("#e16,#e16_2").select2("disable"); });
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
<div class="span4">
|
||||||
|
<h3>Select2 Disabled Mode</h3>
|
||||||
|
<p><select disabled="disabled" id="e16" style="width:300px"><option value="AL" selected>Alabama</option><option value="AK">Alaska</option><option value="AZ">Arizona</option><option value="AR">Arkansas</option><option value="CA">California</option><option value="CO">Colorado</option><option value="CT">Connecticut</option><option value="DE">Delaware</option><option value="FL">Florida</option><option value="GA">Georgia</option><option value="HI">Hawaii</option><option value="ID">Idaho</option><option value="IL">Illinois</option><option value="IN">Indiana</option><option value="IA">Iowa</option><option value="KS">Kansas</option><option value="KY">Kentucky</option><option value="LA">Louisiana</option><option value="ME">Maine</option><option value="MD">Maryland</option><option value="MA">Massachusetts</option><option value="MI">Michigan</option><option value="MN">Minnesota</option><option value="MS">Mississippi</option><option value="MO">Missouri</option><option value="MT">Montana</option><option value="NE">Nebraska</option><option value="NV">Nevada</option><option value="NH">New Hampshire</option><option value="NJ">New Jersey</option><option value="NM">New Mexico</option><option value="NY">New York</option><option value="NC">North Carolina</option><option value="ND">North Dakota</option><option value="OH">Ohio</option><option value="OK">Oklahoma</option><option value="OR">Oregon</option><option value="PA">Pennsylvania</option><option value="RI">Rhode Island</option><option value="SC">South Carolina</option><option value="SD">South Dakota</option><option value="TN">Tennessee</option><option value="TX">Texas</option><option value="UT">Utah</option><option value="VT">Vermont</option><option value="VA">Virginia</option><option value="WA">Washington</option><option value="WV">West Virginia</option><option value="WI">Wisconsin</option><option value="WY">Wyoming</option></select><br/></p>
|
||||||
|
<p><select disabled="disabled" id="e16_2" multiple style="width:300px"><option value="AL" selected>Alabama</option><option value="AK">Alaska</option><option value="AZ" selected>Arizona</option><option value="AR">Arkansas</option><option value="CA">California</option><option value="CO">Colorado</option><option value="CT">Connecticut</option><option value="DE">Delaware</option><option value="FL">Florida</option><option value="GA">Georgia</option><option value="HI">Hawaii</option><option value="ID">Idaho</option><option value="IL">Illinois</option><option value="IN">Indiana</option><option value="IA">Iowa</option><option value="KS">Kansas</option><option value="KY">Kentucky</option><option value="LA">Louisiana</option><option value="ME">Maine</option><option value="MD">Maryland</option><option value="MA">Massachusetts</option><option value="MI">Michigan</option><option value="MN">Minnesota</option><option value="MS">Mississippi</option><option value="MO">Missouri</option><option value="MT">Montana</option><option value="NE">Nebraska</option><option value="NV">Nevada</option><option value="NH">New Hampshire</option><option value="NJ">New Jersey</option><option value="NM">New Mexico</option><option value="NY">New York</option><option value="NC">North Carolina</option><option value="ND">North Dakota</option><option value="OH">Ohio</option><option value="OK">Oklahoma</option><option value="OR">Oregon</option><option value="PA">Pennsylvania</option><option value="RI">Rhode Island</option><option value="SC">South Carolina</option><option value="SD">South Dakota</option><option value="TN">Tennessee</option><option value="TX">Texas</option><option value="UT">Utah</option><option value="VT">Vermont</option><option value="VA">Virginia</option><option value="WA">Washington</option><option value="WV">West Virginia</option><option value="WI">Wisconsin</option><option value="WY">Wyoming</option></select><br/></p>
|
||||||
|
<p><input type="button" id="e16_enable" class="btn btn-primary" value="Enable"/> <input type="button" id="e16_disable" class="btn btn-warning"value="Disable"/></p>
|
||||||
|
</div>
|
||||||
|
<div class="span8">
|
||||||
|
<h3>Example Code</h3>
|
||||||
|
<pre class="prettyprint linenums" id="code_e16">
|
||||||
|
</pre>
|
||||||
|
</div>
|
||||||
|
</article>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
|
||||||
@ -898,6 +919,15 @@ $("#tags").select2({
|
|||||||
<div class="span12"><h3>close</h3></div>
|
<div class="span12"><h3>close</h3></div>
|
||||||
</div>
|
</div>
|
||||||
<p>Closes the dropdown</p>
|
<p>Closes the dropdown</p>
|
||||||
|
<div class="row">
|
||||||
|
<div class="span12"><h3>disable</h3></div>
|
||||||
|
</div>
|
||||||
|
<p>Disables Select2. During this mode the user is not allowed to manipulate the selection.</p>
|
||||||
|
<div class="row">
|
||||||
|
<div class="span12"><h3>enable</h3></div>
|
||||||
|
</div>
|
||||||
|
<p>Enables Select2.</p>
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="span12"><h3>container</h3></div>
|
<div class="span12"><h3>container</h3></div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
Subproject commit c27880c19c90821138fe4e754a449f35a2ce9aa9
|
Subproject commit 98903a4621be8c8e2219b325caee430acb058555
|
||||||
Loading…
Reference in New Issue
Block a user