Skip to content

Commit

Permalink
whitespace and comment merge conflict resolved
Browse files Browse the repository at this point in the history
  • Loading branch information
@johnbender
johnbender committed Aug 17, 2011
2 parents 81737db + 3d14498 commit b7d5df7
Show file tree
Hide file tree
Showing 33 changed files with 1,706 additions and 905 deletions.
5 changes: 3 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ JSFILES = js/jquery.ui.widget.js \
js/jquery.mobile.forms.button.js \
js/jquery.mobile.forms.slider.js \
js/jquery.mobile.forms.textinput.js \
js/jquery.mobile.forms.select.custom.js \
js/jquery.mobile.forms.select.js \
js/jquery.mobile.buttonMarkup.js \
js/jquery.mobile.controlGroup.js \
Expand Down Expand Up @@ -127,7 +128,7 @@ notify:
@@echo "The files have been built and are in " $$(pwd)/${OUTPUT}

# Pull the latest commits. This is used for the nightly build but can be used to save some keystrokes
pull:
pull:
@@git pull --quiet

# Zip the 4 files and the theme images into one convenient package
Expand Down Expand Up @@ -162,7 +163,7 @@ nightly: pull zip
# Change the empty paths to the location of this nightly file
@@find ${VER} -type f -name '*.html' -exec sed -i 's|href="themes/default/"|href="${NIGHTLY_WEBPATH}/${DIR}.min.css"|g' {} \;
@@find ${VER} -type f -name '*.html' -exec sed -i 's|src="js/jquery.js"|src="http://code.jquery.com/jquery-${JQUERY}.min.js"|' {} \;
@@find ${VER} -type f -name '*.html' -exec sed -i 's|src="js/"|src="${NIGHTLY_WEBPATH}/${DIR}.min.js"|g' {} \;
@@find ${VER} -type f -name '*.html' -exec sed -i 's|src="js/"|src="${NIGHTLY_WEBPATH}/${DIR}.min.js"|g' {} \;

# Move the demos into the output folder
@@mv ${VER} ${OUTPUT}/demos
Expand Down
3 changes: 2 additions & 1 deletion build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
js/jquery.mobile.navigation.js,
js/jquery.mobile.navigation.pushstate.js,
js/jquery.mobile.transition.js,
js/jquery.mobile.degradeInputs.js,
js/jquery.mobile.degradeInputs.js,
js/jquery.mobile.dialog.js,
js/jquery.mobile.page.sections.js,
js/jquery.mobile.collapsible.js,
Expand All @@ -45,6 +45,7 @@
js/jquery.mobile.forms.button.js,
js/jquery.mobile.forms.slider.js,
js/jquery.mobile.forms.textinput.js,
js/jquery.mobile.forms.select.custom.js,
js/jquery.mobile.forms.select.js,
js/jquery.mobile.buttonMarkup.js,
js/jquery.mobile.controlGroup.js,
Expand Down
102 changes: 102 additions & 0 deletions docs/forms/sliders/events.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>jQuery Mobile Docs - Slider events</title>
<link rel="stylesheet" href="../../../themes/default/" />
<link rel="stylesheet" href="../../_assets/css/jqm-docs.css"/>
<script src="../../../js/jquery.js"></script>
<script src="../../../experiments/themeswitcher/jquery.mobile.themeswitcher.js"></script>
<script src="../../_assets/js/jqm-docs.js"></script>
<script src="../../../js/"></script>
</head>
<body>

<div data-role="page" class="type-interior">

<div data-role="header" data-theme="f">
<h1>Sliders</h1>
<a href="../../../" data-icon="home" data-iconpos="notext" data-direction="reverse" class="ui-btn-right jqm-home">Home</a>
</div><!-- /header -->

<div data-role="content">
<div class="content-primary">

<form action="#" method="get">

<h2>Sliders</h2>

<ul data-role="controlgroup" data-type="horizontal" class="localnav">
<li><a href="index.html" data-role="button" data-transition="fade">Basics</a></li>
<li><a href="options.html" data-role="button" data-transition="fade">Options</a></li>
<li><a href="methods.html" data-role="button" data-transition="fade">Methods</a></li>
<li><a href="events.html" data-role="button" data-transition="fade" class="ui-btn-active">Events</a></li>
</ul>

<p>Since the input field is changed by slider, you can watch for events on the input field instead of needing to go through the slider plugin. Bind to the change event.</p>
<pre><code>
$( ".selector" ).bind( "change", function(event, ui) {
...
});
</code></pre>

<p>The slider plugin has the following custom event:</p>

<dl>

<dt><code>create</code> triggered when a slider is created</dt>
<dd>
<p>This event is used to find out when a custom slider was created. It is not used to create a custom slider. The slider create event can be used like this: </p>

<pre><code>
$( ".selector" ).slider({
create: function(event, ui) { ... }
});
</code></pre>
</dd>


</dl>

</form>
</div><!--/content-primary -->

<div class="content-secondary">

