diff --git a/dist/bootstrap3-editable/js/bootstrap-editable.js b/dist/bootstrap3-editable/js/bootstrap-editable.js index 29ed2c78..4a107df8 100644 --- a/dist/bootstrap3-editable/js/bootstrap-editable.js +++ b/dist/bootstrap3-editable/js/bootstrap-editable.js @@ -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(); @@ -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: [