catch up to master
This commit is contained in:
parent
7333acb2f2
commit
fa6a88a7c8
@ -207,11 +207,11 @@ $("#e10_3").select2({
|
|||||||
|
|
||||||
|
|
||||||
<section id="changelog">
|
<section id="changelog">
|
||||||
<h2>Changelog from 2.0</h2>
|
<h2>Changelog from 2.x</h2>
|
||||||
<div class="row"><div class="span12">
|
<div class="row"><div class="span12">
|
||||||
<ul>
|
<ul>
|
||||||
<li>Added support for disabled mode. See <a href="#disabled">Disabled Mode</a> example</li>
|
<li>Dropdown div is now appended directly to <code>body</code> and is absolutely positioned. This should help when Select2 is inside constrained elements such as modals.</li>
|
||||||
<li>Added ability to provide custom matcher functions. See <a href="#matcher">Custom Matcher Function</a> example</li>
|
<li>Optgroups are now supported.</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div></div>
|
</div></div>
|
||||||
</section>
|
</section>
|
||||||
@ -240,10 +240,123 @@ $("#e10_3").select2({
|
|||||||
<div class="span4">
|
<div class="span4">
|
||||||
<h3>The Basics</h3>
|
<h3>The Basics</h3>
|
||||||
<p>Select2 can take a regular select box like this:</p>
|
<p>Select2 can take a regular select box like this:</p>
|
||||||
<p><select style="width:300px"><option value="AL">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></p>
|
<p><select style="width:300px">
|
||||||
|
<optgroup label="Alaskan/Hawaiian Time Zone">
|
||||||
|
<option value="AK">Alaska</option>
|
||||||
|
<option value="HI">Hawaii</option>
|
||||||
|
</optgroup>
|
||||||
|
<optgroup label="Pacific Time Zone">
|
||||||
|
<option value="CA">California</option>
|
||||||
|
<option value="NV">Nevada</option>
|
||||||
|
<option value="OR">Oregon</option>
|
||||||
|
<option value="WA">Washington</option>
|
||||||
|
</optgroup>
|
||||||
|
<optgroup label="Mountain Time Zone">
|
||||||
|
<option value="AZ">Arizona</option>
|
||||||
|
<option value="CO">Colorado</option>
|
||||||
|
<option value="ID">Idaho</option>
|
||||||
|
<option value="MT">Montana</option><option value="NE">Nebraska</option>
|
||||||
|
<option value="NM">New Mexico</option>
|
||||||
|
<option value="ND">North Dakota</option>
|
||||||
|
<option value="UT">Utah</option>
|
||||||
|
<option value="WY">Wyoming</option>
|
||||||
|
</optgroup>
|
||||||
|
<optgroup label="Central Time Zone">
|
||||||
|
<option value="AL">Alabama</option>
|
||||||
|
<option value="AR">Arkansas</option>
|
||||||
|
<option value="IL">Illinois</option>
|
||||||
|
<option value="IA">Iowa</option>
|
||||||
|
<option value="KS">Kansas</option>
|
||||||
|
<option value="KY">Kentucky</option>
|
||||||
|
<option value="LA">Louisiana</option>
|
||||||
|
<option value="MN">Minnesota</option>
|
||||||
|
<option value="MS">Mississippi</option>
|
||||||
|
<option value="MO">Missouri</option>
|
||||||
|
<option value="OK">Oklahoma</option>
|
||||||
|
<option value="SD">South Dakota</option>
|
||||||
|
<option value="TX">Texas</option>
|
||||||
|
<option value="TN">Tennessee</option>
|
||||||
|
<option value="WI">Wisconsin</option>
|
||||||
|
</optgroup>
|
||||||
|
<optgroup label="Eastern Time Zone">
|
||||||
|
<option value="CT">Connecticut</option>
|
||||||
|
<option value="DE">Delaware</option>
|
||||||
|
<option value="FL">Florida</option>
|
||||||
|
<option value="GA">Georgia</option>
|
||||||
|
<option value="IN">Indiana</option>
|
||||||
|
<option value="ME">Maine</option>
|
||||||
|
<option value="MD">Maryland</option>
|
||||||
|
<option value="MA">Massachusetts</option>
|
||||||
|
<option value="MI">Michigan</option>
|
||||||
|
<option value="NH">New Hampshire</option><option value="NJ">New Jersey</option>
|
||||||
|
<option value="NY">New York</option>
|
||||||
|
<option value="NC">North Carolina</option>
|
||||||
|
<option value="OH">Ohio</option>
|
||||||
|
<option value="PA">Pennsylvania</option><option value="RI">Rhode Island</option><option value="SC">South Carolina</option>
|
||||||
|
<option value="VT">Vermont</option><option value="VA">Virginia</option>
|
||||||
|
<option value="WV">West Virginia</option>
|
||||||
|
</optgroup>
|
||||||
|
</select>
|
||||||
|
</p>
|
||||||
<p>and turns it into:</p>
|
<p>and turns it into:</p>
|
||||||
<p>
|
<p>
|
||||||
<select id="e1" style="width:300px"><option value="AL">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/>
|
<select id="e1" style="width:300px">
|
||||||
|
<optgroup label="Alaskan/Hawaiian Time Zone">
|
||||||
|
<option value="AK">Alaska</option>
|
||||||
|
<option value="HI">Hawaii</option>
|
||||||
|
</optgroup>
|
||||||
|
<optgroup label="Pacific Time Zone">
|
||||||
|
<option value="CA">California</option>
|
||||||
|
<option value="NV">Nevada</option>
|
||||||
|
<option value="OR">Oregon</option>
|
||||||
|
<option value="WA">Washington</option>
|
||||||
|
</optgroup>
|
||||||
|
<optgroup label="Mountain Time Zone">
|
||||||
|
<option value="AZ">Arizona</option>
|
||||||
|
<option value="CO">Colorado</option>
|
||||||
|
<option value="ID">Idaho</option>
|
||||||
|
<option value="MT">Montana</option><option value="NE">Nebraska</option>
|
||||||
|
<option value="NM">New Mexico</option>
|
||||||
|
<option value="ND">North Dakota</option>
|
||||||
|
<option value="UT">Utah</option>
|
||||||
|
<option value="WY">Wyoming</option>
|
||||||
|
</optgroup>
|
||||||
|
<optgroup label="Central Time Zone">
|
||||||
|
<option value="AL">Alabama</option>
|
||||||
|
<option value="AR">Arkansas</option>
|
||||||
|
<option value="IL">Illinois</option>
|
||||||
|
<option value="IA">Iowa</option>
|
||||||
|
<option value="KS">Kansas</option>
|
||||||
|
<option value="KY">Kentucky</option>
|
||||||
|
<option value="LA">Louisiana</option>
|
||||||
|
<option value="MN">Minnesota</option>
|
||||||
|
<option value="MS">Mississippi</option>
|
||||||
|
<option value="MO">Missouri</option>
|
||||||
|
<option value="OK">Oklahoma</option>
|
||||||
|
<option value="SD">South Dakota</option>
|
||||||
|
<option value="TX">Texas</option>
|
||||||
|
<option value="TN">Tennessee</option>
|
||||||
|
<option value="WI">Wisconsin</option>
|
||||||
|
</optgroup>
|
||||||
|
<optgroup label="Eastern Time Zone">
|
||||||
|
<option value="CT">Connecticut</option>
|
||||||
|
<option value="DE">Delaware</option>
|
||||||
|
<option value="FL">Florida</option>
|
||||||
|
<option value="GA">Georgia</option>
|
||||||
|
<option value="IN">Indiana</option>
|
||||||
|
<option value="ME">Maine</option>
|
||||||
|
<option value="MD">Maryland</option>
|
||||||
|
<option value="MA">Massachusetts</option>
|
||||||
|
<option value="MI">Michigan</option>
|
||||||
|
<option value="NH">New Hampshire</option><option value="NJ">New Jersey</option>
|
||||||
|
<option value="NY">New York</option>
|
||||||
|
<option value="NC">North Carolina</option>
|
||||||
|
<option value="OH">Ohio</option>
|
||||||
|
<option value="PA">Pennsylvania</option><option value="RI">Rhode Island</option><option value="SC">South Carolina</option>
|
||||||
|
<option value="VT">Vermont</option><option value="VA">Virginia</option>
|
||||||
|
<option value="WV">West Virginia</option>
|
||||||
|
</optgroup>
|
||||||
|
</select>
|
||||||
</p>
|
</p>
|
||||||
<p>with support for quick option filtering via a search box</p>
|
<p>with support for quick option filtering via a search box</p>
|
||||||
</div>
|
</div>
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit 94ffecb824cccab6b8df93d6ac5212e50817d6a6
|
Subproject commit 55fd00169e344cfb3f49f062dc317416ba05be15
|
Loading…
Reference in New Issue
Block a user