<div data-role="collapsible" data-collapsed="true" data-theme="b">

<h3>More in this section</h3>

<ul data-role="listview" data-theme="c" data-dividertheme="d">

<li data-role="list-divider">Form elements</li>
<li><a href="../docs-forms.html">Form basics</a></li>
<li><a href="../forms-all.html">Form element gallery</a></li>
<li><a href="../texts/index.html">Text inputs</a></li>
<li><a href="../forms-search.html">Search inputs</a></li>
<li data-theme="a"><a href="index.html">Slider</a></li>
<li><a href="../forms-switch.html">Flip toggle switch</a></li>
<li><a href="../radiobuttons/index.html">Radio buttons</a></li>
<li><a href="../checkboxes/index.html">Checkboxes</a></li>
<li><a href="../selects/index.html">Select menus</a></li>
<li><a href="../forms-themes.html">Theming forms</a></li>
<li><a href="../forms-all-native.html">Native form elements</a></li>
<li><a href="../forms-sample.html">Submitting forms</a></li>
<li><a href="../plugin-eventsmethods.html">Plugin methods</a></li>

</ul>
</div>
</div>

</div><!-- /content -->

<div data-role="footer" class="footer-docs" data-theme="c">
<p>&copy; 2011 The jQuery Project</p>
</div>

</div><!-- /page -->

</body>
</html>

112 changes: 112 additions & 0 deletions docs/forms/sliders/index.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>jQuery Mobile Docs - Sliders</title>
<link rel="stylesheet" href="../../../themes/default/" />
<link rel="stylesheet" href="../../_assets/css/jqm-docs.css"/>
<script src="../../../js/jquery.js"></script>
<script src="../../../experiments/themeswitcher/jquery.mobile.themeswitcher.js"></script>
<script src="../../_assets/js/jqm-docs.js"></script>
<script src="../../../js/"></script>
</head>
<body>

<div data-role="page" class="type-interior">

<div data-role="header" data-theme="f">
<h1>Sliders</h1>
<a href="../../../" data-icon="home" data-iconpos="notext" data-direction="reverse" class="ui-btn-right jqm-home">Home</a>
</div><!-- /header -->

<div data-role="content">
<div class="content-primary">

<form action="#" method="get">
<h2>Sliders</h2>

<ul data-role="controlgroup" data-type="horizontal" class="localnav">
<li><a href="index.html" data-role="button" data-transition="fade" class="ui-btn-active">Basics</a></li>
<li><a href="options.html" data-role="button" data-transition="fade">Options</a></li>
<li><a href="methods.html" data-role="button" data-transition="fade">Methods</a></li>
<li><a href="events.html" data-role="button" data-transition="fade">Events</a></li>
</ul>

<p>To add a slider widget to your page, start with an <code>input</code> with a new HTML5 <code>type="range"</code> attribute. Specify the <code>value</code> (current value), <code>min</code> and <code>max</code> attribute values to configure the slider. The framework will parse these attributes to configure the slider. </p>
<p>As you drag the slider, the input will update and vice-versa so they are always in sync so you can submit the slider value with form in a simple way. Set the <code>for</code> attribute of the <code>label</code> to match the ID of the <code>input</code> so they are semantically associated and wrap them in a <code>div</code> with the <code> data-role="fieldcontain"</code> attribute to group them.</p>

<pre><code>
&lt;div data-role=&quot;fieldcontain&quot;&gt;
&lt;label for=&quot;slider&quot;&gt;Input slider:&lt;/label&gt;
&lt;input type=&quot;range&quot; name=&quot;slider&quot; id=&quot;slider&quot; value=&quot;0&quot; min=&quot;0&quot; max=&quot;100&quot; /&gt;
&lt;/div&gt;
</code></pre>

<p>An example of a slider and input is displayed like this:</p>
<div data-role="fieldcontain">
<label for="slider-1">Input slider:</label>
<input type="range" name="slider-1" id="slider-1" value="0" min="0" max="100" data-theme="b" data-track-theme="a" />
</div>

<p>By setting the <code>min</code> and <code>max</code>attributes you can configure the allowable number range of the slider track. The <code>value</code> of the input is used to configure the starting position of the handle and the value populated in the text input.</p>

<p>The slider with a min of 500, max of 5,000 and initial value of 2,500</p>
<div data-role="fieldcontain">
<label for="slider-2">Input slider:</label>
<input type="range" name="slider-2" id="slider-2" value="2500" min="500" max="5000" />
</div>

<p>Sliders also respond to the keyboards shortcuts. To increase the current value the Right Arrow, Up Arrow, and Page Up keys can be used. To decrease the current value the Left Arrow, Down Arrow, and Page Down keys can be used. To move the slider to its minimum or maximum value use the Home and End keys respectively.</p>


<h2>Refreshing a slider</h2>

<p>If you manipulate a slider via JavaScript, you must call the refresh method on it to update the visual styling. Here is an example:</p>

<code>
$("input[type=range]").val(60).slider("refresh");
</code>


