diff options
| author | Trent Richardson <trentdrichardson@gmail.com> | 2015-03-15 21:11:43 -0400 |
|---|---|---|
| committer | Trent Richardson <trentdrichardson@gmail.com> | 2015-03-15 21:11:43 -0400 |
| commit | 8c597e858143d8de3c315d7273cb44b9b72c5c17 (patch) | |
| tree | 22f0f8f0bed0b159614cbb12280fdee995ef4fc0 /src/docs | |
| parent | 3c9065e400bbf6014fbdcc1b857cf502364e2938 (diff) | |
| parent | feafd1fbbc8c729a3bee47e43c82da111a9dfdff (diff) | |
| download | jQuery-Timepicker-Addon-8c597e858143d8de3c315d7273cb44b9b72c5c17.zip jQuery-Timepicker-Addon-8c597e858143d8de3c315d7273cb44b9b72c5c17.tar.gz jQuery-Timepicker-Addon-8c597e858143d8de3c315d7273cb44b9b72c5c17.tar.bz2 | |
Merge branch 'dev'
Diffstat (limited to 'src/docs')
| -rw-r--r-- | src/docs/examples.html | 14 | ||||
| -rw-r--r-- | src/docs/footer.html | 11 | ||||
| -rw-r--r-- | src/docs/options.html | 6 |
3 files changed, 26 insertions, 5 deletions
diff --git a/src/docs/examples.html b/src/docs/examples.html index 4765039..a04af2f 100644 --- a/src/docs/examples.html +++ b/src/docs/examples.html @@ -182,6 +182,20 @@ $('#slider_example_4').datetimepicker({ <!-- ============= example --> <div class="example-container"> + <p>Uses one line dropdowns instead of sliders.</p> + <div> + <input type="text" name="slider_example_4andHalf" id="slider_example_4andHalf" value="" /> + </div> +<pre> +$('#slider_example_4andHalf').datetimepicker({ + controlType: 'select', + oneLine: true, + timeFormat: 'hh:mm tt' +});</pre> + </div> + + <!-- ============= example --> + <div class="example-container"> <p>Create your own control by implementing the create, options, and value methods. If you want to use your new control for all instances use the $.timepicker.setDefaults({controlType:myControl}). Here we implement jQueryUI's spinner control (jQueryUI 1.9+).</p> <div> <input type="text" name="slider_example_5" id="slider_example_5" value="" /> diff --git a/src/docs/footer.html b/src/docs/footer.html index 5f1c5ad..919cf65 100644 --- a/src/docs/footer.html +++ b/src/docs/footer.html @@ -23,15 +23,16 @@ </script> <script type="text/javascript" src="https://sellfy.com/js/api_buttons.js"></script> - - <script type="text/javascript"> /* + <!-- + <script type="text/javascript"> var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); - */</script> - <script type="text/javascript"> /* + </script> + <script type="text/javascript"> try { var pageTracker = _gat._getTracker("UA-7602218-1"); pageTracker._trackPageview(); - } catch(err) {}*/</script> + } catch(err) {}</script> + --> </body> </html>
\ No newline at end of file diff --git a/src/docs/options.html b/src/docs/options.html index 22fc123..0754fb0 100644 --- a/src/docs/options.html +++ b/src/docs/options.html @@ -209,6 +209,9 @@ <dt>timeOnlyShowDate</dt> <dd><em>Default: false</em> - Show the date and time in the input, but only allow the timepicker.</dd> + <dt>afterInject</dt> + <dd><em>Default: null</em> - Function to be called when the timepicker or selection control is injected or re-rendered. Called in the context of the timepicker instance.</dd> + <dt>onSelect</dt> <dd><em>Default: null</em> - Function to be called when a date is chosen or time has changed (parameters: datetimeText, datepickerInstance).</dd> @@ -227,6 +230,9 @@ <dt>showTimepicker</dt> <dd><em>Default: true</em> - Whether to show the timepicker within the datepicker.</dd> + <dt>oneLine</dt> + <dd><em>Default: false</em> - Try to show the time dropdowns all on one line. This should be used with controlType 'select' and as few units as possible.</dd> + <dt>addSliderAccess</dt> <dd><em>Default: false</em> - Adds the <a href="http://trentrichardson.com/examples/jQuery-SliderAccess/" title="jQueryUI Slider Access Plugin">sliderAccess plugin</a> to sliders within timepicker</dd> |