added swapping dates when range is true, fixes t1m0n#46

wc-matteo · May 16, 2016 · 5aeb04c · 5aeb04c
1 parent f5c1ae4
commit 5aeb04c
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 2 deletions.
diff --git a/dist/js/datepicker.js b/dist/js/datepicker.js
@@ -484,6 +484,11 @@
                     } else {
                         _this.minRange = date;
                     }
+                    // Swap dates if they were selected via dp.selectDate() and second date was smaller then first
+                    if (datepicker.bigger(_this.maxRange, _this.minRange)) {
+                        _this.maxRange = _this.minRange;
+                        _this.minRange = date;
+                    }
                     _this.selectedDates = [_this.minRange, _this.maxRange]
 
                 } else {

diff --git a/dist/js/datepicker.min.js b/dist/js/datepicker.min.js
diff --git a/src/js/datepicker.js b/src/js/datepicker.js
@@ -484,6 +484,11 @@
                     } else {
                         _this.minRange = date;
                     }
+                    // Swap dates if they were selected via dp.selectDate() and second date was smaller then first
+                    if (datepicker.bigger(_this.maxRange, _this.minRange)) {
+                        _this.maxRange = _this.minRange;
+                        _this.minRange = date;
+                    }
                     _this.selectedDates = [_this.minRange, _this.maxRange]
 
                 } else {

diff --git a/tests/index.html b/tests/index.html
@@ -19,6 +19,7 @@
         <script type="text/javascript" src="specs/options.js"></script>
         <script type="text/javascript" src="specs/events.js"></script>
         <script type="text/javascript" src="specs/static-methods.js"></script>
+        <script type="text/javascript" src="specs/api.js"></script>
         <style type="text/css">
             /* Remove transitions to test position options*/
             .datepicker {

diff --git a/tests/specs/api.js b/tests/specs/api.js
@@ -0,0 +1,65 @@
+describe('API', function () {
+
+    var assert = chai.assert,
+        expect = chai.expect,
+        destroy = true,
+        $altInput,
+        $input, dp;
+
+    before(function () {
+        $input = $('<input>').appendTo('#container');
+        $altInput = $('<input class="alt-field">').appendTo('#container');
+    });
+
+    afterEach(function () {
+        if (dp && destroy) {
+            dp.destroy();
+        }
+
+        destroy = true;
+    });
+
+    after(function () {
+        $input.remove();
+        $altInput.remove();
+    });
+
+    describe('selectDate', function () {
+        it('should select passed date', function () {
+            dp = $input.datepicker().data('datepicker');
+
+            var date = new Date();
+
+            dp.selectDate(date);
+
+            expect(dp.selectedDates).to.have.length(1);
+            expect(dp.selectedDates[0]).to.be.equal(date)
+        });
+        it('should select multiple dates if {multipleDates: true}', function () {
+            dp = $input.datepicker({
+                multipleDates: true
+            }).data('datepicker');
+
+            var date = new Date(2016, 4, 16),
+                date2 = new Date(2016, 4, 18);
+
+            dp.selectDate(date);
+            dp.selectDate(date2);
+
+            expect(dp.selectedDates).to.have.length(2);
+        });
+        it('should swap dates if {range: true} and second date is smaller then first', function () {
+            dp = $input.datepicker({
+                range: true
+            }).data('datepicker');
+
+            var date = new Date(2016, 4, 18),
+                date2 = new Date(2016, 4, 16);
+
+            dp.selectDate(date);
+            dp.selectDate(date2);
+
+            expect(dp.selectedDates[0]).to.be.equal(date2);
+        })
+    });
+});