submit callback action if first date of double picker has been saved

also removed/changed some single date blur/focus actions.. if that breaks look this commit up
Baremetrics · Sep 4, 2015 · c7e68c2 · c7e68c2
1 parent 7a21023
commit c7e68c2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 24 deletions.
diff --git a/dev/js/Calendar.js b/dev/js/Calendar.js
@@ -162,17 +162,10 @@
 
         if (self.calIsOpen) {
           self.calendarSetDates();
-          self.calendarClose('force');
-        }
-      });
 
-      event.stopPropagation();
-    });
+          if ($(self.selected).hasClass('dr-date-end'))
+            self.calendarSaveDates();
 
-    $(this.element).add('.dr-date', this.element).focus(function(event) {
-      $('html').one('click',function() {
-        if (self.calIsOpen) {
-          self.calendarSetDates();
           self.calendarClose('force');
         }
       });
@@ -527,17 +520,15 @@
     var self = this;
 
     if (!this.calIsOpen || this.presetIsOpen || type == 'force') {
-      $('.dr-date', this.element).blur();
       $('.dr-calendar', this.element).slideUp(200, function() {
         $('.dr-day', self.element).remove();
       });
     } else {
       $('.dr-day', this.element).remove();
     }
 
-    if (type == 'switcher') {
+    if (type == 'switcher')
       return false;
-    }
 
     $('.dr-input, .dr-date', this.element).removeClass('dr-active');
     $(this.element).removeClass('dr-active');

diff --git a/public/js/Calendar.js b/public/js/Calendar.js
@@ -162,17 +162,10 @@
 
         if (self.calIsOpen) {
           self.calendarSetDates();
-          self.calendarClose('force');
-        }
-      });
 
-      event.stopPropagation();
-    });
+          if ($(self.selected).hasClass('dr-date-end'))
+            self.calendarSaveDates();
 
-    $(this.element).add('.dr-date', this.element).focus(function(event) {
-      $('html').one('click',function() {
-        if (self.calIsOpen) {
-          self.calendarSetDates();
           self.calendarClose('force');
         }
       });
@@ -527,17 +520,15 @@
     var self = this;
 
     if (!this.calIsOpen || this.presetIsOpen || type == 'force') {
-      $('.dr-date', this.element).blur();
       $('.dr-calendar', this.element).slideUp(200, function() {
         $('.dr-day', self.element).remove();
       });
     } else {
       $('.dr-day', this.element).remove();
     }
 
-    if (type == 'switcher') {
+    if (type == 'switcher')
       return false;
-    }
 
     $('.dr-input, .dr-date', this.element).removeClass('dr-active');
     $(this.element).removeClass('dr-active');