Skip to content

Commit 0369086

Browse files
committed
Entries: Use "properties" when referring to individual options
Removes some ambiguity since we also "setting" as a verb. Fixes #247
1 parent 867eb09 commit 0369086

File tree

8 files changed

+19
-19
lines changed

8 files changed

+19
-19
lines changed

entries/accordion.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
<desc>Name of <a href="/easings/">easing</a> to use with default duration.</desc>
7979
</type>
8080
<type name="Object">
81-
<desc>Animation settings with <code>easing</code> and <code>duration</code> properties.
81+
<desc><code>easing</code> and <code>duration</code> properties to configure animations.
8282
<ul>
8383
<li>Can also contain a <code>down</code> property with any of the above options.</li>
8484
<li>"Down" animations occur when the panel being activated has a lower index than the currently active panel.</li>

entries/datepicker.xml

+9-9
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727

2828
<h3 id="utility-functions">Utility functions</h3>
2929

30-
<h4 id="utility-setDefaults">$.datepicker.setDefaults( settings )</h4>
31-
<p>Change the default settings for all date pickers.</p>
32-
<p>Use the <a href="#method-option"><code>option()</code></a> method to change settings for individual instances.</p>
30+
<h4 id="utility-setDefaults">$.datepicker.setDefaults( options )</h4>
31+
<p>Change the default options for all date pickers.</p>
32+
<p>Use the <a href="#method-option"><code>option()</code></a> method to change options for individual instances.</p>
3333
<div>
3434
<strong>Code examples:</strong>
3535
<p>Set all date pickers to open on focus or a click on an icon.</p>
@@ -47,7 +47,7 @@
4747
</code></pre>
4848
</div>
4949

50-
<h4 id="utility-formatDate">$.datepicker.formatDate( format, date, settings )</h4>
50+
<h4 id="utility-formatDate">$.datepicker.formatDate( format, date, options )</h4>
5151
<p>Format a date into a string value with a specified format.</p>
5252
<p>The format can be combinations of the following:</p>
5353
<ul>
@@ -101,7 +101,7 @@
101101
</code></pre>
102102
</div>
103103

104-
<h4 id="utility-parseDate">$.datepicker.parseDate( format, value, settings )</h4>
104+
<h4 id="utility-parseDate">$.datepicker.parseDate( format, value, options )</h4>
105105
<p>Extract a date from a string value with a specified format.</p>
106106
<p>The format can be combinations of the following:</p>
107107
<ul>
@@ -175,7 +175,7 @@
175175
</div>
176176

