From 4432f7a65f852ca010dec39bccb2a7d464dcecb1 Mon Sep 17 00:00:00 2001 From: Jeroen Thora Date: Sun, 22 Jan 2017 16:22:47 +0100 Subject: [PATCH] Revert merge #1891 --- js/bootstrap-datepicker.js | 14 +++++--------- tests/suites/events.js | 20 -------------------- 2 files changed, 5 insertions(+), 29 deletions(-) diff --git a/js/bootstrap-datepicker.js b/js/bootstrap-datepicker.js index 4c1841c0a..b70e6344e 100644 --- a/js/bootstrap-datepicker.js +++ b/js/bootstrap-datepicker.js @@ -806,15 +806,11 @@ } else if (this.dates.length){ // setting date by typing - if (typeof this.o.format === 'string') { - if ((String(this.element[0].value).length === String(this.o.format).length) && (String(oldDates) !== String(this.dates))) - this._trigger('changeDate'); - this.element.change(); - } else if (String(oldDates) !== String(this.dates)) { - this._trigger('changeDate'); - this.element.change(); - } - } + if (String(oldDates) !== String(this.dates) && fromArgs) { + this._trigger('changeDate'); + this.element.change(); + } + } if (!this.dates.length && oldDates.length) { this._trigger('clearDate'); this.element.change(); diff --git a/tests/suites/events.js b/tests/suites/events.js index 4db15ea57..02b504909 100644 --- a/tests/suites/events.js +++ b/tests/suites/events.js @@ -479,23 +479,3 @@ test('Changing view mode triggers changeViewMode', function () { equal(viewMode, 4); }); - -test('Manually changing date should not trigger changeDate until we finish typing(it meets the required format)', function(){ - - var triggers = 0; - var expectedTriggers = 1; - - this.input.on('changeDate', function(){ - triggers++ - }); - - this.input.focus(); - this.input.val('04-03-20'); - this.dp.update(); - this.input.val('04-03-201'); - this.dp.update(); - this.input.val('04-03-2013'); - this.dp.update(); - - equal(triggers, expectedTriggers); -});