@websy/websy-designs 1.1.2 → 1.1.3

package/dist/websy-designs.js

@@ -46,11 +46,8 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
   APIService
   ButtonGroup
   WebsyUtils
-<<<<<<< HEAD
   WebsyCarousel
-=======
   Pager
->>>>>>> master
 */
 
 /* global XMLHttpRequest fetch ENV */
@@ -682,7 +679,7 @@ var WebsyDatePicker = /*#__PURE__*/function () {
   }, {
     key: "highlightRange",
     value: function highlightRange() {
-      var _this2 = this;
+      var _this4 = this;
 
       var el = document.getElementById("".concat(this.elementId, "_dateList"));
       var dateEls = el.querySelectorAll('.websy-dp-date');
@@ -753,9 +750,9 @@ var WebsyDatePicker = /*#__PURE__*/function () {
         this.currentselection.forEach(function (d) {
           var dateEl;
 
-          if (_this2.options.mode === 'date') {
+          if (_this4.options.mode === 'date') {
             dateEl = document.getElementById("".concat(d, "_date"));
-          } else if (_this2.options.mode === 'year') {
+          } else if (_this4.options.mode === 'year') {
             dateEl = document.getElementById("".concat(d, "_year"));
           }
 
@@ -804,7 +801,7 @@ var WebsyDatePicker = /*#__PURE__*/function () {
   }, {
     key: "renderDates",
     value: function renderDates(disabledDates) {
-      var _this3 = this;
+      var _this5 = this;
 
       var disabled = [];
       this.validDates = [];
@@ -812,9 +809,9 @@ var WebsyDatePicker = /*#__PURE__*/function () {
 
       if (disabledDates) {
         disabled = disabledDates.map(function (d) {
-          if (_this3.options.mode === 'date') {
+          if (_this5.options.mode === 'date') {
             return d.getTime();
-          } else if (_this3.options.mode === 'year') {
+          } else if (_this5.options.mode === 'year') {
             return d;
           }
 
@@ -961,17 +958,11 @@ var WebsyDatePicker = /*#__PURE__*/function () {
   }, {
     key: "renderRanges",
     value: function renderRanges() {
-      var _this4 = this;
+      var _this6 = this;
 
-<<<<<<< HEAD
-      return this.options.ranges.map(function (r, i) {
-        return "\n      <li data-index='".concat(i, "' class='websy-date-picker-range ").concat(i === _this4.selectedRange ? 'active' : '', " ").concat(r.disabled === true ? 'websy-disabled-range' : '', "'>").concat(r.label, "</li>\n    ");
-      }).join('');
-=======
       return this.options.ranges[this.options.mode].map(function (r, i) {
-        return "\n      <li data-index='".concat(i, "' class='websy-date-picker-range ").concat(i === _this4.selectedRange ? 'active' : '', " ").concat(r.disabled === true ? 'websy-disabled-range' : '', "'>").concat(r.label, "</li>\n    ");
+        return "\n      <li data-index='".concat(i, "' class='websy-date-picker-range ").concat(i === _this6.selectedRange ? 'active' : '', " ").concat(r.disabled === true ? 'websy-disabled-range' : '', "'>").concat(r.label, "</li>\n    ");
       }).join('') + "<li data-index='-1' class='websy-date-picker-range ".concat(this.selectedRange === -1 ? 'active' : '', "'>Custom</li>");
->>>>>>> master
     }
   }, {
     key: "scrollRangeIntoView",
@@ -1085,15 +1076,15 @@ var WebsyDatePicker = /*#__PURE__*/function () {
   }, {
     key: "updateRange",
     value: function updateRange() {
-      var _this5 = this;
+      var _this7 = this;
 
       var range;
 
       if (this.selectedRange === -1) {
         var list = (this.currentselection.length > 0 ? this.currentselection : this.selectedRangeDates).map(function (d) {
-          if (_this5.options.mode === 'date') {
+          if (_this7.options.mode === 'date') {
             return d.toLocaleDateString();
-          } else if (_this5.options.mode === 'year') {
+          } else if (_this7.options.mode === 'year') {
             return d;
           }
         });
@@ -1142,7 +1133,7 @@ Date.prototype.floor = function () {
 
 var WebsyDropdown = /*#__PURE__*/function () {
   function WebsyDropdown(elementId, options) {
-    var _this6 = this;
+    var _this8 = this;
 
     _classCallCheck(this, WebsyDropdown);
 
@@ -1177,10 +1168,10 @@ var WebsyDropdown = /*#__PURE__*/function () {
       el.addEventListener('mouseout', this.handleMouseOut.bind(this));
       el.addEventListener('mousemove', this.handleMouseMove.bind(this));
       var headerLabel = this.selectedItems.map(function (s) {
-        return _this6.options.items[s].label || _this6.options.items[s].value;
+        return _this8.options.items[s].label || _this8.options.items[s].value;
       }).join(this.options.multiValueDelimiter);
       var headerValue = this.selectedItems.map(function (s) {
-        return _this6.options.items[s].value || _this6.options.items[s].label;
+        return _this8.options.items[s].value || _this8.options.items[s].label;
       }).join(this.options.multiValueDelimiter);
       var html = "\n        <div id='".concat(this.elementId, "_container' class='websy-dropdown-container ").concat(this.options.disabled ? 'disabled' : '', " ").concat(this.options.disableSearch !== true ? 'with-search' : '', " ").concat(this.options.style, "'>\n          <div id='").concat(this.elementId, "_header' class='websy-dropdown-header ").concat(this.selectedItems.length === 1 ? 'one-selected' : '', " ").concat(this.options.allowClear === true ? 'allow-clear' : '', "'>\n            <svg class='search' width=\"20\" height=\"20\" viewBox=\"0 0 512 512\"><path d=\"M221.09,64A157.09,157.09,0,1,0,378.18,221.09,157.1,157.1,0,0,0,221.09,64Z\" style=\"fill:none;stroke:#000;stroke-miterlimit:10;stroke-width:32px\"/><line x1=\"338.29\" y1=\"338.29\" x2=\"448\" y2=\"448\" style=\"fill:none;stroke:#000;stroke-linecap:round;stroke-miterlimit:10;stroke-width:32px\"/></svg>\n            <span id='").concat(this.elementId, "_headerLabel' class='websy-dropdown-header-label'>").concat(this.options.label, "</span>\n            <span data-info='").concat(headerLabel, "' class='websy-dropdown-header-value' id='").concat(this.elementId, "_selectedItems'>").concat(headerLabel, "</span>\n            <input class='dropdown-input' id='").concat(this.elementId, "_input' name='").concat(this.options.field || this.options.label, "' value='").concat(headerValue, "'>\n            <svg class='arrow' xmlns=\"http://www.w3.org/2000/svg\" width=\"24\" height=\"24\" viewBox=\"0 0 24 24\"><path d=\"M23.677 18.52c.914 1.523-.183 3.472-1.967 3.472h-19.414c-1.784 0-2.881-1.949-1.967-3.472l9.709-16.18c.891-1.483 3.041-1.48 3.93 0l9.709 16.18z\"/></svg>            \n      ");
 
@@ -1366,29 +1357,6 @@ var WebsyDropdown = /*#__PURE__*/function () {
   }, {
     key: "render",
     value: function render() {
-<<<<<<< HEAD
-      var _this5 = this;
-
-      if (!this.elementId) {
-        console.log('No element Id provided for Websy Dropdown');
-        return;
-      }
-
-      var el = document.getElementById(this.elementId);
-      var headerLabel = this.selectedItems.map(function (s) {
-        return _this5.options.items[s].label || _this5.options.items[s].value;
-      }).join(this.options.multiValueDelimiter);
-      var headerValue = this.selectedItems.map(function (s) {
-        return _this5.options.items[s].value || _this5.options.items[s].label;
-      }).join(this.options.multiValueDelimiter);
-      var html = "\n      <div class='websy-dropdown-container ".concat(this.options.disabled ? 'disabled' : '', " ").concat(this.options.disableSearch !== true ? 'with-search' : '', "'>\n        <div id='").concat(this.elementId, "_header' class='websy-dropdown-header ").concat(this.selectedItems.length === 1 ? 'one-selected' : '', " ").concat(this.options.allowClear === true ? 'allow-clear' : '', "'>\n          <span id='").concat(this.elementId, "_headerLabel' class='websy-dropdown-header-label'>").concat(this.options.label, "</span>\n          <span data-info='").concat(headerLabel, "' class='websy-dropdown-header-value' id='").concat(this.elementId, "_selectedItems'>").concat(headerLabel, "</span>\n          <input class='dropdown-input' id='").concat(this.elementId, "_input' name='").concat(this.options.field || this.options.label, "' value='").concat(headerValue, "'>\n          <svg class='arrow' xmlns=\"http://www.w3.org/2000/svg\" width=\"24\" height=\"24\" viewBox=\"0 0 24 24\"><path d=\"M23.677 18.52c.914 1.523-.183 3.472-1.967 3.472h-19.414c-1.784 0-2.881-1.949-1.967-3.472l9.709-16.18c.891-1.483 3.041-1.48 3.93 0l9.709 16.18z\"/></svg>\n    ");
-
-      if (this.options.allowClear === true) {
-        html += "\n        <svg class='clear' xmlns=\"http://www.w3.org/2000/svg\" width=\"24\" height=\"24\" viewBox=\"0 0 512 512\"><title>ionicons-v5-l</title><line x1=\"368\" y1=\"368\" x2=\"144\" y2=\"144\" style=\"fill:none;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px\"/><line x1=\"368\" y1=\"144\" x2=\"144\" y2=\"368\" style=\"fill:none;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px\"/></svg>\n      ";
-      }
-
-      html += "          \n        </div>\n        <div id='".concat(this.elementId, "_mask' class='websy-dropdown-mask'></div>\n        <div id='").concat(this.elementId, "_content' class='websy-dropdown-content'>\n    ");
-=======
       if (!this.elementId) {
         console.log('No element Id provided for Websy Dropdown');
         return;
@@ -1428,7 +1396,6 @@ var WebsyDropdown = /*#__PURE__*/function () {
       //   </div>
       // `
       // el.innerHTML = html
->>>>>>> master
 
 
       this.renderItems();
@@ -1436,17 +1403,10 @@ var WebsyDropdown = /*#__PURE__*/function () {
   }, {
     key: "renderItems",
     value: function renderItems() {
-<<<<<<< HEAD
-      var _this6 = this;
-
-      var html = this.options.items.map(function (r, i) {
-        return "\n      <li data-index='".concat(i, "' class='websy-dropdown-item ").concat((r.classes || []).join(' '), " ").concat(_this6.selectedItems.indexOf(i) !== -1 ? 'active' : '', "'>").concat(r.label, "</li>\n    ");
-=======
-      var _this7 = this;
+      var _this9 = this;
 
       var html = this.options.items.map(function (r, i) {
-        return "\n      <li data-index='".concat(i, "' class='websy-dropdown-item ").concat((r.classes || []).join(' '), " ").concat(_this7.selectedItems.indexOf(i) !== -1 ? 'active' : '', "'>").concat(r.label, "</li>\n    ");
->>>>>>> master
+        return "\n      <li data-index='".concat(i, "' class='websy-dropdown-item ").concat((r.classes || []).join(' '), " ").concat(_this9.selectedItems.indexOf(i) !== -1 ? 'active' : '', "'>").concat(r.label, "</li>\n    ");
       }).join('');
       var el = document.getElementById("".concat(this.elementId, "_items"));
 
@@ -1465,11 +1425,7 @@ var WebsyDropdown = /*#__PURE__*/function () {
   }, {
     key: "updateHeader",
     value: function updateHeader(item) {
-<<<<<<< HEAD
-      var _this7 = this;
-=======
-      var _this8 = this;
->>>>>>> master
+      var _this10 = this;
 
       var el = document.getElementById(this.elementId);
       var headerEl = document.getElementById("".concat(this.elementId, "_header"));
@@ -1515,28 +1471,17 @@ var WebsyDropdown = /*#__PURE__*/function () {
         } else if (this.selectedItems.length > 1) {
           if (this.options.showCompleteSelectedList === true) {
             var selectedLabels = this.selectedItems.map(function (s) {
-<<<<<<< HEAD
-              return _this7.options.items[s].label || _this7.options.items[s].value;
-            }).join(this.options.multiValueDelimiter);
-            var selectedValues = this.selectedItems.map(function (s) {
-              return _this7.options.items[s].value || _this7.options.items[s].label;
-=======
-              return _this8.options.items[s].label || _this8.options.items[s].value;
+              return _this10.options.items[s].label || _this10.options.items[s].value;
             }).join(this.options.multiValueDelimiter);
             var selectedValues = this.selectedItems.map(function (s) {
-              return _this8.options.items[s].value || _this8.options.items[s].label;
->>>>>>> master
+              return _this10.options.items[s].value || _this10.options.items[s].label;
             }).join(this.options.multiValueDelimiter);
             labelEl.innerHTML = selectedLabels;
             labelEl.setAttribute('data-info', selectedLabels);
             inputEl.value = selectedValues;
           } else {
             var _selectedValues = this.selectedItems.map(function (s) {
-<<<<<<< HEAD
-              return _this7.options.items[s].value || _this7.options.items[s].label;
-=======
-              return _this8.options.items[s].value || _this8.options.items[s].label;
->>>>>>> master
+              return _this10.options.items[s].value || _this10.options.items[s].label;
             }).join(this.options.multiValueDelimiter);
 
             labelEl.innerHTML = "".concat(this.selectedItems.length, " selected");
@@ -1665,23 +1610,13 @@ var WebsyForm = /*#__PURE__*/function () {
   }, {
     key: "checkRecaptcha",
     value: function checkRecaptcha() {
-<<<<<<< HEAD
-      var _this8 = this;
-
-      return new Promise(function (resolve, reject) {
-        if (_this8.options.useRecaptcha === true) {
-          if (_this8.recaptchaValue) {
-            _this8.apiService.add('/google/checkrecaptcha', JSON.stringify({
-              grecaptcharesponse: _this8.recaptchaValue
-=======
-      var _this9 = this;
+      var _this11 = this;
 
       return new Promise(function (resolve, reject) {
-        if (_this9.options.useRecaptcha === true) {
-          if (_this9.recaptchaValue) {
-            _this9.apiService.add('/google/checkrecaptcha', JSON.stringify({
-              grecaptcharesponse: _this9.recaptchaValue
->>>>>>> master
+        if (_this11.options.useRecaptcha === true) {
+          if (_this11.recaptchaValue) {
+            _this11.apiService.add('/google/checkrecaptcha', JSON.stringify({
+              grecaptcharesponse: _this11.recaptchaValue
             })).then(function (response) {
               if (response.success && response.success === true) {
                 resolve(true);
@@ -1739,22 +1674,14 @@ var WebsyForm = /*#__PURE__*/function () {
   }, {
     key: "processComponents",
     value: function processComponents(components, callbackFn) {
-<<<<<<< HEAD
-      var _this9 = this;
-=======
-      var _this10 = this;
->>>>>>> master
+      var _this12 = this;
 
       if (components.length === 0) {
         callbackFn();
       } else {
         components.forEach(function (c) {
           if (typeof WebsyDesigns[c.component] !== 'undefined') {
-<<<<<<< HEAD
-            var comp = new WebsyDesigns[c.component]("".concat(_this9.elementId, "_input_").concat(c.field, "_component"), c.options);
-=======
-            c.instance = new WebsyDesigns[c.component]("".concat(_this10.elementId, "_input_").concat(c.field, "_component"), c.options);
->>>>>>> master
+            c.instance = new WebsyDesigns[c.component]("".concat(_this12.elementId, "_input_").concat(c.field, "_component"), c.options);
           } else {// some user feedback here
           }
         });
@@ -1775,11 +1702,7 @@ var WebsyForm = /*#__PURE__*/function () {
   }, {
     key: "render",
     value: function render(update, data) {
-<<<<<<< HEAD
-      var _this10 = this;
-=======
-      var _this11 = this;
->>>>>>> master
+      var _this13 = this;
 
       var el = document.getElementById(this.elementId);
       var componentsToProcess = [];
@@ -1789,19 +1712,11 @@ var WebsyForm = /*#__PURE__*/function () {
         this.options.fields.forEach(function (f, i) {
           if (f.component) {
             componentsToProcess.push(f);
-<<<<<<< HEAD
-            html += "\n            ".concat(i > 0 ? '-->' : '', "<div class='").concat(f.classes, "'>\n              ").concat(f.label ? "<label for=\"".concat(f.field, "\">").concat(f.label, "</label>") : '', "\n              <div id='").concat(_this10.elementId, "_input_").concat(f.field, "_component' class='form-component'></div>\n            </div><!--\n          ");
-          } else if (f.type === 'longtext') {
-            html += "\n            ".concat(i > 0 ? '-->' : '', "<div class='").concat(f.classes, "'>\n              ").concat(f.label ? "<label for=\"".concat(f.field, "\">").concat(f.label, "</label>") : '', "\n              <textarea\n                id=\"").concat(_this10.elementId, "_input_").concat(f.field, "\"\n                ").concat(f.required === true ? 'required' : '', " \n                placeholder=\"").concat(f.placeholder || '', "\"\n                name=\"").concat(f.field, "\" \n                class=\"websy-input websy-textarea\"\n              ></textarea>\n            </div><!--\n          ");
-          } else {
-            html += "\n            ".concat(i > 0 ? '-->' : '', "<div class='").concat(f.classes, "'>\n              ").concat(f.label ? "<label for=\"".concat(f.field, "\">").concat(f.label, "</label>") : '', "\n              <input \n                id=\"").concat(_this10.elementId, "_input_").concat(f.field, "\"\n                ").concat(f.required === true ? 'required' : '', " \n                type=\"").concat(f.type || 'text', "\" \n                class=\"websy-input\" \n                name=\"").concat(f.field, "\" \n                placeholder=\"").concat(f.placeholder || '', "\"\n                value=\"").concat(f.value || '', "\"\n                oninvalidx=\"this.setCustomValidity('").concat(f.invalidMessage || 'Please fill in this field.', "')\"\n              />\n            </div><!--\n          ");
-=======
-            html += "\n            ".concat(i > 0 ? '-->' : '', "<div class='").concat(f.classes || '', "'>\n              ").concat(f.label ? "<label for=\"".concat(f.field, "\">").concat(f.label, "</label>") : '', "\n              <div id='").concat(_this11.elementId, "_input_").concat(f.field, "_component' class='form-component'></div>\n            </div><!--\n          ");
+            html += "\n            ".concat(i > 0 ? '-->' : '', "<div class='").concat(f.classes || '', "'>\n              ").concat(f.label ? "<label for=\"".concat(f.field, "\">").concat(f.label, "</label>") : '', "\n              <div id='").concat(_this13.elementId, "_input_").concat(f.field, "_component' class='form-component'></div>\n            </div><!--\n          ");
           } else if (f.type === 'longtext') {
-            html += "\n            ".concat(i > 0 ? '-->' : '', "<div class='").concat(f.classes || '', "'>\n              ").concat(f.label ? "<label for=\"".concat(f.field, "\">").concat(f.label, "</label>") : '', "\n              <textarea\n                id=\"").concat(_this11.elementId, "_input_").concat(f.field, "\"\n                ").concat(f.required === true ? 'required' : '', " \n                placeholder=\"").concat(f.placeholder || '', "\"\n                name=\"").concat(f.field, "\" \n                class=\"websy-input websy-textarea\"\n              ></textarea>\n            </div><!--\n          ");
+            html += "\n            ".concat(i > 0 ? '-->' : '', "<div class='").concat(f.classes || '', "'>\n              ").concat(f.label ? "<label for=\"".concat(f.field, "\">").concat(f.label, "</label>") : '', "\n              <textarea\n                id=\"").concat(_this13.elementId, "_input_").concat(f.field, "\"\n                ").concat(f.required === true ? 'required' : '', " \n                placeholder=\"").concat(f.placeholder || '', "\"\n                name=\"").concat(f.field, "\" \n                class=\"websy-input websy-textarea\"\n              ></textarea>\n            </div><!--\n          ");
           } else {
-            html += "\n            ".concat(i > 0 ? '-->' : '', "<div class='").concat(f.classes || '', "'>\n              ").concat(f.label ? "<label for=\"".concat(f.field, "\">").concat(f.label, "</label>") : '', "\n              <input \n                id=\"").concat(_this11.elementId, "_input_").concat(f.field, "\"\n                ").concat(f.required === true ? 'required' : '', " \n                type=\"").concat(f.type || 'text', "\" \n                class=\"websy-input\" \n                name=\"").concat(f.field, "\" \n                placeholder=\"").concat(f.placeholder || '', "\"\n                value=\"").concat(f.value || '', "\"\n                valueAsDate=\"").concat(f.type === 'date' ? f.value : '', "\"\n                oninvalidx=\"this.setCustomValidity('").concat(f.invalidMessage || 'Please fill in this field.', "')\"\n              />\n            </div><!--\n          ");
->>>>>>> master
+            html += "\n            ".concat(i > 0 ? '-->' : '', "<div class='").concat(f.classes || '', "'>\n              ").concat(f.label ? "<label for=\"".concat(f.field, "\">").concat(f.label, "</label>") : '', "\n              <input \n                id=\"").concat(_this13.elementId, "_input_").concat(f.field, "\"\n                ").concat(f.required === true ? 'required' : '', " \n                type=\"").concat(f.type || 'text', "\" \n                class=\"websy-input\" \n                name=\"").concat(f.field, "\" \n                placeholder=\"").concat(f.placeholder || '', "\"\n                value=\"").concat(f.value || '', "\"\n                valueAsDate=\"").concat(f.type === 'date' ? f.value : '', "\"\n                oninvalidx=\"this.setCustomValidity('").concat(f.invalidMessage || 'Please fill in this field.', "')\"\n              />\n            </div><!--\n          ");
           }
         });
         html += "\n        --><button class=\"websy-btn submit ".concat(this.options.submit.classes || '', "\">").concat(this.options.submit.text || 'Save', "</button>").concat(this.options.cancel ? '<!--' : '', "\n      ");
@@ -1818,13 +1733,8 @@ var WebsyForm = /*#__PURE__*/function () {
 
         el.innerHTML = html;
         this.processComponents(componentsToProcess, function () {
-<<<<<<< HEAD
-          if (_this10.options.useRecaptcha === true && typeof grecaptcha !== 'undefined') {
-            _this10.recaptchaReady();
-=======
-          if (_this11.options.useRecaptcha === true && typeof grecaptcha !== 'undefined') {
-            _this11.recaptchaReady();
->>>>>>> master
+          if (_this13.options.useRecaptcha === true && typeof grecaptcha !== 'undefined') {
+            _this13.recaptchaReady();
           }
         });
       }
@@ -1832,11 +1742,7 @@ var WebsyForm = /*#__PURE__*/function () {
   }, {
     key: "submitForm",
     value: function submitForm() {
-<<<<<<< HEAD
-      var _this11 = this;
-=======
-      var _this12 = this;
->>>>>>> master
+      var _this14 = this;
 
       var formEl = document.getElementById("".concat(this.elementId, "Form"));
 
@@ -1850,40 +1756,22 @@ var WebsyForm = /*#__PURE__*/function () {
               data[key] = value;
             });
 
-<<<<<<< HEAD
-            if (_this11.options.url) {
-              _this11.apiService.add(_this11.options.url, data).then(function (result) {
-                if (_this11.options.clearAfterSave === true) {
-=======
-            if (_this12.options.url) {
-              _this12.apiService.add(_this12.options.url, data).then(function (result) {
-                if (_this12.options.clearAfterSave === true) {
->>>>>>> master
+            if (_this14.options.url) {
+              _this14.apiService.add(_this14.options.url, data).then(function (result) {
+                if (_this14.options.clearAfterSave === true) {
                   // this.render()
                   formEl.reset();
                 }
 
-<<<<<<< HEAD
-                _this11.options.onSuccess.call(_this11, result);
-              }, function (err) {
-                console.log('Error submitting form data:', err);
-
-                _this11.options.onError.call(_this11, err);
-              });
-            } else if (_this11.options.submitFn) {
-              _this11.options.submitFn(data, function () {
-                if (_this11.options.clearAfterSave === true) {
-=======
-                _this12.options.onSuccess.call(_this12, result);
+                _this14.options.onSuccess.call(_this14, result);
               }, function (err) {
                 console.log('Error submitting form data:', err);
 
-                _this12.options.onError.call(_this12, err);
+                _this14.options.onError.call(_this14, err);
               });
-            } else if (_this12.options.submitFn) {
-              _this12.options.submitFn(data, function () {
-                if (_this12.options.clearAfterSave === true) {
->>>>>>> master
+            } else if (_this14.options.submitFn) {
+              _this14.options.submitFn(data, function () {
+                if (_this14.options.clearAfterSave === true) {
                   // this.render()
                   formEl.reset();
                 }
@@ -1903,28 +1791,17 @@ var WebsyForm = /*#__PURE__*/function () {
   }, {
     key: "data",
     set: function set(d) {
-<<<<<<< HEAD
-      var _this12 = this;
-=======
-      var _this13 = this;
->>>>>>> master
+      var _this15 = this;
 
       if (!this.options.fields) {
         this.options.fields = [];
       }
 
       var _loop = function _loop(key) {
-<<<<<<< HEAD
-        _this12.options.fields.forEach(function (f) {
-          if (f.field === key) {
-            f.value = d[key];
-            var el = document.getElementById("".concat(_this12.elementId, "_input_").concat(f.field));
-=======
-        _this13.options.fields.forEach(function (f) {
+        _this15.options.fields.forEach(function (f) {
           if (f.field === key) {
             f.value = d[key];
-            var el = document.getElementById("".concat(_this13.elementId, "_input_").concat(f.field));
->>>>>>> master
+            var el = document.getElementById("".concat(_this15.elementId, "_input_").concat(f.field));
             el.value = f.value;
           }
         });
@@ -2224,7 +2101,7 @@ var WebsyNavigationMenu = /*#__PURE__*/function () {
 
 var Pager = /*#__PURE__*/function () {
   function Pager(elementId, options) {
-    var _this14 = this;
+    var _this16 = this;
 
     _classCallCheck(this, Pager);
 
@@ -2277,8 +2154,8 @@ var Pager = /*#__PURE__*/function () {
           allowClear: false,
           disableSearch: true,
           onItemSelected: function onItemSelected(selectedItem) {
-            if (_this14.options.onChangePageSize) {
-              _this14.options.onChangePageSize(selectedItem.value);
+            if (_this16.options.onChangePageSize) {
+              _this16.options.onChangePageSize(selectedItem.value);
             }
           }
         });
@@ -2302,13 +2179,13 @@ var Pager = /*#__PURE__*/function () {
   }, {
     key: "render",
     value: function render() {
-      var _this15 = this;
+      var _this17 = this;
 
       var el = document.getElementById("".concat(this.elementId, "_pageList"));
 
       if (el) {
         var pages = this.options.pages.map(function (item, index) {
-          return "<li data-index=\"".concat(index, "\" class=\"websy-page-num ").concat(_this15.options.activePage === index ? 'active' : '', "\">").concat(index + 1, "</li>");
+          return "<li data-index=\"".concat(index, "\" class=\"websy-page-num ").concat(_this17.options.activePage === index ? 'active' : '', "\">").concat(index + 1, "</li>");
         });
         var startIndex = 0;
 
@@ -2376,107 +2253,58 @@ var WebsyPDFButton = /*#__PURE__*/function () {
   _createClass(WebsyPDFButton, [{
     key: "handleClick",
     value: function handleClick(event) {
-<<<<<<< HEAD
-      var _this13 = this;
-=======
-      var _this16 = this;
->>>>>>> master
+      var _this18 = this;
 
       if (event.target.classList.contains('websy-pdf-button')) {
         this.loader.show();
         setTimeout(function () {
-<<<<<<< HEAD
-          if (_this13.options.targetId) {
-            var el = document.getElementById(_this13.options.targetId);
-=======
-          if (_this16.options.targetId) {
-            var el = document.getElementById(_this16.options.targetId);
->>>>>>> master
+          if (_this18.options.targetId) {
+            var el = document.getElementById(_this18.options.targetId);
 
             if (el) {
               var pdfData = {
                 options: {}
               };
 
-<<<<<<< HEAD
-              if (_this13.options.pdfOptions) {
-                pdfData.options = _extends({}, _this13.options.pdfOptions);
+              if (_this18.options.pdfOptions) {
+                pdfData.options = _extends({}, _this18.options.pdfOptions);
               }
 
-              if (_this13.options.header) {
-                if (_this13.options.header.elementId) {
-                  var headerEl = document.getElementById(_this13.options.header.elementId);
-=======
-              if (_this16.options.pdfOptions) {
-                pdfData.options = _extends({}, _this16.options.pdfOptions);
-              }
-
-              if (_this16.options.header) {
-                if (_this16.options.header.elementId) {
-                  var headerEl = document.getElementById(_this16.options.header.elementId);
->>>>>>> master
+              if (_this18.options.header) {
+                if (_this18.options.header.elementId) {
+                  var headerEl = document.getElementById(_this18.options.header.elementId);
 
                   if (headerEl) {
                     pdfData.header = headerEl.outerHTML;
 
-<<<<<<< HEAD
-                    if (_this13.options.header.css) {
-                      pdfData.options.headerCSS = _this13.options.header.css;
-                    }
-                  }
-                } else if (_this13.options.header.html) {
-                  pdfData.header = _this13.options.header.html;
-
-                  if (_this13.options.header.css) {
-                    pdfData.options.headerCSS = _this13.options.header.css;
-                  }
-                } else {
-                  pdfData.header = _this13.options.header;
-                }
-              }
-
-              if (_this13.options.footer) {
-                if (_this13.options.footer.elementId) {
-                  var footerEl = document.getElementById(_this13.options.footer.elementId);
-=======
-                    if (_this16.options.header.css) {
-                      pdfData.options.headerCSS = _this16.options.header.css;
+                    if (_this18.options.header.css) {
+                      pdfData.options.headerCSS = _this18.options.header.css;
                     }
                   }
-                } else if (_this16.options.header.html) {
-                  pdfData.header = _this16.options.header.html;
+                } else if (_this18.options.header.html) {
+                  pdfData.header = _this18.options.header.html;
 
-                  if (_this16.options.header.css) {
-                    pdfData.options.headerCSS = _this16.options.header.css;
+                  if (_this18.options.header.css) {
+                    pdfData.options.headerCSS = _this18.options.header.css;
                   }
                 } else {
-                  pdfData.header = _this16.options.header;
+                  pdfData.header = _this18.options.header;
                 }
               }
 
-              if (_this16.options.footer) {
-                if (_this16.options.footer.elementId) {
-                  var footerEl = document.getElementById(_this16.options.footer.elementId);
->>>>>>> master
+              if (_this18.options.footer) {
+                if (_this18.options.footer.elementId) {
+                  var footerEl = document.getElementById(_this18.options.footer.elementId);
 
                   if (footerEl) {
                     pdfData.footer = footerEl.outerHTML;
 
-<<<<<<< HEAD
-                    if (_this13.options.footer.css) {
-                      pdfData.options.footerCSS = _this13.options.footer.css;
+                    if (_this18.options.footer.css) {
+                      pdfData.options.footerCSS = _this18.options.footer.css;
                     }
                   }
                 } else {
-                  pdfData.footer = _this13.options.footer;
-=======
-                    if (_this16.options.footer.css) {
-                      pdfData.options.footerCSS = _this16.options.footer.css;
-                    }
-                  }
-                } else {
-                  pdfData.footer = _this16.options.footer;
->>>>>>> master
+                  pdfData.footer = _this18.options.footer;
                 }
               }
 
@@ -2485,40 +2313,23 @@ var WebsyPDFButton = /*#__PURE__*/function () {
               // document.getElementById(`${this.elementId}_pdfFooter`).value = pdfData.footer
               // document.getElementById(`${this.elementId}_form`).submit()
 
-<<<<<<< HEAD
-              _this13.service.add('', pdfData, {
-                responseType: 'blob'
-              }).then(function (response) {
-                _this13.loader.hide();
-=======
-              _this16.service.add('', pdfData, {
+              _this18.service.add('', pdfData, {
                 responseType: 'blob'
               }).then(function (response) {
-                _this16.loader.hide();
->>>>>>> master
+                _this18.loader.hide();
 
                 var blob = new Blob([response], {
                   type: 'application/pdf'
                 });
                 var msg = "\n                <div class='text-center websy-pdf-download'>\n                  <div>Your file is ready to download</div>\n                  <a href='".concat(URL.createObjectURL(blob), "' target='_blank'\n              ");
 
-<<<<<<< HEAD
-                if (_this13.options.directDownload === true) {
-                  msg += "download='".concat(_this13.options.fileName || 'Export', ".pdf'");
+                if (_this18.options.directDownload === true) {
+                  msg += "download='".concat(_this18.options.fileName || 'Export', ".pdf'");
                 }
 
-                msg += "\n                  >\n                    <button class='websy-btn download-pdf'>".concat(_this13.options.buttonText, "</button>\n                  </a>\n                </div>\n              ");
+                msg += "\n                  >\n                    <button class='websy-btn download-pdf'>".concat(_this18.options.buttonText, "</button>\n                  </a>\n                </div>\n              ");
 
-                _this13.popup.show({
-=======
-                if (_this16.options.directDownload === true) {
-                  msg += "download='".concat(_this16.options.fileName || 'Export', ".pdf'");
-                }
-
-                msg += "\n                  >\n                    <button class='websy-btn download-pdf'>".concat(_this16.options.buttonText, "</button>\n                  </a>\n                </div>\n              ");
-
-                _this16.popup.show({
->>>>>>> master
+                _this18.popup.show({
                   message: msg,
                   mask: true
                 });
@@ -2703,11 +2514,7 @@ var WebsyPubSub = /*#__PURE__*/function () {
 
 var WebsyResultList = /*#__PURE__*/function () {
   function WebsyResultList(elementId, options) {
-<<<<<<< HEAD
-    var _this14 = this;
-=======
-    var _this17 = this;
->>>>>>> master
+    var _this19 = this;
 
     _classCallCheck(this, WebsyResultList);
 
@@ -2735,15 +2542,9 @@ var WebsyResultList = /*#__PURE__*/function () {
 
     if (_typeof(options.template) === 'object' && options.template.url) {
       this.templateService.get(options.template.url).then(function (templateString) {
-<<<<<<< HEAD
-        _this14.options.template = templateString;
+        _this19.options.template = templateString;
 
-        _this14.render();
-=======
-        _this17.options.template = templateString;
-
-        _this17.render();
->>>>>>> master
+        _this19.render();
       });
     } else {
       this.render();
@@ -2762,11 +2563,7 @@ var WebsyResultList = /*#__PURE__*/function () {
   }, {
     key: "buildHTML",
     value: function buildHTML(d) {
-<<<<<<< HEAD
-      var _this15 = this;
-=======
-      var _this18 = this;
->>>>>>> master
+      var _this20 = this;
 
       var startIndex = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
       var html = "";
@@ -2774,11 +2571,7 @@ var WebsyResultList = /*#__PURE__*/function () {
       if (this.options.template) {
         if (d.length > 0) {
           d.forEach(function (row, ix) {
-<<<<<<< HEAD
-            var template = "".concat(ix > 0 ? '-->' : '').concat(_this15.options.template).concat(ix < d.length - 1 ? '<!--' : ''); // find conditional elements
-=======
-            var template = "".concat(ix > 0 ? '-->' : '').concat(_this18.options.template).concat(ix < d.length - 1 ? '<!--' : ''); // find conditional elements
->>>>>>> master
+            var template = "".concat(ix > 0 ? '-->' : '').concat(_this20.options.template).concat(ix < d.length - 1 ? '<!--' : ''); // find conditional elements
 
             var ifMatches = _toConsumableArray(template.matchAll(/<\s*if[^>]*>([\s\S]*?)<\s*\/\s*if>/g));
 
@@ -2898,11 +2691,7 @@ var WebsyResultList = /*#__PURE__*/function () {
   }, {
     key: "handleClick",
     value: function handleClick(event) {
-<<<<<<< HEAD
-      var _this16 = this;
-=======
-      var _this19 = this;
->>>>>>> master
+      var _this21 = this;
 
       if (event.target.classList.contains('clickable')) {
         var l = event.target.getAttribute('data-event');
@@ -2920,13 +2709,8 @@ var WebsyResultList = /*#__PURE__*/function () {
           l = l[0];
           params = params.map(function (p) {
             if (typeof p !== 'string' && typeof p !== 'number') {
-<<<<<<< HEAD
-              if (_this16.rows[+id]) {
-                p = _this16.rows[+id][p];
-=======
-              if (_this19.rows[+id]) {
-                p = _this19.rows[+id][p];
->>>>>>> master
+              if (_this21.rows[+id]) {
+                p = _this21.rows[+id][p];
               }
             } else if (typeof p === 'string') {
               p = p.replace(/"/g, '').replace(/'/g, '');
@@ -2948,23 +2732,13 @@ var WebsyResultList = /*#__PURE__*/function () {
   }, {
     key: "render",
     value: function render() {
-<<<<<<< HEAD
-      var _this17 = this;
-
-      if (this.options.entity) {
-        this.apiService.get(this.options.entity).then(function (results) {
-          _this17.rows = results.rows;
-
-          _this17.resize();
-=======
-      var _this20 = this;
+      var _this22 = this;
 
       if (this.options.entity) {
         this.apiService.get(this.options.entity).then(function (results) {
-          _this20.rows = results.rows;
+          _this22.rows = results.rows;
 
-          _this20.resize();
->>>>>>> master
+          _this22.resize();
         });
       } else {
         this.resize();
@@ -3043,11 +2817,7 @@ var WebsyRouter = /*#__PURE__*/function () {
   _createClass(WebsyRouter, [{
     key: "addGroup",
     value: function addGroup(group) {
-<<<<<<< HEAD
-      var _this18 = this;
-=======
-      var _this21 = this;
->>>>>>> master
+      var _this23 = this;
 
       if (!this.groups[group]) {
         var els = document.querySelectorAll(".websy-view[data-group=\"".concat(group, "\"]"));
@@ -3055,11 +2825,7 @@ var WebsyRouter = /*#__PURE__*/function () {
         if (els) {
           console.log('els', els);
           this.getClosestParent(els[0], function (parent) {
-<<<<<<< HEAD
-            _this18.groups[group] = {
-=======
-            _this21.groups[group] = {
->>>>>>> master
+            _this23.groups[group] = {
               activeView: '',
               views: [],
               parent: parent.getAttribute('data-view')
@@ -3380,20 +3146,12 @@ var WebsyRouter = /*#__PURE__*/function () {
   }, {
     key: "showComponents",
     value: function showComponents(view) {
-<<<<<<< HEAD
-      var _this19 = this;
-=======
-      var _this22 = this;
->>>>>>> master
+      var _this24 = this;
 
       if (this.options.views && this.options.views[view] && this.options.views[view].components) {
         this.options.views[view].components.forEach(function (c) {
           if (typeof c.instance === 'undefined') {
-<<<<<<< HEAD
-            _this19.prepComponent(c.elementId, c.options);
-=======
-            _this22.prepComponent(c.elementId, c.options);
->>>>>>> master
+            _this24.prepComponent(c.elementId, c.options);
 
             c.instance = new c.Component(c.elementId, c.options);
           } else if (c.instance.render) {
@@ -3760,11 +3518,7 @@ var Switch = /*#__PURE__*/function () {
 
 var WebsyTemplate = /*#__PURE__*/function () {
   function WebsyTemplate(elementId, options) {
-<<<<<<< HEAD
-    var _this20 = this;
-=======
-    var _this23 = this;
->>>>>>> master
+    var _this25 = this;
 
     _classCallCheck(this, WebsyTemplate);
 
@@ -3790,15 +3544,9 @@ var WebsyTemplate = /*#__PURE__*/function () {
 
     if (_typeof(options.template) === 'object' && options.template.url) {
       this.templateService.get(options.template.url).then(function (templateString) {
-<<<<<<< HEAD
-        _this20.options.template = templateString;
-
-        _this20.render();
-=======
-        _this23.options.template = templateString;
+        _this25.options.template = templateString;
 
-        _this23.render();
->>>>>>> master
+        _this25.render();
       });
     } else {
       this.render();
@@ -3808,11 +3556,7 @@ var WebsyTemplate = /*#__PURE__*/function () {
   _createClass(WebsyTemplate, [{
     key: "buildHTML",
     value: function buildHTML() {
-<<<<<<< HEAD
-      var _this21 = this;
-=======
-      var _this24 = this;
->>>>>>> master
+      var _this26 = this;
 
       var html = "";
 
@@ -3874,22 +3618,14 @@ var WebsyTemplate = /*#__PURE__*/function () {
                 }
 
                 if (polarity === true) {
-<<<<<<< HEAD
-                  if (typeof _this21.options.data[parts[0]] !== 'undefined' && _this21.options.data[parts[0]] === parts[1]) {
-=======
-                  if (typeof _this24.options.data[parts[0]] !== 'undefined' && _this24.options.data[parts[0]] === parts[1]) {
->>>>>>> master
+                  if (typeof _this26.options.data[parts[0]] !== 'undefined' && _this26.options.data[parts[0]] === parts[1]) {
                     // remove the <if> tags
                     removeAll = false;
                   } else if (parts[0] === parts[1]) {
                     removeAll = false;
                   }
                 } else if (polarity === false) {
-<<<<<<< HEAD
-                  if (typeof _this21.options.data[parts[0]] !== 'undefined' && _this21.options.data[parts[0]] !== parts[1]) {
-=======
-                  if (typeof _this24.options.data[parts[0]] !== 'undefined' && _this24.options.data[parts[0]] !== parts[1]) {
->>>>>>> master
+                  if (typeof _this26.options.data[parts[0]] !== 'undefined' && _this26.options.data[parts[0]] !== parts[1]) {
                     // remove the <if> tags
                     removeAll = false;
                   }
@@ -4157,11 +3893,7 @@ var WebsyUtils = {
 
 var WebsyTable = /*#__PURE__*/function () {
   function WebsyTable(elementId, options) {
-<<<<<<< HEAD
-    var _this22 = this;
-=======
-    var _this25 = this;
->>>>>>> master
+    var _this27 = this;
 
     _classCallCheck(this, WebsyTable);
 
@@ -4199,13 +3931,8 @@ var WebsyTable = /*#__PURE__*/function () {
           allowClear: false,
           disableSearch: true,
           onItemSelected: function onItemSelected(selectedItem) {
-<<<<<<< HEAD
-            if (_this22.options.onChangePageSize) {
-              _this22.options.onChangePageSize(selectedItem.value);
-=======
-            if (_this25.options.onChangePageSize) {
-              _this25.options.onChangePageSize(selectedItem.value);
->>>>>>> master
+            if (_this27.options.onChangePageSize) {
+              _this27.options.onChangePageSize(selectedItem.value);
             }
           }
         });
@@ -4226,11 +3953,7 @@ var WebsyTable = /*#__PURE__*/function () {
   _createClass(WebsyTable, [{
     key: "appendRows",
     value: function appendRows(data) {
-<<<<<<< HEAD
-      var _this23 = this;
-=======
-      var _this26 = this;
->>>>>>> master
+      var _this28 = this;
 
       this.hideError();
       var bodyHTML = '';
@@ -4238,24 +3961,15 @@ var WebsyTable = /*#__PURE__*/function () {
       if (data) {
         bodyHTML += data.map(function (r, rowIndex) {
           return '<tr>' + r.map(function (c, i) {
-<<<<<<< HEAD
-            if (_this23.options.columns[i].show !== false) {
-=======
-            if (_this26.options.columns[i].show !== false) {
->>>>>>> master
+            if (_this28.options.columns[i].show !== false) {
               var style = '';
 
               if (c.style) {
                 style += c.style;
               }
 
-<<<<<<< HEAD
-              if (_this23.options.columns[i].width) {
-                style += "width: ".concat(_this23.options.columns[i].width, "; ");
-=======
-              if (_this26.options.columns[i].width) {
-                style += "width: ".concat(_this26.options.columns[i].width, "; ");
->>>>>>> master
+              if (_this28.options.columns[i].width) {
+                style += "width: ".concat(_this28.options.columns[i].width, "; ");
               }
 
               if (c.backgroundColor) {
@@ -4270,33 +3984,18 @@ var WebsyTable = /*#__PURE__*/function () {
                 style += "color: ".concat(c.color, "; ");
               }
 
-<<<<<<< HEAD
-              if (_this23.options.columns[i].showAsLink === true && c.value.trim() !== '') {
-                return "\n                <td \n                  data-row-index='".concat(_this23.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='").concat(_this23.options.columns[i].classes || '', "' \n                  style='").concat(style, "'\n                  colspan='").concat(c.colspan || 1, "'\n                  rowspan='").concat(c.rowspan || 1, "'\n                >\n                  <a href='").concat(c.value, "' target='").concat(_this23.options.columns[i].openInNewTab === true ? '_blank' : '_self', "'>").concat(c.displayText || _this23.options.columns[i].linkText || c.value, "</a>\n                </td>\n              ");
-              } else if ((_this23.options.columns[i].showAsNavigatorLink === true || _this23.options.columns[i].showAsRouterLink === true) && c.value.trim() !== '') {
-                return "\n                <td \n                  data-view='".concat(c.value, "' \n                  data-row-index='").concat(_this23.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='trigger-item ").concat(_this23.options.columns[i].clickable === true ? 'clickable' : '', " ").concat(_this23.options.columns[i].classes || '', "' \n                  style='").concat(style, "'\n                  colspan='").concat(c.colspan || 1, "'\n                  rowspan='").concat(c.rowspan || 1, "'\n                >").concat(c.displayText || _this23.options.columns[i].linkText || c.value, "</td>\n              ");
-              } else {
-                var info = c.value;
-
-                if (_this23.options.columns[i].showAsImage === true) {
-                  c.value = "\n                  <img src='".concat(c.value, "'>\n                ");
-                }
-
-                return "\n                <td \n                  data-info='".concat(info, "' \n                  data-row-index='").concat(_this23.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='").concat(_this23.options.columns[i].classes || '', "' \n                  style='").concat(style, "'\n                  colspan='").concat(c.colspan || 1, "'\n                  rowspan='").concat(c.rowspan || 1, "'\n                >").concat(c.value, "</td>\n              ");
-=======
-              if (_this26.options.columns[i].showAsLink === true && c.value.trim() !== '') {
-                return "\n                <td \n                  data-row-index='".concat(_this26.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='").concat(_this26.options.columns[i].classes || '', "' \n                  style='").concat(style, "'\n                  colspan='").concat(c.colspan || 1, "'\n                  rowspan='").concat(c.rowspan || 1, "'\n                >\n                  <a href='").concat(c.value, "' target='").concat(_this26.options.columns[i].openInNewTab === true ? '_blank' : '_self', "'>").concat(c.displayText || _this26.options.columns[i].linkText || c.value, "</a>\n                </td>\n              ");
-              } else if ((_this26.options.columns[i].showAsNavigatorLink === true || _this26.options.columns[i].showAsRouterLink === true) && c.value.trim() !== '') {
-                return "\n                <td \n                  data-view='".concat(c.value, "' \n                  data-row-index='").concat(_this26.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='trigger-item ").concat(_this26.options.columns[i].clickable === true ? 'clickable' : '', " ").concat(_this26.options.columns[i].classes || '', "' \n                  style='").concat(style, "'\n                  colspan='").concat(c.colspan || 1, "'\n                  rowspan='").concat(c.rowspan || 1, "'\n                >").concat(c.displayText || _this26.options.columns[i].linkText || c.value, "</td>\n              ");
+              if (_this28.options.columns[i].showAsLink === true && c.value.trim() !== '') {
+                return "\n                <td \n                  data-row-index='".concat(_this28.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='").concat(_this28.options.columns[i].classes || '', "' \n                  style='").concat(style, "'\n                  colspan='").concat(c.colspan || 1, "'\n                  rowspan='").concat(c.rowspan || 1, "'\n                >\n                  <a href='").concat(c.value, "' target='").concat(_this28.options.columns[i].openInNewTab === true ? '_blank' : '_self', "'>").concat(c.displayText || _this28.options.columns[i].linkText || c.value, "</a>\n                </td>\n              ");
+              } else if ((_this28.options.columns[i].showAsNavigatorLink === true || _this28.options.columns[i].showAsRouterLink === true) && c.value.trim() !== '') {
+                return "\n                <td \n                  data-view='".concat(c.value, "' \n                  data-row-index='").concat(_this28.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='trigger-item ").concat(_this28.options.columns[i].clickable === true ? 'clickable' : '', " ").concat(_this28.options.columns[i].classes || '', "' \n                  style='").concat(style, "'\n                  colspan='").concat(c.colspan || 1, "'\n                  rowspan='").concat(c.rowspan || 1, "'\n                >").concat(c.displayText || _this28.options.columns[i].linkText || c.value, "</td>\n              ");
               } else {
                 var info = c.value;
 
-                if (_this26.options.columns[i].showAsImage === true) {
+                if (_this28.options.columns[i].showAsImage === true) {
                   c.value = "\n                  <img src='".concat(c.value, "'>\n                ");
                 }
 
-                return "\n                <td \n                  data-info='".concat(info, "' \n                  data-row-index='").concat(_this26.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='").concat(_this26.options.columns[i].classes || '', "' \n                  style='").concat(style, "'\n                  colspan='").concat(c.colspan || 1, "'\n                  rowspan='").concat(c.rowspan || 1, "'\n                >").concat(c.value, "</td>\n              ");
->>>>>>> master
+                return "\n                <td \n                  data-info='".concat(info, "' \n                  data-row-index='").concat(_this28.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='").concat(_this28.options.columns[i].classes || '', "' \n                  style='").concat(style, "'\n                  colspan='").concat(c.colspan || 1, "'\n                  rowspan='").concat(c.rowspan || 1, "'\n                >").concat(c.value, "</td>\n              ");
               }
             }
           }).join('') + '</tr>';
@@ -4455,11 +4154,7 @@ var WebsyTable = /*#__PURE__*/function () {
   }, {
     key: "render",
     value: function render(data) {
-<<<<<<< HEAD
-      var _this24 = this;
-=======
-      var _this27 = this;
->>>>>>> master
+      var _this29 = this;
 
       if (!this.options.columns) {
         return;
@@ -4484,11 +4179,7 @@ var WebsyTable = /*#__PURE__*/function () {
 
       var headHTML = '<tr>' + this.options.columns.map(function (c, i) {
         if (c.show !== false) {
-<<<<<<< HEAD
-          return "\n        <th ".concat(c.width ? 'style="width: ' + (c.width || 'auto') + ';"' : '', ">\n          <div class =\"tableHeader\">\n            <div class=\"leftSection\">\n              <div\n                class=\"tableHeaderField ").concat(['asc', 'desc'].indexOf(c.sort) !== -1 ? 'sortable-column' : '', "\"\n                data-index=\"").concat(i, "\"                \n                data-sort=\"").concat(c.sort, "\"                \n              >\n                ").concat(c.name, "\n              </div>\n            </div>\n            <div class=\"").concat(c.activeSort ? c.sort + ' sortOrder' : '', "\"></div>\n            <!--").concat(c.searchable === true ? _this24.buildSearchIcon(c.qGroupFieldDefs[0]) : '', "-->\n          </div>\n        </th>\n        ");
-=======
-          return "\n        <th ".concat(c.width ? 'style="width: ' + (c.width || 'auto') + ';"' : '', ">\n          <div class =\"tableHeader\">\n            <div class=\"leftSection\">\n              <div\n                class=\"tableHeaderField ").concat(['asc', 'desc'].indexOf(c.sort) !== -1 ? 'sortable-column' : '', "\"\n                data-index=\"").concat(i, "\"                \n                data-sort=\"").concat(c.sort, "\"                \n              >\n                ").concat(c.name, "\n              </div>\n            </div>\n            <div class=\"").concat(c.activeSort ? c.sort + ' sortOrder' : '', "\"></div>\n            <!--").concat(c.searchable === true ? _this27.buildSearchIcon(c.qGroupFieldDefs[0]) : '', "-->\n          </div>\n        </th>\n        ");
->>>>>>> master
+          return "\n        <th ".concat(c.width ? 'style="width: ' + (c.width || 'auto') + ';"' : '', ">\n          <div class =\"tableHeader\">\n            <div class=\"leftSection\">\n              <div\n                class=\"tableHeaderField ").concat(['asc', 'desc'].indexOf(c.sort) !== -1 ? 'sortable-column' : '', "\"\n                data-index=\"").concat(i, "\"                \n                data-sort=\"").concat(c.sort, "\"                \n              >\n                ").concat(c.name, "\n              </div>\n            </div>\n            <div class=\"").concat(c.activeSort ? c.sort + ' sortOrder' : '', "\"></div>\n            <!--").concat(c.searchable === true ? _this29.buildSearchIcon(c.qGroupFieldDefs[0]) : '', "-->\n          </div>\n        </th>\n        ");
         }
       }).join('') + '</tr>';
       var headEl = document.getElementById("".concat(this.elementId, "_head"));
@@ -4507,11 +4198,7 @@ var WebsyTable = /*#__PURE__*/function () {
 
         if (pagingEl) {
           var pages = new Array(this.options.pageCount).fill('').map(function (item, index) {
-<<<<<<< HEAD
-            return "<li data-page=\"".concat(index, "\" class=\"websy-page-num ").concat(_this24.options.pageNum === index ? 'active' : '', "\">").concat(index + 1, "</li>");
-=======
-            return "<li data-page=\"".concat(index, "\" class=\"websy-page-num ").concat(_this27.options.pageNum === index ? 'active' : '', "\">").concat(index + 1, "</li>");
->>>>>>> master
+            return "<li data-page=\"".concat(index, "\" class=\"websy-page-num ").concat(_this29.options.pageNum === index ? 'active' : '', "\">").concat(index + 1, "</li>");
           });
           var startIndex = 0;
 
@@ -4579,7 +4266,7 @@ var WebsyTable = /*#__PURE__*/function () {
 
 var WebsyTable2 = /*#__PURE__*/function () {
   function WebsyTable2(elementId, options) {
-    var _this28 = this;
+    var _this30 = this;
 
     _classCallCheck(this, WebsyTable2);
 
@@ -4620,8 +4307,8 @@ var WebsyTable2 = /*#__PURE__*/function () {
           allowClear: false,
           disableSearch: true,
           onItemSelected: function onItemSelected(selectedItem) {
-            if (_this28.options.onChangePageSize) {
-              _this28.options.onChangePageSize(selectedItem.value);
+            if (_this30.options.onChangePageSize) {
+              _this30.options.onChangePageSize(selectedItem.value);
             }
           }
         });
@@ -4645,7 +4332,7 @@ var WebsyTable2 = /*#__PURE__*/function () {
   _createClass(WebsyTable2, [{
     key: "appendRows",
     value: function appendRows(data) {
-      var _this29 = this;
+      var _this31 = this;
 
       this.hideError();
       var bodyEl = document.getElementById("".concat(this.elementId, "_body"));
@@ -4654,15 +4341,15 @@ var WebsyTable2 = /*#__PURE__*/function () {
       if (data) {
         bodyHTML += data.map(function (r, rowIndex) {
           return '<tr>' + r.map(function (c, i) {
-            if (_this29.options.columns[i].show !== false) {
-              var style = "height: ".concat(_this29.options.cellSize, "px; line-height: ").concat(_this29.options.cellSize, "px;");
+            if (_this31.options.columns[i].show !== false) {
+              var style = "height: ".concat(_this31.options.cellSize, "px; line-height: ").concat(_this31.options.cellSize, "px;");
 
               if (c.style) {
                 style += c.style;
               }
 
-              if (_this29.options.columns[i].width) {
-                style += "width: ".concat(_this29.options.columns[i].width, "; ");
+              if (_this31.options.columns[i].width) {
+                style += "width: ".concat(_this31.options.columns[i].width, "; ");
               }
 
               if (c.backgroundColor) {
@@ -4677,18 +4364,18 @@ var WebsyTable2 = /*#__PURE__*/function () {
                 style += "color: ".concat(c.color, "; ");
               }
 
-              if (_this29.options.columns[i].showAsLink === true && c.value.trim() !== '') {
-                return "\n                <td \n                  data-row-index='".concat(_this29.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='").concat(_this29.options.columns[i].classes || '', "' \n                  style='").concat(style, "'\n                  colspan='").concat(c.colspan || 1, "'\n                  rowspan='").concat(c.rowspan || 1, "'\n                >\n                  <a href='").concat(c.value, "' target='").concat(_this29.options.columns[i].openInNewTab === true ? '_blank' : '_self', "'>").concat(c.displayText || _this29.options.columns[i].linkText || c.value, "</a>\n                </td>\n              ");
-              } else if ((_this29.options.columns[i].showAsNavigatorLink === true || _this29.options.columns[i].showAsRouterLink === true) && c.value.trim() !== '') {
-                return "\n                <td \n                  data-view='".concat(c.value, "' \n                  data-row-index='").concat(_this29.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='trigger-item ").concat(_this29.options.columns[i].clickable === true ? 'clickable' : '', " ").concat(_this29.options.columns[i].classes || '', "' \n                  style='").concat(style, "'\n                  colspan='").concat(c.colspan || 1, "'\n                  rowspan='").concat(c.rowspan || 1, "'\n                >").concat(c.displayText || _this29.options.columns[i].linkText || c.value, "</td>\n              ");
+              if (_this31.options.columns[i].showAsLink === true && c.value.trim() !== '') {
+                return "\n                <td \n                  data-row-index='".concat(_this31.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='").concat(_this31.options.columns[i].classes || '', "' \n                  style='").concat(style, "'\n                  colspan='").concat(c.colspan || 1, "'\n                  rowspan='").concat(c.rowspan || 1, "'\n                >\n                  <a href='").concat(c.value, "' target='").concat(_this31.options.columns[i].openInNewTab === true ? '_blank' : '_self', "'>").concat(c.displayText || _this31.options.columns[i].linkText || c.value, "</a>\n                </td>\n              ");
+              } else if ((_this31.options.columns[i].showAsNavigatorLink === true || _this31.options.columns[i].showAsRouterLink === true) && c.value.trim() !== '') {
+                return "\n                <td \n                  data-view='".concat(c.value, "' \n                  data-row-index='").concat(_this31.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='trigger-item ").concat(_this31.options.columns[i].clickable === true ? 'clickable' : '', " ").concat(_this31.options.columns[i].classes || '', "' \n                  style='").concat(style, "'\n                  colspan='").concat(c.colspan || 1, "'\n                  rowspan='").concat(c.rowspan || 1, "'\n                >").concat(c.displayText || _this31.options.columns[i].linkText || c.value, "</td>\n              ");
               } else {
                 var info = c.value;
 
-                if (_this29.options.columns[i].showAsImage === true) {
+                if (_this31.options.columns[i].showAsImage === true) {
                   c.value = "\n                  <img src='".concat(c.value, "'>\n                ");
                 }
 
-                return "\n                <td \n                  data-info='".concat(info, "' \n                  data-row-index='").concat(_this29.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='").concat(_this29.options.columns[i].classes || '', "' \n                  style='").concat(style, "'\n                  colspan='").concat(c.colspan || 1, "'\n                  rowspan='").concat(c.rowspan || 1, "'\n                >").concat(c.value, "</td>\n              ");
+                return "\n                <td \n                  data-info='".concat(info, "' \n                  data-row-index='").concat(_this31.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='").concat(_this31.options.columns[i].classes || '', "' \n                  style='").concat(style, "'\n                  colspan='").concat(c.colspan || 1, "'\n                  rowspan='").concat(c.rowspan || 1, "'\n                >").concat(c.value, "</td>\n              ");
               }
             }
           }).join('') + '</tr>';
@@ -4931,7 +4618,7 @@ var WebsyTable2 = /*#__PURE__*/function () {
   }, {
     key: "render",
     value: function render(data) {
-      var _this30 = this;
+      var _this32 = this;
 
       if (!this.options.columns) {
         return;
@@ -4957,7 +4644,7 @@ var WebsyTable2 = /*#__PURE__*/function () {
 
       var headHTML = '<tr>' + this.options.columns.map(function (c, i) {
         if (c.show !== false) {
-          return "\n        <th ".concat(c.width ? 'style="width: ' + (c.width || 'auto') + ';"' : '', ">\n          <div class =\"tableHeader\">\n            <div class=\"leftSection\">\n              <div\n                class=\"tableHeaderField ").concat(['asc', 'desc'].indexOf(c.sort) !== -1 ? 'sortable-column' : '', "\"\n                data-index=\"").concat(i, "\"                \n                data-sort=\"").concat(c.sort, "\"                \n              >\n                ").concat(c.name, "\n              </div>\n            </div>\n            <div class=\"").concat(c.activeSort ? c.sort + ' sortOrder' : '', "\"></div>\n            ").concat(c.searchable === true ? _this30.buildSearchIcon(i) : '', "\n          </div>\n        </th>\n        ");
+          return "\n        <th ".concat(c.width ? 'style="width: ' + (c.width || 'auto') + ';"' : '', ">\n          <div class =\"tableHeader\">\n            <div class=\"leftSection\">\n              <div\n                class=\"tableHeaderField ").concat(['asc', 'desc'].indexOf(c.sort) !== -1 ? 'sortable-column' : '', "\"\n                data-index=\"").concat(i, "\"                \n                data-sort=\"").concat(c.sort, "\"                \n              >\n                ").concat(c.name, "\n              </div>\n            </div>\n            <div class=\"").concat(c.activeSort ? c.sort + ' sortOrder' : '', "\"></div>\n            ").concat(c.searchable === true ? _this32.buildSearchIcon(i) : '', "\n          </div>\n        </th>\n        ");
         }
       }).join('') + '</tr>';
       var headEl = document.getElementById("".concat(this.elementId, "_head"));
@@ -4968,7 +4655,7 @@ var WebsyTable2 = /*#__PURE__*/function () {
         var dropdownHTML = "";
         this.options.columns.forEach(function (c, i) {
           if (c.searchable && c.searchField) {
-            dropdownHTML += "\n            <div id=\"".concat(_this30.elementId, "_columnSearch_").concat(i, "\" class=\"websy-modal-dropdown\"></div>\n          ");
+            dropdownHTML += "\n            <div id=\"".concat(_this32.elementId, "_columnSearch_").concat(i, "\" class=\"websy-modal-dropdown\"></div>\n          ");
           }
         });
         dropdownEl.innerHTML = dropdownHTML;
@@ -4990,7 +4677,7 @@ var WebsyTable2 = /*#__PURE__*/function () {
 
         if (pagingEl) {
           var pages = new Array(this.options.pageCount).fill('').map(function (item, index) {
-            return "<li data-page=\"".concat(index, "\" class=\"websy-page-num ").concat(_this30.options.pageNum === index ? 'active' : '', "\">").concat(index + 1, "</li>");
+            return "<li data-page=\"".concat(index, "\" class=\"websy-page-num ").concat(_this32.options.pageNum === index ? 'active' : '', "\">").concat(index + 1, "</li>");
           });
           var startIndex = 0;
 
@@ -5077,14 +4764,14 @@ var WebsyTable2 = /*#__PURE__*/function () {
   }, {
     key: "getColumnParameters",
     value: function getColumnParameters(values) {
-      var _this31 = this;
+      var _this33 = this;
 
       var tableEl = document.getElementById("".concat(this.elementId, "_table"));
       tableEl.style.tableLayout = 'auto';
       tableEl.style.width = 'auto';
       var bodyEl = document.getElementById("".concat(this.elementId, "_body"));
       bodyEl.innerHTML = '<tr>' + values.map(function (c) {
-        return "\n      <td                 \n        style='height: ".concat(_this31.options.cellSize, "px; line-height: ").concat(_this31.options.cellSize, "px;'\n      >").concat(c.value || '&nbsp;', "</td>\n    ");
+        return "\n      <td                 \n        style='height: ".concat(_this33.options.cellSize, "px; line-height: ").concat(_this33.options.cellSize, "px;'\n      >").concat(c.value || '&nbsp;', "</td>\n    ");
       }).join('') + '</tr>'; // get height of the first data cell
 
       var cells = bodyEl.querySelectorAll("tr:first-of-type td");
@@ -5125,11 +4812,7 @@ var WebsyTable2 = /*#__PURE__*/function () {
 
 var WebsyChart = /*#__PURE__*/function () {
   function WebsyChart(elementId, options) {
-<<<<<<< HEAD
-    var _this25 = this;
-=======
-    var _this32 = this;
->>>>>>> master
+    var _this34 = this;
 
     _classCallCheck(this, WebsyChart);
 
@@ -5177,40 +4860,22 @@ var WebsyChart = /*#__PURE__*/function () {
     this.invertOverride = function (input, input2) {
       var xAxis = 'bottomAxis';
 
-<<<<<<< HEAD
-      if (_this25.options.orientation === 'horizontal') {
-        xAxis = 'leftAxis';
-      }
-
-      var width = _this25[xAxis].step();
-
-      var output;
-
-      var domain = _toConsumableArray(_this25[xAxis].domain());
-
-      if (_this25.options.orientation === 'horizontal') {
-=======
-      if (_this32.options.orientation === 'horizontal') {
+      if (_this34.options.orientation === 'horizontal') {
         xAxis = 'leftAxis';
       }
 
-      var width = _this32[xAxis].step();
+      var width = _this34[xAxis].step();
 
       var output;
 
-      var domain = _toConsumableArray(_this32[xAxis].domain());
+      var domain = _toConsumableArray(_this34[xAxis].domain());
 
-      if (_this32.options.orientation === 'horizontal') {
->>>>>>> master
+      if (_this34.options.orientation === 'horizontal') {
         domain = domain.reverse();
       }
 
       for (var j = 0; j < domain.length; j++) {
-<<<<<<< HEAD
-        var breakA = _this25[xAxis](domain[j]) - width / 2;
-=======
-        var breakA = _this32[xAxis](domain[j]) - width / 2;
->>>>>>> master
+        var breakA = _this34[xAxis](domain[j]) - width / 2;
         var breakB = breakA + width;
 
         if (input > breakA && input <= breakB) {
@@ -5310,17 +4975,10 @@ var WebsyChart = /*#__PURE__*/function () {
   }, {
     key: "handleEventMouseMove",
     value: function handleEventMouseMove(event, d) {
-<<<<<<< HEAD
-      var _this26 = this;
-
-      var bisectDate = d3.bisector(function (d) {
-        return _this26.parseX(d.x.value);
-=======
-      var _this33 = this;
+      var _this35 = this;
 
       var bisectDate = d3.bisector(function (d) {
-        return _this33.parseX(d.x.value);
->>>>>>> master
+        return _this35.parseX(d.x.value);
       }).left;
 
       if (this.options.showTrackingLine === true && d3.pointer(event)) {
@@ -5359,13 +5017,8 @@ var WebsyChart = /*#__PURE__*/function () {
         }
 
         this.options.data.series.forEach(function (s) {
-<<<<<<< HEAD
-          if (_this26.options.data[xData].scale !== 'Time') {
-            xPoint = _this26[xAxis](_this26.parseX(xLabel));
-=======
-          if (_this33.options.data[xData].scale !== 'Time') {
-            xPoint = _this33[xAxis](_this33.parseX(xLabel));
->>>>>>> master
+          if (_this35.options.data[xData].scale !== 'Time') {
+            xPoint = _this35[xAxis](_this35.parseX(xLabel));
             s.data.forEach(function (d) {
               if (d.x.value === xLabel) {
                 if (!d.y.color) {
@@ -5380,21 +5033,13 @@ var WebsyChart = /*#__PURE__*/function () {
             var pointA = s.data[index - 1];
             var pointB = s.data[index];
 
-<<<<<<< HEAD
-            if (_this26.options.orientation === 'horizontal') {
-=======
-            if (_this33.options.orientation === 'horizontal') {
->>>>>>> master
+            if (_this35.options.orientation === 'horizontal') {
               pointA = _toConsumableArray(s.data).reverse()[index - 1];
               pointB = _toConsumableArray(s.data).reverse()[index];
             }
 
             if (pointA && !pointB) {
-<<<<<<< HEAD
-              xPoint = _this26[xAxis](_this26.parseX(pointA.x.value));
-=======
-              xPoint = _this33[xAxis](_this33.parseX(pointA.x.value));
->>>>>>> master
+              xPoint = _this35[xAxis](_this35.parseX(pointA.x.value));
               tooltipTitle = pointA.x.value;
 
               if (!pointA.y.color) {
@@ -5404,20 +5049,12 @@ var WebsyChart = /*#__PURE__*/function () {
               tooltipData.push(pointA.y);
 
               if (typeof pointA.x.value.getTime !== 'undefined') {
-<<<<<<< HEAD
-                tooltipTitle = d3.timeFormat(_this26.options.dateFormat || _this26.options.calculatedTimeFormatPattern)(pointA.x.value);
-=======
-                tooltipTitle = d3.timeFormat(_this33.options.dateFormat || _this33.options.calculatedTimeFormatPattern)(pointA.x.value);
->>>>>>> master
+                tooltipTitle = d3.timeFormat(_this35.options.dateFormat || _this35.options.calculatedTimeFormatPattern)(pointA.x.value);
               }
             }
 
             if (pointB && !pointA) {
-<<<<<<< HEAD
-              xPoint = _this26[xAxis](_this26.parseX(pointB.x.value));
-=======
-              xPoint = _this33[xAxis](_this33.parseX(pointB.x.value));
->>>>>>> master
+              xPoint = _this35[xAxis](_this35.parseX(pointB.x.value));
               tooltipTitle = pointB.x.value;
 
               if (!pointB.y.color) {
@@ -5427,24 +5064,14 @@ var WebsyChart = /*#__PURE__*/function () {
               tooltipData.push(pointB.y);
 
               if (typeof pointB.x.value.getTime !== 'undefined') {
-<<<<<<< HEAD
-                tooltipTitle = d3.timeFormat(_this26.options.dateFormat || _this26.options.calculatedTimeFormatPattern)(pointB.x.value);
-=======
-                tooltipTitle = d3.timeFormat(_this33.options.dateFormat || _this33.options.calculatedTimeFormatPattern)(pointB.x.value);
->>>>>>> master
+                tooltipTitle = d3.timeFormat(_this35.options.dateFormat || _this35.options.calculatedTimeFormatPattern)(pointB.x.value);
               }
             }
 
             if (pointA && pointB) {
-<<<<<<< HEAD
-              var d0 = _this26[xAxis](_this26.parseX(pointA.x.value));
+              var d0 = _this35[xAxis](_this35.parseX(pointA.x.value));
 
-              var d1 = _this26[xAxis](_this26.parseX(pointB.x.value));
-=======
-              var d0 = _this33[xAxis](_this33.parseX(pointA.x.value));
-
-              var d1 = _this33[xAxis](_this33.parseX(pointB.x.value));
->>>>>>> master
+              var d1 = _this35[xAxis](_this35.parseX(pointB.x.value));
 
               var mid = Math.abs(d0 - d1) / 2;
 
@@ -5453,11 +5080,7 @@ var WebsyChart = /*#__PURE__*/function () {
                 tooltipTitle = pointB.x.value;
 
                 if (typeof pointB.x.value.getTime !== 'undefined') {
-<<<<<<< HEAD
-                  tooltipTitle = d3.timeFormat(_this26.options.dateFormat || _this26.options.calculatedTimeFormatPattern)(pointB.x.value);
-=======
-                  tooltipTitle = d3.timeFormat(_this33.options.dateFormat || _this33.options.calculatedTimeFormatPattern)(pointB.x.value);
->>>>>>> master
+                  tooltipTitle = d3.timeFormat(_this35.options.dateFormat || _this35.options.calculatedTimeFormatPattern)(pointB.x.value);
                 }
 
                 if (!pointB.y.color) {
@@ -5470,11 +5093,7 @@ var WebsyChart = /*#__PURE__*/function () {
                 tooltipTitle = pointA.x.value;
 
                 if (typeof pointB.x.value.getTime !== 'undefined') {
-<<<<<<< HEAD
-                  tooltipTitle = d3.timeFormat(_this26.options.dateFormat || _this26.options.calculatedTimeFormatPattern)(pointB.x.value);
-=======
-                  tooltipTitle = d3.timeFormat(_this33.options.dateFormat || _this33.options.calculatedTimeFormatPattern)(pointB.x.value);
->>>>>>> master
+                  tooltipTitle = d3.timeFormat(_this35.options.dateFormat || _this35.options.calculatedTimeFormatPattern)(pointB.x.value);
                 }
 
                 if (!pointA.y.color) {
@@ -5579,11 +5198,7 @@ var WebsyChart = /*#__PURE__*/function () {
   }, {
     key: "render",
     value: function render(options) {
-<<<<<<< HEAD
-      var _this27 = this;
-=======
-      var _this34 = this;
->>>>>>> master
+      var _this36 = this;
 
       /* global d3 options */
       if (typeof options !== 'undefined') {
@@ -5652,11 +5267,7 @@ var WebsyChart = /*#__PURE__*/function () {
             var legendData = this.options.data.series.map(function (s, i) {
               return {
                 value: s.label || s.key,
-<<<<<<< HEAD
-                color: s.color || _this27.options.colors[i % _this27.options.colors.length]
-=======
-                color: s.color || _this34.options.colors[i % _this34.options.colors.length]
->>>>>>> master
+                color: s.color || _this36.options.colors[i % _this36.options.colors.length]
               };
             });
 
@@ -5895,11 +5506,7 @@ var WebsyChart = /*#__PURE__*/function () {
 
             if (this.options.data.bottom.formatter) {
               bAxisFunc.tickFormat(function (d) {
-<<<<<<< HEAD
-                return _this27.options.data.bottom.formatter(d);
-=======
-                return _this34.options.data.bottom.formatter(d);
->>>>>>> master
+                return _this36.options.data.bottom.formatter(d);
               });
             }
 
@@ -5926,13 +5533,8 @@ var WebsyChart = /*#__PURE__*/function () {
 
           if (this.options.margin.axisLeft > 0) {
             this.leftAxisLayer.call(d3.axisLeft(this.leftAxis).ticks(this.options.data.left.ticks || 5).tickFormat(function (d) {
-<<<<<<< HEAD
-              if (_this27.options.data.left.formatter) {
-                d = _this27.options.data.left.formatter(d);
-=======
-              if (_this34.options.data.left.formatter) {
-                d = _this34.options.data.left.formatter(d);
->>>>>>> master
+              if (_this36.options.data.left.formatter) {
+                d = _this36.options.data.left.formatter(d);
               }
 
               return d;
@@ -5969,13 +5571,8 @@ var WebsyChart = /*#__PURE__*/function () {
 
             if (this.options.margin.axisRight > 0 && (this.options.data.right.min !== 0 || this.options.data.right.max !== 0)) {
               this.rightAxisLayer.call(d3.axisRight(this.rightAxis).ticks(this.options.data.left.ticks || 5).tickFormat(function (d) {
-<<<<<<< HEAD
-                if (_this27.options.data.right.formatter) {
-                  d = _this27.options.data.right.formatter(d);
-=======
-                if (_this34.options.data.right.formatter) {
-                  d = _this34.options.data.right.formatter(d);
->>>>>>> master
+                if (_this36.options.data.right.formatter) {
+                  d = _this36.options.data.right.formatter(d);
                 }
 
                 return d;
@@ -6001,29 +5598,16 @@ var WebsyChart = /*#__PURE__*/function () {
 
           this.options.data.series.forEach(function (series, index) {
             if (!series.key) {
-<<<<<<< HEAD
-              series.key = _this27.createIdentity();
-            }
-
-            if (!series.color) {
-              series.color = _this27.options.colors[index % _this27.options.colors.length];
-            }
-
-            _this27["render".concat(series.type || 'bar')](series, index);
-
-            _this27.renderLabels(series, index);
-=======
-              series.key = _this34.createIdentity();
+              series.key = _this36.createIdentity();
             }
 
             if (!series.color) {
-              series.color = _this34.options.colors[index % _this34.options.colors.length];
+              series.color = _this36.options.colors[index % _this36.options.colors.length];
             }
 
-            _this34["render".concat(series.type || 'bar')](series, index);
+            _this36["render".concat(series.type || 'bar')](series, index);
 
-            _this34.renderLabels(series, index);
->>>>>>> master
+            _this36.renderLabels(series, index);
           });
         }
       }
@@ -6031,30 +5615,17 @@ var WebsyChart = /*#__PURE__*/function () {
   }, {
     key: "renderarea",
     value: function renderarea(series, index) {
-<<<<<<< HEAD
-      var _this28 = this;
-=======
-      var _this35 = this;
->>>>>>> master
+      var _this37 = this;
 
       /* global d3 series index */
       var drawArea = function drawArea(xAxis, yAxis, curveStyle) {
         return d3.area().x(function (d) {
-<<<<<<< HEAD
-          return _this28[xAxis](_this28.parseX(d.x.value));
-        }).y0(function (d) {
-          return _this28[yAxis](0);
-        }).y1(function (d) {
-          return _this28[yAxis](isNaN(d.y.value) ? 0 : d.y.value);
-        }).curve(d3[curveStyle || _this28.options.curveStyle]);
-=======
-          return _this35[xAxis](_this35.parseX(d.x.value));
+          return _this37[xAxis](_this37.parseX(d.x.value));
         }).y0(function (d) {
-          return _this35[yAxis](0);
+          return _this37[yAxis](0);
         }).y1(function (d) {
-          return _this35[yAxis](isNaN(d.y.value) ? 0 : d.y.value);
-        }).curve(d3[curveStyle || _this35.options.curveStyle]);
->>>>>>> master
+          return _this37[yAxis](isNaN(d.y.value) ? 0 : d.y.value);
+        }).curve(d3[curveStyle || _this37.options.curveStyle]);
       };
 
       var xAxis = 'bottomAxis';
@@ -6227,26 +5798,15 @@ var WebsyChart = /*#__PURE__*/function () {
   }, {
     key: "renderline",
     value: function renderline(series, index) {
-<<<<<<< HEAD
-      var _this29 = this;
-=======
-      var _this36 = this;
->>>>>>> master
+      var _this38 = this;
 
       /* global series index d3 */
       var drawLine = function drawLine(xAxis, yAxis, curveStyle) {
         return d3.line().x(function (d) {
-<<<<<<< HEAD
-          return _this29[xAxis](_this29.parseX(d.x.value));
-        }).y(function (d) {
-          return _this29[yAxis](isNaN(d.y.value) ? 0 : d.y.value);
-        }).curve(d3[curveStyle || _this29.options.curveStyle]);
-=======
-          return _this36[xAxis](_this36.parseX(d.x.value));
+          return _this38[xAxis](_this38.parseX(d.x.value));
         }).y(function (d) {
-          return _this36[yAxis](isNaN(d.y.value) ? 0 : d.y.value);
-        }).curve(d3[curveStyle || _this36.options.curveStyle]);
->>>>>>> master
+          return _this38[yAxis](isNaN(d.y.value) ? 0 : d.y.value);
+        }).curve(d3[curveStyle || _this38.options.curveStyle]);
       };
 
       var xAxis = 'bottomAxis';
@@ -6284,22 +5844,14 @@ var WebsyChart = /*#__PURE__*/function () {
   }, {
     key: "rendersymbol",
     value: function rendersymbol(series, index) {
-<<<<<<< HEAD
-      var _this30 = this;
-=======
-      var _this37 = this;
->>>>>>> master
+      var _this39 = this;
 
       /* global d3 series index series.key */
       var drawSymbol = function drawSymbol(size) {
         return d3.symbol() // .type(d => {
         //   return d3.symbols[0]
         // })
-<<<<<<< HEAD
-        .size(size || _this30.options.symbolSize);
-=======
-        .size(size || _this37.options.symbolSize);
->>>>>>> master
+        .size(size || _this39.options.symbolSize);
       };
 
       var xAxis = 'bottomAxis';
@@ -6317,11 +5869,7 @@ var WebsyChart = /*#__PURE__*/function () {
       symbols.attr('d', function (d) {
         return drawSymbol(d.y.size || series.symbolSize)(d);
       }).transition(this.transition).attr('fill', 'white').attr('stroke', series.color).attr('transform', function (d) {
-<<<<<<< HEAD
-        return "translate(".concat(_this30[xAxis](_this30.parseX(d.x.value)), ", ").concat(_this30[yAxis](isNaN(d.y.value) ? 0 : d.y.value), ")");
-=======
-        return "translate(".concat(_this37[xAxis](_this37.parseX(d.x.value)), ", ").concat(_this37[yAxis](isNaN(d.y.value) ? 0 : d.y.value), ")");
->>>>>>> master
+        return "translate(".concat(_this39[xAxis](_this39.parseX(d.x.value)), ", ").concat(_this39[yAxis](isNaN(d.y.value) ? 0 : d.y.value), ")");
       }); // Enter
 
       symbols.enter().append('path').attr('d', function (d) {
@@ -6330,11 +5878,7 @@ var WebsyChart = /*#__PURE__*/function () {
       .attr('fill', 'white').attr('stroke', series.color).attr('class', function (d) {
         return "symbol symbol_".concat(series.key);
       }).attr('transform', function (d) {
-<<<<<<< HEAD
-        return "translate(".concat(_this30[xAxis](_this30.parseX(d.x.value)), ", ").concat(_this30[yAxis](isNaN(d.y.value) ? 0 : d.y.value), ")");
-=======
-        return "translate(".concat(_this37[xAxis](_this37.parseX(d.x.value)), ", ").concat(_this37[yAxis](isNaN(d.y.value) ? 0 : d.y.value), ")");
->>>>>>> master
+        return "translate(".concat(_this39[xAxis](_this39.parseX(d.x.value)), ", ").concat(_this39[yAxis](isNaN(d.y.value) ? 0 : d.y.value), ")");
       });
     }
   }, {
@@ -6489,11 +6033,7 @@ var WebsyLegend = /*#__PURE__*/function () {
   }, {
     key: "resize",
     value: function resize() {
-<<<<<<< HEAD
-      var _this31 = this;
-=======
-      var _this38 = this;
->>>>>>> master
+      var _this40 = this;
 
       var el = document.getElementById(this.elementId);
 
@@ -6506,11 +6046,7 @@ var WebsyLegend = /*#__PURE__*/function () {
         // }
         var html = "\n        <div class='text-".concat(this.options.align, "'>\n      ");
         html += this._data.map(function (d, i) {
-<<<<<<< HEAD
-          return _this31.getLegendItemHTML(d);
-=======
-          return _this38.getLegendItemHTML(d);
->>>>>>> master
+          return _this40.getLegendItemHTML(d);
         }).join('');
         html += "\n        <div>\n      ";
         el.innerHTML = html;
@@ -6683,11 +6219,7 @@ var WebsyMap = /*#__PURE__*/function () {
   }, {
     key: "render",
     value: function render() {
-<<<<<<< HEAD
-      var _this32 = this;
-=======
-      var _this39 = this;
->>>>>>> master
+      var _this41 = this;
 
       var mapEl = document.getElementById("".concat(this.elementId, "_map"));
       var legendEl = document.getElementById("".concat(this.elementId, "_map"));
@@ -6696,11 +6228,7 @@ var WebsyMap = /*#__PURE__*/function () {
         var legendData = this.options.data.polygons.map(function (s, i) {
           return {
             value: s.label || s.key,
-<<<<<<< HEAD
-            color: s.color || _this32.options.colors[i % _this32.options.colors.length]
-=======
-            color: s.color || _this39.options.colors[i % _this39.options.colors.length]
->>>>>>> master
+            color: s.color || _this41.options.colors[i % _this41.options.colors.length]
           };
         });
         var longestValue = legendData.map(function (s) {
@@ -6764,11 +6292,7 @@ var WebsyMap = /*#__PURE__*/function () {
 
       if (this.polygons) {
         this.polygons.forEach(function (p) {
-<<<<<<< HEAD
-          return _this32.map.removeLayer(p);
-=======
-          return _this39.map.removeLayer(p);
->>>>>>> master
+          return _this41.map.removeLayer(p);
         });
       }
 
@@ -6826,30 +6350,18 @@ var WebsyMap = /*#__PURE__*/function () {
           }
 
           if (!p.options.color) {
-<<<<<<< HEAD
-            p.options.color = _this32.options.colors[i % _this32.options.colors.length];
-=======
-            p.options.color = _this39.options.colors[i % _this39.options.colors.length];
->>>>>>> master
+            p.options.color = _this41.options.colors[i % _this41.options.colors.length];
           }
 
           var pol = L.polygon(p.data.map(function (c) {
             return c.map(function (d) {
               return [d.Latitude, d.Longitude];
             });
-<<<<<<< HEAD
-          }), p.options).addTo(_this32.map);
-
-          _this32.polygons.push(pol);
-
-          _this32.map.fitBounds(pol.getBounds());
-=======
-          }), p.options).addTo(_this39.map);
+          }), p.options).addTo(_this41.map);
 
-          _this39.polygons.push(pol);
+          _this41.polygons.push(pol);
 
-          _this39.map.fitBounds(pol.getBounds());
->>>>>>> master
+          _this41.map.fitBounds(pol.getBounds());
         });
       } // if (this.data.markers.length > 0) {            
       //   el.classList.remove('hidden')