177177
<h3>Localization</h3>
178-
<p>Datepicker provides support for localizing its content to cater for different languages and date formats. Each localization is contained within its own file with the language code appended to the name, e.g., <code>jquery.ui.datepicker-fr.js</code> for French. The desired localization file should be included after the main datepicker code. Each localization file adds its settings to the set of available localizations and automatically applies them as defaults for all instances. Localization files can be found at <a href="https://github.com/jquery/jquery-ui/tree/master/ui/i18n">https://github.com/jquery/jquery-ui/tree/master/ui/i18n</a>.</p>
178+
<p>Datepicker provides support for localizing its content to cater for different languages and date formats. Each localization is contained within its own file with the language code appended to the name, e.g., <code>jquery.ui.datepicker-fr.js</code> for French. The desired localization file should be included after the main datepicker code. Each localization file adds its options to the set of available localizations and automatically applies them as defaults for all instances. Localization files can be found at <a href="https://github.com/jquery/jquery-ui/tree/master/ui/i18n">https://github.com/jquery/jquery-ui/tree/master/ui/i18n</a>.</p>
179179
<p>The <code>$.datepicker.regional</code> attribute holds an array of localizations, indexed by language code, with <code>""</code> referring to the default (English). Each entry is an object with the following attributes: <code>closeText</code>, <code>prevText</code>, <code>nextText</code>, <code>currentText</code>, <code>monthNames</code>, <code>monthNamesShort</code>, <code>dayNames</code>, <code>dayNamesShort</code>, <code>dayNamesMin</code>, <code>weekHeader</code>, <code>dateFormat</code>, <code>firstDay</code>, <code>isRTL</code>, <code>showMonthAfterYear</code>, and <code>yearSuffix</code>.</p>
180180
<p>You can restore the default localizations with:</p>
181181
<code>$.datepicker.setDefaults( $.datepicker.regional[ "" ] );</code>
@@ -405,7 +405,7 @@
405405
<desc>When the datepicker should appear. The datepicker can appear when the field receives focus (<code>"focus"</code>), when a button is clicked (<code>"button"</code>), or when either event occurs (<code>"both"</code>).</desc>
406406
</option>
407407
<option name="showOptions" type="Object" default="{}" example-value='{ direction: "up" }'>
408-
<desc>If using one of the jQuery UI effects for the <a href="#option-showAnim"><code>showAnim</code></a> option, you can provide additional settings for that animation via this option.</desc>
408+
<desc>If using one of the jQuery UI effects for the <a href="#option-showAnim"><code>showAnim</code></a> option, you can provide additional properties for that animation using this option.</desc>
409409
</option>
410410
<option name="showOtherMonths" type="Boolean" default="false" example-value="true">
411411
<desc>Whether to display dates in other months (non-selectable) at the start or end of the current month. To make these days selectable use the <a href="#option-selectOtherMonths"><code>selectOtherMonths</code></a> option.</desc>
@@ -471,8 +471,8 @@
471471
<argument name="onSelect" type="Function" optional="true">
472472
<desc>A callback function when a date is selected. The function receives the date text and date picker instance as parameters.</desc>
473473
</argument>
474-
<argument name="settings" type="Options" optional="true">
475-
<desc>The new settings for the date picker.</desc>
474+
<argument name="options" type="Options" optional="true">
475+
<desc>The new options for the date picker.</desc>
476476
</argument>
477477
<argument name="pos" type="Number[2] or MouseEvent" optional="true">
478478
<desc>The position of the top/left of the dialog as <code>[x, y]</code> or a <code>MouseEvent</code> that contains the coordinates. If not specified the dialog is centered on the screen.</desc>

entries/effect.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<desc>A string indicating which <a href="/category/effects/">effect</a> to use for the transition.</desc>
1111
</argument>
1212
<argument name="options" type="Object" optional="true">
13-
<desc>Effect-specific settings and <a href="/easings/">easing</a>.</desc>
13+
<desc>Effect-specific properties and <a href="/easings/">easing</a>.</desc>
1414
</argument>
1515
<xi:include href="../includes/animation-argument-duration.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
1616
<xi:include href="../includes/animation-argument-complete.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>

entries/hide.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<desc>A string indicating which <a href="/category/effects/">effect</a> to use for the transition.</desc>
1111
</argument>
1212
<argument name="options" type="Object" optional="true">
13-
<desc>Effect-specific settings and <a href="/easings/">easing</a>.</desc>
13+
<desc>Effect-specific properties and <a href="/easings/">easing</a>.</desc>
1414
</argument>
1515
<xi:include href="../includes/animation-argument-duration.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
1616
<xi:include href="../includes/animation-argument-complete.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>

entries/jQuery.widget.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
<p>We can pass as many or as few options as we want during initialization. Any options that we don't pass will just use their default values.</p>
4545

46-
<p>You can pass multiple options arguments. Those arguments will be merged into one object (similar to <a href="//api.jquery.com/jQuery.extend/"><code>$.extend( true, target, object1, objectN )</code></a>). This is useful for sharing options between instances, while overriding some settings for each one:</p>
46+
<p>You can pass multiple options arguments. Those arguments will be merged into one object (similar to <a href="//api.jquery.com/jQuery.extend/"><code>$.extend( true, target, object1, objectN )</code></a>). This is useful for sharing options between instances, while overriding some properties for each one:</p>
4747

