Skip to content

Commit dab7bf8

Browse files
fnagelfnagel
committed
Merge branch 'master' into selectmenu
2 parents 50d7a96 + 209443d commit dab7bf8

File tree

5 files changed

+60
-6
lines changed

5 files changed

+60
-6
lines changed

‎demos/datepicker/localization.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<script src="../../ui/i18n/jquery.ui.datepicker-fi.js"></script>
3333
<script src="../../ui/i18n/jquery.ui.datepicker-fo.js"></script>
3434
<script src="../../ui/i18n/jquery.ui.datepicker-fr.js"></script>
35+
<script src="../../ui/i18n/jquery.ui.datepicker-fr-CA.js"></script>
3536
<script src="../../ui/i18n/jquery.ui.datepicker-fr-CH.js"></script>
3637
<script src="../../ui/i18n/jquery.ui.datepicker-gl.js"></script>
3738
<script src="../../ui/i18n/jquery.ui.datepicker-he.js"></script>
@@ -106,6 +107,7 @@
106107
<option value="be">Belarusian</option>
107108
<option value="bs">Bosnian (Bosanski)</option>
108109
<option value="bg">Bulgarian (&#1073;&#1098;&#1083;&#1075;&#1072;&#1088;&#1089;&#1082;&#1080; &#1077;&#1079;&#1080;&#1082;)</option>
110+
<option value="fr-CA">Canadian French</option>
109111
<option value="ca">Catalan (Catal&agrave;)</option>
110112
<option value="zh-HK">Chinese Hong Kong (&#32321;&#39636;&#20013;&#25991;)</option>
111113
<option value="zh-CN">Chinese Simplified (&#31616;&#20307;&#20013;&#25991;)</option>

‎tests/unit/slider/slider_options.js

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,33 @@ test("step", function() {
143143
// ok(false, "missing test - untested code is broken code.");
144144
//});
145145

146-
//test("values", function() {
147-
// ok(false, "missing test - untested code is broken code.");
148-
//});
146+
test("values", function() {
147+
expect( 2 );
148+
149+
// testing multiple ranges on the same page, the object reference to the values
150+
// property is preserved via multiple range elements, so updating options.values
151+
// of 1 slider updates options.values of all the others
152+
var ranges = $([
153+
document.createElement("div"),
154+
document.createElement("div")
155+
]).slider({
156+
range: true,
157+
values: [ 25, 75 ]
158+
});
159+
160+
notStrictEqual(
161+
ranges.eq(0).data("uiSlider").options.values,
162+
ranges.eq(1).data("uiSlider").options.values,
163+
"multiple range sliders should not have a reference to the same options.values array"
164+
);
165+
166+
ranges.eq(0).slider("values", 0, 10);
167+
168+
notEqual(
169+
ranges.eq(0).slider("values", 0),
170+
ranges.eq(1).slider("values", 0),
171+
"the values for multiple sliders should be different"
172+
);
173+
});
149174

150175
})(jQuery);

‎ui/i18n/jquery.ui.datepicker-fr-CA.js

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/* Canadian-French initialisation for the jQuery UI date picker plugin. */
2+
jQuery(function ($) {
3+
$.datepicker.regional['fr-CA'] = {
4+
closeText: 'Fermer',
5+
prevText: 'Précédent',
6+
nextText: 'Suivant',
7+
currentText: 'Aujourd\'hui',
8+
monthNames: ['janvier', 'février', 'mars', 'avril', 'mai', 'juin',
9+
'juillet', 'août', 'septembre', 'octobre', 'novembre', 'décembre'],
10+
monthNamesShort: ['janv.', 'févr.', 'mars', 'avril', 'mai', 'juin',
11+
'juil.', 'août', 'sept.', 'oct.', 'nov.', 'déc.'],
12+
dayNames: ['dimanche', 'lundi', 'mardi', 'mercredi', 'jeudi', 'vendredi', 'samedi'],
13+
dayNamesShort: ['dim.', 'lun.', 'mar.', 'mer.', 'jeu.', 'ven.', 'sam.'],
14+
dayNamesMin: ['D', 'L', 'M', 'M', 'J', 'V', 'S'],
15+
weekHeader: 'Sem.',
16+
dateFormat: 'yy-mm-dd',
17+
firstDay: 0,
18+
isRTL: false,
19+
showMonthAfterYear: false,
20+
yearSuffix: ''
21+
};
22+
$.datepicker.setDefaults($.datepicker.regional['fr-CA']);
23+
});

‎ui/jquery.ui.slider.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,10 @@ $.widget( "ui.slider", $.ui.mouse, {
6262
if ( o.range === true ) {
6363
if ( !o.values ) {
6464
o.values = [ this._valueMin(), this._valueMin() ];
65-
}
66-
if ( o.values.length && o.values.length !== 2 ) {
65+
} else if ( o.values.length && o.values.length !== 2 ) {
6766
o.values = [ o.values[0], o.values[0] ];
67+
} else if ( $.isArray( o.values ) ) {
68+
o.values = o.values.slice(0);
6869
}
6970
}
7071

‎ui/jquery.ui.tooltip.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ $.widget( "ui.tooltip", {
270270
// as the tooltip is visible, position the tooltip using the most recent
271271
// event.
272272
if ( this.options.show && this.options.show.delay ) {
273-
delayedShow = setInterval(function() {
273+
delayedShow = this.delayedShow = setInterval(function() {
274274
if ( tooltip.is( ":visible" ) ) {
275275
position( positionOption.of );
276276
clearInterval( delayedShow );
@@ -312,6 +312,9 @@ $.widget( "ui.tooltip", {
312312
return;
313313
}
314314

315+
// Clear the interval for delayed tracking tooltips
316+
clearInterval( this.delayedShow );
317+
315318
// only set title if we had one before (see comment in _open())
316319
if ( target.data( "ui-tooltip-title" ) ) {
317320
target.attr( "title", target.data( "ui-tooltip-title" ) );

0 commit comments

Comments
 (0)