From aaf75767fa98a6acdf00b1414bee622d3a3747cc Mon Sep 17 00:00:00 2001 From: Jörn Zaefferer Date: Fri, 31 May 2013 10:35:44 +0200 Subject: Datepicker: Replicate fr-locale changes to the demo copy. Adjust unit tests to match the new lowercase names. Fixes #9289 - Datepicker: Incorrect capitalisation for French and Spanish --- tests/unit/datepicker/datepicker_options.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/unit/datepicker/datepicker_options.js b/tests/unit/datepicker/datepicker_options.js index a775a5302..25257e99f 100644 --- a/tests/unit/datepicker/datepicker_options.js +++ b/tests/unit/datepicker/datepicker_options.js @@ -1057,13 +1057,13 @@ test("formatDate", function() { settings = {dayNamesShort: fr.dayNamesShort, dayNames: fr.dayNames, monthNamesShort: fr.monthNamesShort, monthNames: fr.monthNames}; equal($.datepicker.formatDate("D M y", new Date(2001, 4 - 1, 9), settings), - "Lun. Avril 01", "Format date D M y with settings"); + "lun. avril 01", "Format date D M y with settings"); equal($.datepicker.formatDate("DD MM yy", new Date(2001, 4 - 1, 9), settings), - "Lundi Avril 2001", "Format date DD MM yy with settings"); + "lundi avril 2001", "Format date DD MM yy with settings"); equal($.datepicker.formatDate("DD, MM d, yy", new Date(2001, 4 - 1, 9), settings), - "Lundi, Avril 9, 2001", "Format date DD, MM d, yy with settings"); + "lundi, avril 9, 2001", "Format date DD, MM d, yy with settings"); equal($.datepicker.formatDate("'jour' d 'de' MM (''DD''), yy", - new Date(2001, 4 - 1, 9), settings), "jour 9 de Avril ('Lundi'), 2001", + new Date(2001, 4 - 1, 9), settings), "jour 9 de avril ('lundi'), 2001", "Format date 'jour' d 'de' MM (''DD''), yy with settings"); }); -- cgit v1.2.3 From 2ba75e2c93638d89e89de52347da0013a7a841b8 Mon Sep 17 00:00:00 2001 From: Scott González Date: Mon, 3 Jun 2013 15:14:08 -0400 Subject: Slider: Remove range div when changing range option to false. Fixes #9355 - Slider: Changing range option to false does not remove range div. --- tests/unit/slider/slider_options.js | 17 ++++++++++++++++- ui/jquery.ui.slider.js | 9 +++++++-- 2 files changed, 23 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/unit/slider/slider_options.js b/tests/unit/slider/slider_options.js index 3a6f55390..b89981115 100644 --- a/tests/unit/slider/slider_options.js +++ b/tests/unit/slider/slider_options.js @@ -200,7 +200,7 @@ test( "values", function() { }); test( "range", function() { - expect( 27 ); + expect( 33 ); var range; // min @@ -300,6 +300,21 @@ test( "range", function() { equal( element.slider( "option", "values" ), null, "values" ); deepEqual( element.slider( "values" ), [] , "values" ); element.slider( "destroy" ); + + // Change range from true to false + element = $( "
" ).slider({ + range: true, + min: 1, + max: 10, + step: 1 + }).slider( "option", "range", false ); + equal( element.find( ".ui-slider-handle" ).length, 2, "range switch from true to false, both handles remain" ); + equal( element.find( ".ui-slider-range" ).length, 0, "range switch from true to false" ); + equal( element.slider( "option", "value" ), 0 , "option value" ); + equal( element.slider( "value" ), 1 , "value" ); + deepEqual( element.slider( "option", "values" ), [1, 1], "option values" ); + deepEqual( element.slider( "values" ), [1, 1], "values" ); + element.slider( "destroy" ); }); })( jQuery ); diff --git a/ui/jquery.ui.slider.js b/ui/jquery.ui.slider.js index ee7b3538f..e4f1cf7c9 100644 --- a/ui/jquery.ui.slider.js +++ b/ui/jquery.ui.slider.js @@ -131,7 +131,10 @@ $.widget( "ui.slider", $.ui.mouse, { this.range.addClass( classes + ( ( options.range === "min" || options.range === "max" ) ? " ui-slider-range-" + options.range : "" ) ); } else { - this.range = $([]); + if ( this.range ) { + this.range.remove(); + } + this.range = null; } }, @@ -145,7 +148,9 @@ $.widget( "ui.slider", $.ui.mouse, { _destroy: function() { this.handles.remove(); - this.range.remove(); + if ( this.range ) { + this.range.remove(); + } this.element .removeClass( "ui-slider" + -- cgit v1.2.3 From e776a7fb092df2eeefa975c83bd4c1c7a6439b05 Mon Sep 17 00:00:00 2001 From: Scott González Date: Tue, 4 Jun 2013 09:35:37 -0400 Subject: Slider Tests: Remove pointless doc blocks. --- tests/unit/slider/slider_core.js | 3 --- tests/unit/slider/slider_events.js | 3 --- tests/unit/slider/slider_methods.js | 3 --- tests/unit/slider/slider_options.js | 3 --- 4 files changed, 12 deletions(-) (limited to 'tests') diff --git a/tests/unit/slider/slider_core.js b/tests/unit/slider/slider_core.js index 19c9abb8e..3649bded0 100644 --- a/tests/unit/slider/slider_core.js +++ b/tests/unit/slider/slider_core.js @@ -1,6 +1,3 @@ -/* - * slider unit tests - */ (function( $ ) { // // Slider Test Helper Functions diff --git a/tests/unit/slider/slider_events.js b/tests/unit/slider/slider_events.js index 92b0bdedd..ec93a0565 100644 --- a/tests/unit/slider/slider_events.js +++ b/tests/unit/slider/slider_events.js @@ -1,6 +1,3 @@ -/* - * slider_events.js - */ (function( $ ) { module( "slider: events" ); diff --git a/tests/unit/slider/slider_methods.js b/tests/unit/slider/slider_methods.js index bd9023133..c5c7e1254 100644 --- a/tests/unit/slider/slider_methods.js +++ b/tests/unit/slider/slider_methods.js @@ -1,6 +1,3 @@ -/* - * slider_methods.js - */ (function( $ ) { module( "slider: methods" ); diff --git a/tests/unit/slider/slider_options.js b/tests/unit/slider/slider_options.js index b89981115..5cfb5351a 100644 --- a/tests/unit/slider/slider_options.js +++ b/tests/unit/slider/slider_options.js @@ -1,6 +1,3 @@ -/* - * slider_options.js - */ (function( $ ) { var element, options; -- cgit v1.2.3