4848
<pre><code>
4949
var options = { modal: true, show: "slow" };
@@ -508,7 +508,7 @@ this._on( this.element, {
508508
<desc>The element(s) to show.</desc>
509509
</argument>
510510
<argument name="option" type="Object">
511-
<desc>The settings defining how to show the element.</desc>
511+
<desc>The properties defining how to show the element.</desc>
512512
</argument>
513513
<argument name="callback" type="Function" optional="true">
514514
<desc>Callback to invoke after the element has been fully shown.</desc>
@@ -532,7 +532,7 @@ this._show( this.element, this.options.show, function() {
532532
<desc>The element(s) to hide.</desc>
533533
</argument>
534534
<argument name="option" type="Object">
535-
<desc>The settings defining how to hide the element.</desc>
535+
<desc>The properties defining how to hide the element.</desc>
536536
</argument>
537537
<argument name="callback" type="Function" optional="true">
538538
<desc>Callback to invoke after the element has been fully hidden.</desc>

entries/show.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<desc>A string indicating which <a href="/category/effects/">effect</a> to use for the transition.</desc>
1111
</argument>
1212
<argument name="options" type="Object" optional="true">
13-
<desc>Effect-specific settings and <a href="/easings/">easing</a>.</desc>
13+
<desc>Effect-specific properties and <a href="/easings/">easing</a>.</desc>
1414
</argument>
1515
<xi:include href="../includes/animation-argument-duration.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
1616
<xi:include href="../includes/animation-argument-complete.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>

entries/tabs.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
<event name="beforeLoad">
173173
<desc>
174174
<p>Triggered when a remote tab is about to be loaded, after the <a href="#event-beforeActivate"><code>beforeActivate</code></a> event. Can be canceled to prevent the tab panel from loading content; though the panel will still be activated. This event is triggered just before the Ajax request is made, so modifications can be made to <code>ui.jqXHR</code> and <code>ui.ajaxSettings</code>.</p>
175-
<p><em>Note: Although <code>ui.ajaxSettings</code> is provided and can be modified, some of these settings have already been processed by jQuery. For example, <a href="//api.jquery.com/jQuery.ajaxPrefilter/">prefilters</a> have been applied, <code>data</code> has been processed, and <code>type</code> has been determined. The <code>beforeLoad</code> event occurs at the same time, and therefore has the same restrictions, as the <code>beforeSend</code> callback from <a href="//api.jquery.com/jQuery.ajax/"><code>jQuery.ajax()</code></a>.</em></p>
175+
<p><em>Note: Although <code>ui.ajaxSettings</code> is provided and can be modified, some of these properties have already been processed by jQuery. For example, <a href="//api.jquery.com/jQuery.ajaxPrefilter/">prefilters</a> have been applied, <code>data</code> has been processed, and <code>type</code> has been determined. The <code>beforeLoad</code> event occurs at the same time, and therefore has the same restrictions, as the <code>beforeSend</code> callback from <a href="//api.jquery.com/jQuery.ajax/"><code>jQuery.ajax()</code></a>.</em></p>
176176
</desc>
177177
<argument name="event" type="Event"/>
178178
<argument name="ui" type="Object">
@@ -186,7 +186,7 @@
186186
<desc>The <code>jqXHR</code> object that is requesting the content.</desc>
187187
</property>
188188
<property name="ajaxSettings" type="Object">
189-
<desc>The settings that will be used by <a href="//api.jquery.com/jQuery.ajax/"><code>jQuery.ajax</code></a> to request the content.</desc>
189+
<desc>The properties that will be used by <a href="//api.jquery.com/jQuery.ajax/"><code>jQuery.ajax</code></a> to request the content.</desc>
190190
</property>
191191
</argument>
192192
</event>

entries/toggle.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<desc>A string indicating which <a href="/category/effects/">effect</a> to use for the transition.</desc>
1111
</argument>
1212
<argument name="options" type="Object" optional="true">
13-
<desc>Effect-specific settings and <a href="/easings/">easing</a>.</desc>
13+
<desc>Effect-specific properties and <a href="/easings/">easing</a>.</desc>
1414
</argument>
1515
<xi:include href="../includes/animation-argument-duration.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
1616
<xi:include href="../includes/animation-argument-complete.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>

0 commit comments

Comments
 (0)