Skip to content
Permalink
Browse files

Merge branch 'master' into selectmenu

  • Loading branch information
jzaefferer committed Jun 5, 2013
2 parents ab48ae7 + e776a7f commit ffc7d310d4d36543e71a7a97604c987659e463e3
@@ -8,12 +8,12 @@ jQuery(function($){
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.'],
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: 'dd/mm/yy',
@@ -64,7 +64,7 @@
"grunt-html": "0.3.3",
"grunt-git-authors": "1.2.0",
"rimraf": "2.1.4",
"testswarm": "1.0.0-alpha"
"testswarm": "1.1.0"
},
"keywords": []
}
@@ -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");
});

@@ -1,6 +1,3 @@
/*
* slider unit tests
*/
(function( $ ) {
//
// Slider Test Helper Functions
@@ -1,6 +1,3 @@
/*
* slider_events.js
*/
(function( $ ) {

module( "slider: events" );
@@ -1,6 +1,3 @@
/*
* slider_methods.js
*/
(function( $ ) {

module( "slider: methods" );
@@ -1,6 +1,3 @@
/*
* slider_options.js
*/
(function( $ ) {

var element, options;
@@ -200,7 +197,7 @@ test( "values", function() {
});

test( "range", function() {
expect( 27 );
expect( 33 );
var range;

// min
@@ -300,6 +297,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 = $( "<div></div>" ).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 );
@@ -58,9 +58,6 @@
font-size: 1em;
margin: 1px 0;
}
.ui-datepicker select.ui-datepicker-month-year {
width: 100%;
}
.ui-datepicker select.ui-datepicker-month,
.ui-datepicker select.ui-datepicker-year {
width: 49%;
@@ -38,13 +38,13 @@
overflow: hidden;
right: 0;
}
/* more specificity required here to overide default borders */
/* more specificity required here to override default borders */
.ui-spinner a.ui-spinner-button {
border-top: none;
border-bottom: none;
border-right: none;
}
/* vertical centre icon */
/* vertically center icon */
.ui-spinner .ui-icon {
position: absolute;
margin-top: -8px;
@@ -26,7 +26,7 @@
padding: 0;
white-space: nowrap;
}
.ui-tabs .ui-tabs-nav li a {
.ui-tabs .ui-tabs-nav .ui-tabs-anchor {
float: left;
padding: .5em 1em;
text-decoration: none;
@@ -35,13 +35,12 @@
margin-bottom: -1px;
padding-bottom: 1px;
}
.ui-tabs .ui-tabs-nav li.ui-tabs-active a,
.ui-tabs .ui-tabs-nav li.ui-state-disabled a,
.ui-tabs .ui-tabs-nav li.ui-tabs-loading a {
.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor,
.ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor,
.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor {
cursor: text;
}
.ui-tabs .ui-tabs-nav li a, /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a {
.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor {
cursor: pointer;
}
.ui-tabs .ui-tabs-panel {
@@ -454,10 +454,15 @@ $.widget( "ui.dialog", {
that._trigger( "drag", event, filteredUi( ui ) );
},
stop: function( event, ui ) {
options.position = [
ui.position.left - that.document.scrollLeft(),
ui.position.top - that.document.scrollTop()
];
var left = ui.offset.left - that.document.scrollLeft(),
top = ui.offset.top - that.document.scrollTop();

options.position = {
my: "left top",
at: "left" + (left >= 0 ? "+" : "") + left + " " +
"top" + (top >= 0 ? "+" : "") + top,
of: that.window
};
$( this ).removeClass("ui-dialog-dragging");
that._unblockFrames();
that._trigger( "dragStop", event, filteredUi( ui ) );
@@ -503,8 +508,18 @@ $.widget( "ui.dialog", {
that._trigger( "resize", event, filteredUi( ui ) );
},
stop: function( event, ui ) {
options.height = $( this ).height();
options.width = $( this ).width();
var offset = that.uiDialog.offset(),
left = offset.left - that.document.scrollLeft(),
top = offset.top - that.document.scrollTop();

options.height = that.uiDialog.height();
options.width = that.uiDialog.width();
options.position = {
my: "left top",
at: "left" + (left >= 0 ? "+" : "") + left + " " +
"top" + (top >= 0 ? "+" : "") + top,
of: that.window
};
$( this ).removeClass("ui-dialog-resizing");
that._unblockFrames();
that._trigger( "resizeStop", event, filteredUi( ui ) );
@@ -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" +

0 comments on commit ffc7d31

Please sign in to comment.
You can’t perform that action at this time.