Skip to content

Commit 52501c8

Browse files
committed
Merge branch 'master' into selectmenu
Conflicts: entries2html.xsl
2 parents dfb6c2f + f41a233 commit 52501c8

38 files changed

+500
-127
lines changed

README.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,4 @@ The `xmllint` and `xsltproc` utilities need to be in your path. If you are on Wi
1111

1212
### Build
1313

14-
1. `npm install`
15-
2. `cp config-sample.json config.json`
16-
3. Edit config.json per https://github.com/scottgonzalez/grunt-wordpress#config
17-
4. `grunt`
14+
To build and deploy your changes for previewing in a [`jquery-wp-content`](https://github.com/jquery/jquery-wp-content) instance, follow the [workflow instructions](http://contribute.jquery.org/web-sites/#workflow) from our documentation on [contributing to jQuery Foundation web sites](http://contribute.jquery.org/web-sites/).

categories.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</category>
3535
<category name="Effects Core" slug="effects-core">
3636
<desc><![CDATA[
37-
<p>Functionality provided by jquery.ui.effect.js.</p>
37+
<p>Functionality provided by jquery.ui.effect.js. In addition to the methods listed below, jquery.ui.effect.js also includes several <a href="/easings/">easings</a>.</p>
3838
]]></desc>
3939
</category>
4040
<category name="All" slug="all"/>

entries/accordion.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@
3232
<ul>
3333
<li>CTRL+UP: Move focus to associated header.</li>
3434
</ul>
35+
36+
<h3>Dependencies</h3>
37+
<ul>
38+
<li><a href="/category/ui-core/">UI Core</a></li>
39+
<li><a href="/jQuery.widget/">Widget Factory</a></li>
40+
<li><a href="/category/effects-core/">Effects Core</a> (optional; for use with the <a href="#option-animate"><code>animate</code></a> option)</li>
41+
</ul>
3542
</longdesc>
3643
<note id="functional-css"/>
3744
<added>1.0</added>

entries/autocomplete.xml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<p>This can be used to choose previously selected values, such as entering tags for articles or entering email addresses from an address book. Autocomplete can also be used to populate associated information, such as entering a city name and getting the zip code.</p>
99

10-
<p>You can pull data in from a local or remote source: Local is good for small data sets, e.g., an address book with 50 entries; remote is necessary for big data sets, such as a database with hundreds or millions of entries to select from. To find out more about customizing the data soure, see the documentation for the <a href="#option-source"><code>source</code></a> option.</p>
10+
<p>You can pull data in from a local or remote source: Local is good for small data sets, e.g., an address book with 50 entries; remote is necessary for big data sets, such as a database with hundreds or millions of entries to select from. To find out more about customizing the data source, see the documentation for the <a href="#option-source"><code>source</code></a> option.</p>
1111

1212
<h3>Keyboard interaction</h3>
1313

@@ -25,12 +25,21 @@
2525
<ul>
2626
<li>UP/DOWN - Open the menu, if the <a href="#option-minLength"><code>minLength</code></a> has been met.</li>
2727
</ul>
28+
29+
<h3>Dependencies</h3>
30+
<ul>
31+
<li><a href="/category/ui-core/">UI Core</a></li>
32+
<li><a href="/jQuery.widget/">Widget Factory</a></li>
33+
<li><a href="/position/">Position</a></li>
34+
<li><a href="/menu/">Menu</a></li>
35+
</ul>
2836
</longdesc>
2937
<note id="functional-css"/>
38+
<note id="native-change-warning"/>
3039
<added>1.8</added>
3140
<options>
32-
<option name="appendTo" type="Selector" default='"body"' example-value='"#someElem"'>
33-
<desc>Which element the menu should be appended to. Override this when the autocomplete is inside a <code>position: fixed</code> element. Otherwise the popup menu would still scroll with the page.</desc>
41+
<option name="appendTo" type="Selector" default="null" example-value='"#someElem"'>
42+
<desc>Which element the menu should be appended to. When the value is <code>null</code>, the parents of the input field will be checked for a class of <code>ui-front</code>. If an element with the <code>ui-front</code> class is found, the menu will be appended to that element. Regardless of the value, if no element is found, the menu will be appended to the body.</desc>
3443
</option>
3544
<option name="autoFocus" type="Boolean" default="false" example-value="true">
3645
<desc>If set to <code>true</code> the first item will automatically be focused when the menu is shown.</desc>
@@ -153,7 +162,7 @@
153162
<desc></desc>
154163
</argument>
155164
</method>
156-
<method name="widget">
165+
<method name="widget" return="jQuery">
157166
<desc>Returns a <code>jQuery</code> object containing the menu element. Although the menu items are constantly created and destroyed, the menu element itself is created during initialization and is constantly reused.</desc>
158167
</method>
159168
</methods>

entries/button.xml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
11
<?xml version="1.0"?>
22
<entry name="button" type="widget" widget-element="element visually representing the button">
33
<title>Button Widget</title>
4-
<desc>Themable buttons and button sets.</desc>
4+
<desc>Themeable buttons and button sets.</desc>
55
<longdesc>
6-
<p>Button enhances standard form elements like buttons, inputs and anchors to themable buttons with appropiate hover and active styles.</p>
6+
<p>Button enhances standard form elements like buttons, inputs and anchors to themeable buttons with appropriate hover and active styles.</p>
77

8-
<p>In addition to basic push buttons, radio buttons and checkboxes (inputs of type radio and checkbox) can be converted to buttons. Their associated label is styled to appear as the button, while the underlying input is updated on click. For the association to work properly, give the input an <code>id</code> attribute, and refer to that in the label's <code>for</code> attribute. Don't nest the input inside the label, as that <a href="http://www.paciellogroup.com/blog/2011/07/html5-accessibility-chops-form-control-labeling/">causes accessbility problems</a>.</p>
8+
<p>In addition to basic push buttons, radio buttons and checkboxes (inputs of type radio and checkbox) can be converted to buttons. Their associated label is styled to appear as the button, while the underlying input is updated on click. For the association to work properly, give the input an <code>id</code> attribute, and refer to that in the label's <code>for</code> attribute. Don't nest the input inside the label, as that <a href="http://www.paciellogroup.com/blog/2011/07/html5-accessibility-chops-form-control-labeling/">causes accessibility problems</a>.</p>
99

1010
<p>In order to group radio buttons, Button also provides an additional widget, called Buttonset. Buttonset is used by selecting a container element (which contains the radio buttons) and calling <code>.buttonset()</code>. Buttonset will also provide visual grouping, and therefore should be used whenever you have a group of buttons. It works by selecting all descendants and applying <code>.button()</code> to them. You can enable and disable a button set, which will enable and disable all contained buttons. Destroying a button set also calls each button's <code>destroy</code> method.</p>
1111

1212
<p>When using an input of type button, submit or reset, support is limited to plain text labels with no icons.</p>
13+
14+
<h3>Dependencies</h3>
15+
<ul>
16+
<li><a href="/category/ui-core/">UI Core</a></li>
17+
<li><a href="/jQuery.widget/">Widget Factory</a></li>
18+
</ul>
1319
</longdesc>
1420
<note id="functional-css"/>
1521
<added>1.8</added>

0 commit comments

Comments
 (0)