diff options
| author | Felix Nagel <info@felixnagel.com> | 2012-12-20 00:32:28 +0100 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2012-12-20 00:32:28 +0100 |
| commit | dab7bf89933c15132b81eaee46a0220357fb27cd (patch) | |
| tree | 2c3dfbdedfdcc01a86f5a04380cee320f3cd2a41 /ui | |
| parent | 50d7a969a52d4aa1a6c8ae8a3013374fc24aabe1 (diff) | |
| parent | 209443d716587d896ffcdf26c0fd8c8a23437b3c (diff) | |
| download | jquery-ui-dab7bf89933c15132b81eaee46a0220357fb27cd.tar.gz jquery-ui-dab7bf89933c15132b81eaee46a0220357fb27cd.zip | |
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/i18n/jquery.ui.datepicker-fr-CA.js | 23 | ||||
| -rw-r--r-- | ui/jquery.ui.slider.js | 5 | ||||
| -rw-r--r-- | ui/jquery.ui.tooltip.js | 5 |
3 files changed, 30 insertions, 3 deletions
diff --git a/ui/i18n/jquery.ui.datepicker-fr-CA.js b/ui/i18n/jquery.ui.datepicker-fr-CA.js new file mode 100644 index 000000000..184b88fd3 --- /dev/null +++ b/ui/i18n/jquery.ui.datepicker-fr-CA.js @@ -0,0 +1,23 @@ +/* Canadian-French initialisation for the jQuery UI date picker plugin. */
+jQuery(function ($) {
+ $.datepicker.regional['fr-CA'] = {
+ closeText: 'Fermer',
+ prevText: 'Précédent',
+ nextText: 'Suivant',
+ currentText: 'Aujourd\'hui',
+ monthNames: ['janvier', 'février', 'mars', 'avril', 'mai', 'juin',
+ 'juillet', 'août', 'septembre', 'octobre', 'novembre', 'décembre'],
+ monthNamesShort: ['janv.', 'févr.', 'mars', 'avril', 'mai', 'juin',
+ 'juil.', 'août', 'sept.', 'oct.', 'nov.', 'déc.'],
+ dayNames: ['dimanche', 'lundi', 'mardi', 'mercredi', 'jeudi', 'vendredi', 'samedi'],
+ dayNamesShort: ['dim.', 'lun.', 'mar.', 'mer.', 'jeu.', 'ven.', 'sam.'],
+ dayNamesMin: ['D', 'L', 'M', 'M', 'J', 'V', 'S'],
+ weekHeader: 'Sem.',
+ dateFormat: 'yy-mm-dd',
+ firstDay: 0,
+ isRTL: false,
+ showMonthAfterYear: false,
+ yearSuffix: ''
+ };
+ $.datepicker.setDefaults($.datepicker.regional['fr-CA']);
+});
diff --git a/ui/jquery.ui.slider.js b/ui/jquery.ui.slider.js index 4054f1848..712c6853d 100644 --- a/ui/jquery.ui.slider.js +++ b/ui/jquery.ui.slider.js @@ -62,9 +62,10 @@ $.widget( "ui.slider", $.ui.mouse, { if ( o.range === true ) { if ( !o.values ) { o.values = [ this._valueMin(), this._valueMin() ]; - } - if ( o.values.length && o.values.length !== 2 ) { + } else if ( o.values.length && o.values.length !== 2 ) { o.values = [ o.values[0], o.values[0] ]; + } else if ( $.isArray( o.values ) ) { + o.values = o.values.slice(0); } } diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js index 3984826ce..d44ff8d06 100644 --- a/ui/jquery.ui.tooltip.js +++ b/ui/jquery.ui.tooltip.js @@ -270,7 +270,7 @@ $.widget( "ui.tooltip", { // as the tooltip is visible, position the tooltip using the most recent // event. if ( this.options.show && this.options.show.delay ) { - delayedShow = setInterval(function() { + delayedShow = this.delayedShow = setInterval(function() { if ( tooltip.is( ":visible" ) ) { position( positionOption.of ); clearInterval( delayedShow ); @@ -312,6 +312,9 @@ $.widget( "ui.tooltip", { return; } + // Clear the interval for delayed tracking tooltips + clearInterval( this.delayedShow ); + // only set title if we had one before (see comment in _open()) if ( target.data( "ui-tooltip-title" ) ) { target.attr( "title", target.data( "ui-tooltip-title" ) ); |