Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Datepicker - Date locales in $.fn.datepicker.dates are lost #1108

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Datepicker - Date locales in $.fn.datepicker.dates are lost #1108

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60462d0
Date locales in $.fn.datepicker.dates are lost
Diagonir Sep 13, 2018
c56d6d3
Update bootstrap-editable.js
Diagonir Sep 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 21 additions & 11 deletions dist/bootstrap3-editable/js/bootstrap-editable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5916,6 +5916,8 @@ Editableform based on Twitter Bootstrap 3
}

var old = $.fn.datepicker;
//Save preexisting dates
var oldDates = $.fn.datepicker.dates;
var datepicker = $.fn.datepicker = function ( option ) {
var args = Array.apply(null, arguments);
args.shift();
Expand Down Expand Up @@ -5978,18 +5980,26 @@ Editableform based on Twitter Bootstrap 3
'rtl',
'weekStart'
];
$.fn.datepicker.Constructor = Datepicker;
var dates = $.fn.datepicker.dates = {
en: {
days: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"],
daysShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"],
daysMin: ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"],
months: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
monthsShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
today: "Today",
clear: "Clear"
}

var defaultEn = {
en: {
days: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"],
daysShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"],
daysMin: ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"],
months: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
monthsShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
today: "Today",
clear: "Clear"
}
};

$.fn.datepicker.Constructor = Datepicker;
var dates;
if (oldDates) {
dates = $.fn.datepicker.dates = $.extend({}, oldDates, defaultEn);
} else {
dates = $.fn.datepicker.dates = defaultEn;
}

var DPGlobal = {
modes: [
Expand Down