</form>
</div><!--/content-primary -->

<div class="content-secondary">

<div data-role="collapsible" data-collapsed="true" data-theme="b">

<h3>More in this section</h3>

<ul data-role="listview" data-theme="c" data-dividertheme="d">

<li data-role="list-divider">Form elements</li>
<li><a href="../docs-forms.html">Form basics</a></li>
<li><a href="../forms-all.html">Form element gallery</a></li>
<li><a href="../texts/index.html">Text inputs</a></li>
<li><a href="../forms-search.html">Search inputs</a></li>
<li data-theme="a"><a href="index.html">Slider</a></li>
<li><a href="../forms-switch.html">Flip toggle switch</a></li>
<li><a href="../radiobuttons/index.html">Radio buttons</a></li>
<li><a href="../checkboxes/index.html">Checkboxes</a></li>
<li><a href="../selects/index.html">Select menus</a></li>
<li><a href="../forms-themes.html">Theming forms</a></li>
<li><a href="../forms-all-native.html">Native form elements</a></li>
<li><a href="../forms-sample.html">Submitting forms</a></li>
<li><a href="../plugin-eventsmethods.html">Plugin methods</a></li>

</ul>
</div>
</div>

</div><!-- /content -->

<div data-role="footer" class="footer-docs" data-theme="c">
<p>&copy; 2011 The jQuery Project</p>
</div>

</div><!-- /page -->

</body>
</html>

108 changes: 108 additions & 0 deletions docs/forms/sliders/methods.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>jQuery Mobile Docs - Slider methods</title>
<link rel="stylesheet" href="../../../themes/default/" />
<link rel="stylesheet" href="../../_assets/css/jqm-docs.css"/>
<script src="../../../js/jquery.js"></script>
<script src="../../../experiments/themeswitcher/jquery.mobile.themeswitcher.js"></script>
<script src="../../_assets/js/jqm-docs.js"></script>
<script src="../../../js/"></script>
</head>
<body>

<div data-role="page" class="type-interior">

<div data-role="header" data-theme="f">
<h2>Sliders</h2>
<a href="../../../" data-icon="home" data-iconpos="notext" data-direction="reverse" class="ui-btn-right jqm-home">Home</a>
</div><!-- /header -->

<div data-role="content">
<div class="content-primary">

<form action="#" method="get">

<h2>Sliders</h2>

<ul data-role="controlgroup" data-type="horizontal" class="localnav">
<li><a href="index.html" data-role="button" data-transition="fade">Basics</a></li>
<li><a href="options.html" data-role="button" data-transition="fade">Options</a></li>
<li><a href="methods.html" data-role="button" data-transition="fade" class="ui-btn-active">Methods</a></li>
<li><a href="events.html" data-role="button" data-transition="fade">Events</a></li>
</ul>

<p>The slider plugin has the following methods:</p>

<dl>
<dt><code>enable</code> enable a disabled select</dt>
<dd>
<pre><code>
$('select').slider('enable');
</code></pre>
</dd>

<dt><code>disable</code> disable a select.</dt>
<dd>
<pre><code>
$('select').slider('disable');
</code></pre>
</dd>

<dt><code>refresh</code> update the slider</dt>
<dd>
This is used to update the slider to reflect the native input element's value. Also, if you pass a true argument you can force the rebuild to happen.
<pre><code>
//refresh value
$('select').slider('refresh');

//refresh and force rebuild
$('select').slider('refresh', true);
</code></pre>
</dd>

</dl>

</form>
</div><!--/content-primary -->

<div class="content-secondary">

<div data-role="collapsible" data-collapsed="true" data-theme="b">

<h3>More in this section</h3>

<ul data-role="listview" data-theme="c" data-dividertheme="d">

<li data-role="list-divider">Form elements</li>
<li><a href="../docs-forms.html">Form basics</a></li>
<li><a href="../forms-all.html">Form element gallery</a></li>
<li><a href="../texts/index.html">Text inputs</a></li>
<li><a href="../forms-search.html">Search inputs</a></li>
<li data-theme="a"><a href="index.html">Slider</a></li>
<li><a href="../forms-switch.html">Flip toggle switch</a></li>
<li><a href="../radiobuttons/index.html">Radio buttons</a></li>
<li><a href="../checkboxes/index.html">Checkboxes</a></li>
<li><a href="../selects/index.html">Select menus</a></li>
<li><a href="../forms-themes.html">Theming forms</a></li>
<li><a href="../forms-all-native.html">Native form elements</a></li>
<li><a href="../forms-sample.html">Submitting forms</a></li>
<li><a href="../plugin-eventsmethods.html">Plugin methods</a></li>

</ul>
</div>
</div>

</div><!-- /content -->

<div data-role="footer" class="footer-docs" data-theme="c">
<p>&copy; 2011 The jQuery Project</p>
</div>

</div><!-- /page -->

</body>
</html>

Loading

0 comments on commit b7d5df7

Please sign in to comment.