From e8b5aa6f7953c0b5cf0250d72b5d86cd9ace730e Mon Sep 17 00:00:00 2001
From: Rockhold Wade <Wade.Rockhold@Parallon.com>
Date: Thu, 21 Jun 2018 12:28:41 -0500
Subject: [PATCH 1/5] #3: removes anything that doesn't match the existing
 regex filter

---
 src/jsCronUI.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/jsCronUI.js b/src/jsCronUI.js
index 01062b7..7b1cc48 100644
--- a/src/jsCronUI.js
+++ b/src/jsCronUI.js
@@ -576,7 +576,9 @@
             }
 
             var clean = value.replace(regex, '');
-
+            if(clean.length === 0){
+              return;
+            }
             if (value.indexOf('-') >= 0) {
               var pre = clean.substring(0, clean.indexOf('-')),
                 post = clean.substring(clean.indexOf('-') + 1, clean.length);

From a7e8cf9d1d8be748e591993b1bef60b136714957 Mon Sep 17 00:00:00 2001
From: Rockhold Wade <Wade.Rockhold@Parallon.com>
Date: Fri, 22 Jun 2018 11:07:52 -0500
Subject: [PATCH 2/5] #5: Added ability to select hourly occurrence.

---
 src/jsCronUI-template.js | 17 +++++++++++
 src/jsCronUI.js          | 63 ++++++++++++++++++++++++++++++++--------
 2 files changed, 68 insertions(+), 12 deletions(-)

diff --git a/src/jsCronUI-template.js b/src/jsCronUI-template.js
index 055f712..f0f05d2 100644
--- a/src/jsCronUI-template.js
+++ b/src/jsCronUI-template.js
@@ -4,6 +4,12 @@
 
 		return '<div class="c-schedule-type">' + //c-schedule-type
 				'<ul>' +
+					'<li>' +
+						'<label>' +
+							'<input type="radio" value="hourly" name="ScheduleType" />' +
+							'<span>Hourly</span>' +
+						'</label>' +
+					'</li>' +
 					'<li>' +
 						'<label>' +
 							'<input type="radio" value="daily" name="ScheduleType" />' +
@@ -37,6 +43,17 @@
 						'<input type="text" name="time" />' +
 					'</label>' +
 				'</div>' +
+				'<div class="js-schedule-hourly">Repeat every ' + //js-schedule-daily
+					'<select name="hourOccurrence">' +
+							'<option value="1">1</option>' +
+							'<option value="2">2</option>' +
+							'<option value="4">4</option>' +
+							'<option value="6">6</option>' +
+							'<option value="8">8</option>' +
+							'<option value="12">12</option>' +
+						'</select>' + ' hour(s)'
+						+
+				'</div>' +
 				'<div class="js-schedule-daily">Repeat every:' + //js-schedule-daily
 					'<div>' + 
 						'<label>' +
diff --git a/src/jsCronUI.js b/src/jsCronUI.js
index 7b1cc48..2a0984e 100644
--- a/src/jsCronUI.js
+++ b/src/jsCronUI.js
@@ -47,6 +47,7 @@
     { id: 13, message: 'A schedule type is required.' },
     { id: 14, message: 'No template found or provided. Please provide a template or include the default template file.' },
     { id: 20, message: 'A time is required.' },
+    { id: 21, message: 'Must select a number of hours to repeat.' },
     { id: 30, message: 'A daily or weekday repetition pattern selection is required.' },
     { id: 40, message: 'One or more days of the week are required.' },
     { id: 50, message: 'A date or day of week selection is required.' },
@@ -129,6 +130,7 @@
     function resetDom () {
       self.$el.find('input:radio,input:checkbox').prop('checked', false).change();
       self.$el.find('input:text').val('').change();
+      self.$el.find('select[name="hourOccurrence"]').val(1).change();
       hideAll();
       self.$el.find('.c-schedule-options').hide();
       self.$el.find('[name="time"]').attr('data-time', '');
@@ -186,10 +188,16 @@
 
       //reset model to default values
       this.reset();
+      var hourArr = values[2].split('/');
+      currentState.time = pad(hourArr[0], 2) + ':' + pad(values[1], 2);
 
-      currentState.time = pad(values[2], 2) + ':' + pad(values[1], 2);
+      if (values[2] !== '*') {
+        //Expression is hourly
+        currentState.pattern = 'hourly';
+        currentState.occurrence = hourArr[1];
 
-      if (values[4] !== '*') {
+      }
+      else if (values[4] !== '*') {
         //Expression is yearly
         currentState.pattern = 'yearly';
         currentState.months = values[4].split(',');
@@ -271,6 +279,7 @@
 
       disableUiUpdates = true;
       updateDom();
+      //sef.el
       disableUiUpdates = false;
     };
 
@@ -282,7 +291,27 @@
         year = '*',
         dayOfWeek = '?';
 
+        if (currentState.time && currentState.time !== '') {
+          var timeArr = currentState.time.split(':');
+          hour = parseInt(timeArr[0]) + '';
+          minute = parseInt(timeArr[1]) + '';
+        } else {
+          if (validate) {
+            throw new CronError(20);
+          }
+        }
+
       switch (currentState.pattern) {
+        case 'hourly':
+          var hourOccurrence = currentState.occurrence;
+          if (validate && !hourOccurrence === 0) {
+            throw new CronError(21, currentState.pattern);
+          }
+          if(hourOccurrence > 0 && hour !== '*'){
+            hour = hour +"/"+ hourOccurrence;
+          }
+        break;
+
         case 'daily':
           switch (currentState.selected) {
             case 'daily':
@@ -346,15 +375,6 @@
           break;
       }
 
-      if (currentState.time && currentState.time !== '') {
-        var timeArr = currentState.time.split(':');
-        hour = parseInt(timeArr[0]) + '';
-        minute = parseInt(timeArr[1]) + '';
-      } else {
-        if (validate) {
-          throw new CronError(20);
-        }
-      }
 
       var cron = ['0', minute, hour, dayOfMonth, month, dayOfWeek, year]; //Default state = every minute
 
@@ -381,6 +401,11 @@
       }
 
       switch (currentState.pattern) {
+        case 'hourly':
+        if (currentState.occurrence.length === 0 && currentState.occurrence === 0) {
+          throw new CronError(21, currentState.pattern);
+        }
+        break;
         case 'daily':
           switch (currentState.selected) {
             case 'daily':
@@ -603,6 +628,9 @@
       self.$el.find('[name="time"]').trigger('blur');
 
       switch (currentState.pattern) {
+        case 'hourly':
+          self.$el.find('.js-schedule-hourly [name="hourOccurrence"]').val(currentState.occurrence).change();
+        break;
         case 'daily':
           self.$el.find('[name="dailyPattern"][value="' + currentState.selected + '"]').prop('checked', true).change();
           break;
@@ -659,6 +687,9 @@
       currentState.time = self.$el.find('[name="time"]').attr('data-time');
 
       switch (currentState.pattern) {
+        case 'hourly':
+          currentState.occurrence = self.$el.find('[name="hourOccurrence"]').val();
+          break;
         case 'daily':
           currentState.selected = self.$el.find('[name="dailyPattern"]:checked').val();
           break;
@@ -692,6 +723,7 @@
     };
 
     function hideAll () {
+      self.$el.find('.js-schedule-hourly').hide();
       self.$el.find('.js-schedule-daily').hide();
       self.$el.find('.js-schedule-weekly').hide();
       self.$el.find('.js-schedule-monthly').hide();
@@ -813,7 +845,7 @@
 
         return $.makeArray(res);
       }
-
+     
       var toEnglishDays = function (values) {
         var dayList = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
 
@@ -849,6 +881,13 @@
       };
 
       switch (currentState.pattern) {
+        case 'hourly':
+          if (currentState.occurrence > 1) {
+              result += "Every "+ currentState.occurrence + " hour(s) starting at " + timeString;
+          }else{
+            result += "Every hour starting at " + timeString;
+          }
+          break;
         case 'daily':
           result = 'Every ' + (currentState.selected === 'weekday' ? 'week' : '') + 'day at ' + timeString;
           break;

From 21d40fef34c02114c02dfac21fbf69d1e06b3290 Mon Sep 17 00:00:00 2001
From: Rockhold Wade <Wade.Rockhold@Parallon.com>
Date: Fri, 22 Jun 2018 11:16:52 -0500
Subject: [PATCH 3/5] #6: added bindEnglishTo setting

---
 src/jsCronUI.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/jsCronUI.js b/src/jsCronUI.js
index 2a0984e..a56e83a 100644
--- a/src/jsCronUI.js
+++ b/src/jsCronUI.js
@@ -98,6 +98,7 @@
     if (settings) {
       self.$bindTo = settings.bindTo || null;
       self.initialValue = settings.initialValue;
+      self.$bindEnglishTo = settings.bindEnglishTo || null;;
     }
 
     var disableUiUpdates = false;
@@ -156,6 +157,10 @@
         self.setCron(self.initialValue);
       }
 
+      if (self.$bindEnglishTo && self.$bindEnglishTo instanceof jQuery && self.initialValue) {
+        self.toEnglishString();
+      }
+
       self.$el.find('div input,select').on('change', function () {
         cleanInputs();
         updateFromDom();
@@ -279,7 +284,7 @@
 
       disableUiUpdates = true;
       updateDom();
-      //sef.el
+      
       disableUiUpdates = false;
     };
 
@@ -720,6 +725,9 @@
       if (self.$bindTo && self.$bindTo.val() !== self.getCron()) {
         self.$bindTo.val(self.getCron()).change();
       }
+      if (self.$bindEnglishTo && self.$bindEnglishTo.val() !== self.toEnglishString()) {
+        self.$bindEnglishTo.text(self.toEnglishString()).change();
+      }
     };
 
     function hideAll () {

From fb99fe2deafea8b2b358adb84ff4c28fb17476f4 Mon Sep 17 00:00:00 2001
From: Rockhold Wade <Wade.Rockhold@Parallon.com>
Date: Tue, 26 Jun 2018 13:04:40 -0500
Subject: [PATCH 4/5] #6: added bindErrorTo as well

---
 src/jsCronUI.js | 58 ++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 45 insertions(+), 13 deletions(-)

diff --git a/src/jsCronUI.js b/src/jsCronUI.js
index a56e83a..6c50eb0 100644
--- a/src/jsCronUI.js
+++ b/src/jsCronUI.js
@@ -68,11 +68,11 @@
     { id: 80, message: 'Unknown error occurred inside jsCronUI library: %1.' }
   ];
 
-  function CronError(number, additionalData, substitutions) {
-    this.number = number;
-    this.message = errorList.filter(function (error) {
-      return error.id === number;
-    })[0].message;
+	function CronError(number, additionalData, substitutions) {
+		this.number = number;
+		this.message = errorList.filter(function (error) {
+			return error.id === number;
+		})[0].message;
 
     if (substitutions) {
       for (var i = substitutions.length - 1; i >= 0; i--) {
@@ -82,6 +82,7 @@
 
     this.data = additionalData;
     this.stack = (new Error()).stack;
+
   }
 
   CronError.prototype = Object.create(Error.prototype);
@@ -98,7 +99,8 @@
     if (settings) {
       self.$bindTo = settings.bindTo || null;
       self.initialValue = settings.initialValue;
-      self.$bindEnglishTo = settings.bindEnglishTo || null;;
+      self.$bindEnglishTo = settings.bindEnglishTo || null;
+      self.$bindErrorTo = settings.bindErrorTo || null;
     }
 
     var disableUiUpdates = false;
@@ -154,16 +156,45 @@
       wireEvents();
 
       if (self.$bindTo && self.$bindTo instanceof jQuery && self.initialValue) {
-        self.setCron(self.initialValue);
+        if(self.$bindErrorTo instanceof jQuery){
+          try{
+            self.setCron(self.initialValue);
+          }catch(e){
+            self.$bindErrorTo.text(e.message).change();
+          }
+        }else{
+          self.setCron(self.initialValue);
+        }
       }
 
       if (self.$bindEnglishTo && self.$bindEnglishTo instanceof jQuery && self.initialValue) {
-        self.toEnglishString();
+        if(self.$bindErrorTo instanceof jQuery){
+          try{
+            updateFromDom();
+            self.toEnglishString();
+          }catch(e){
+            self.$bindErrorTo.text(e.message).change();
+          }
+        }else{
+          updateFromDom();
+          self.toEnglishString();
+        }
       }
 
       self.$el.find('div input,select').on('change', function () {
-        cleanInputs();
-        updateFromDom();
+        if(self.$bindErrorTo instanceof jQuery){
+          try{
+            cleanInputs();
+            updateFromDom();
+            self.$bindErrorTo.text("").change();
+          }catch(e){
+              self.$bindErrorTo.text(e.message).change();
+          }
+          
+        }else{
+          cleanInputs();
+          updateFromDom();
+        }
       });
     };
 
@@ -196,7 +227,7 @@
       var hourArr = values[2].split('/');
       currentState.time = pad(hourArr[0], 2) + ':' + pad(values[1], 2);
 
-      if (values[2] !== '*') {
+      if (values[2].indexOf('/') > 0 ) {
         //Expression is hourly
         currentState.pattern = 'hourly';
         currentState.occurrence = hourArr[1];
@@ -630,6 +661,7 @@
     function updateDom () {
       self.$el.find('.c-schedule-type input:radio[value="' + currentState.pattern + '"]').prop('checked', true).change();
       self.$el.find('[name="time"]').val(currentState.time);
+      self.$el.find('[name="time"]').attr('data-time',currentState.time);
       self.$el.find('[name="time"]').trigger('blur');
 
       switch (currentState.pattern) {
@@ -725,8 +757,8 @@
       if (self.$bindTo && self.$bindTo.val() !== self.getCron()) {
         self.$bindTo.val(self.getCron()).change();
       }
-      if (self.$bindEnglishTo && self.$bindEnglishTo.val() !== self.toEnglishString()) {
-        self.$bindEnglishTo.text(self.toEnglishString()).change();
+      if (self.$bindEnglishTo && self.$bindTo.val() === self.getCron() && self.$bindEnglishTo.val() !== self.toEnglishString()) {
+         self.$bindEnglishTo.text(self.toEnglishString()).change(); 
       }
     };
 

From b2eb0f17dde5bf44c9ef6a022d6c1178d6cc98aa Mon Sep 17 00:00:00 2001
From: Rockhold Wade <Wade.Rockhold@Parallon.com>
Date: Wed, 27 Jun 2018 09:22:21 -0500
Subject: [PATCH 5/5] #6: clarified what Hourly actually meant

---
 src/jsCronUI.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/jsCronUI.js b/src/jsCronUI.js
index 6c50eb0..5ee43cd 100644
--- a/src/jsCronUI.js
+++ b/src/jsCronUI.js
@@ -926,7 +926,8 @@
               result += "Every "+ currentState.occurrence + " hour(s) starting at " + timeString;
           }else{
             result += "Every hour starting at " + timeString;
-          }
+              }
+            result += " until end of day (12:00 AM/midnight)";
           break;
         case 'daily':
           result = 'Every ' + (currentState.selected === 'weekday' ? 'week' : '') + 'day at ' + timeString;