From 3339ad0ce543797b52d660099b35ee3e299bbd74 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 16 Feb 2014 01:01:08 +0200 Subject: [PATCH] Update datarangepicker to 1.3.2 --- public/assets/css/daterangepicker-bs3.css | 13 +++++++++++++ public/assets/js/daterangepicker.js | 16 ++++++++++------ 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/public/assets/css/daterangepicker-bs3.css b/public/assets/css/daterangepicker-bs3.css index 28b905e..f69236f 100644 --- a/public/assets/css/daterangepicker-bs3.css +++ b/public/assets/css/daterangepicker-bs3.css @@ -247,3 +247,16 @@ width: 50px; margin-bottom: 0; } + +.daterangepicker_start_input { + float: left; +} + +.daterangepicker_end_input { + float: left; + padding-left: 11px +} + +.daterangepicker th.month { + width: auto; +} \ No newline at end of file diff --git a/public/assets/js/daterangepicker.js b/public/assets/js/daterangepicker.js index 11ad0f1..659c387 100644 --- a/public/assets/js/daterangepicker.js +++ b/public/assets/js/daterangepicker.js @@ -1,7 +1,7 @@ /** -* @version: 1.3 +* @version: 1.3.2 * @author: Dan Grossman http://www.dangrossman.info/ -* @date: 2014-01-14 +* @date: 2014-01-22 * @copyright: Copyright (c) 2012-2014 Dan Grossman. All rights reserved. * @license: Licensed under Apache License v2.0. See http://www.apache.org/licenses/LICENSE-2.0 * @website: http://www.improvely.com/ @@ -22,11 +22,11 @@ '
' + '
' + '
' + - '
' + + '
' + '' + '' + '
' + - '
' + + '
' + '' + '' + '
' + @@ -184,6 +184,10 @@ this.locale.daysOfWeek = options.locale.daysOfWeek.slice(); } + if (typeof options.locale.monthNames == 'object') { + this.locale.monthNames = options.locale.monthNames.slice(); + } + if (typeof options.locale.firstDay == 'number') { this.locale.firstDay = options.locale.firstDay; var iterator = options.locale.firstDay; @@ -387,7 +391,7 @@ if (!this.timePicker) this.endDate = this.endDate.startOf('day'); - this.endDate = this.endDate.clone(); + this.oldEndDate = this.endDate.clone(); this.updateView(); this.updateCalendars(); @@ -840,7 +844,7 @@ dateHtml = this.renderDropdowns(calendar[1][1], minDate, maxDate); } - html += '' + dateHtml + ''; + html += '' + dateHtml + ''; if (!maxDate || maxDate.isAfter(calendar[1][1])) { html += ''; } else {