Merge branch 'replace-frontend-arrow-functions-with-old-style-function' into 'master'

replace arrow functions on frontend with old style function

See merge request saburly/marketalarm/web!71

app/views/location.ejs

@@ -42,7 +42,7 @@
   function locateMe() {
     if (navigator.geolocation) {
 
-      const onLocationSuccess = (position) => {
+      function onLocationSuccess (position) {
         const coordinates = position && position.coords ? position.coords : null;
         if (coordinates){
           const longitude = coordinates.longitude || null;
@@ -53,7 +53,7 @@
             map.setZoom(16);
           }
         }
-      };
+      }
 
       navigator.geolocation.getCurrentPosition(onLocationSuccess);
     }
@@ -162,8 +162,8 @@
     input.attachEvent = addEventListenerWrapper
   }
 
-  $(document).ready(() => {
+  $(document).ready(function() {
-    $("#submit").click(() => {
+    $("#submit").click(function() {
       const mapBounds = map.getBounds();
 
       $("#north").val(mapBounds.getNorthEast().lat());
@@ -178,4 +178,4 @@
   });
 </script>
 <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAna8ohfV2HBMcxGk_29vqxU5Z_bDickqg&language=bs&libraries=places&callback=initMap" async
-  defer></script>
+  defer></script>

app/views/partials/range.ejs

@@ -1,53 +0,0 @@
-<form method="POST" id="form-range">
-
-  <div class="row center-align no-ui-slider centered-element-small" id="slider"></div>
-
-  <div class="col s6 push-s3 centered-element-small">
-    <a id="btnsubmit" href="#" class="next-center-button waves-effect waves-light btn">
-      Dalje
-    </a>
-  </div>
-
-  <input type="hidden" name="from" id="from" />
-  <input type="hidden" name="to" id="to" />
-</form>
-
-<script>
-
-  $(document).ready(() => {
-
-    var slider = document.getElementById('slider');
-
-    const unitFormat = wNumb({
-        decimals: 3,
-        thousand: '.',
-        suffix: '<%= unit %>'
-      })
-
-
-    noUiSlider.create(slider, {
-      start: [<%= rangeFrom.value %>, <%= rangeTo.value %>],
-      connect: true,
-      tooltips: true,
-      step: <%= rangeFrom.step %>,
-      range: {
-        'min': <%= rangeFrom.min %>,
-        'max': <%= rangeTo.max %>
-    },
-      format: unitFormat
-    });
-
-
-    $("#btnsubmit").click(() => {
-      const sliderValues = slider.noUiSlider.get();
-      
-      $("#from").val(unitFormat.from(sliderValues[0]));
-      $("#to").val(unitFormat.from(sliderValues[1]));
-
-      $("#form-range").submit();
-      // });
-
-    });
-  });
-
-</script>

app/views/queryReview.ejs

@@ -68,8 +68,8 @@
 
 <script>
 
- $(document).ready( () => {
+ $(document).ready(function() {
-   $("#submit").click( () => {
+   $("#submit").click(function() {
        const simpleEmailRegex = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
        const email = $("#email").val();
        const confirmEmail = $("#confirmEmail").val();
@@ -83,7 +83,7 @@
            $("#submit").attr("disabled", true);
            $("#form-queryreview").submit();
        }else{
-           $("#error-label-email").text("Greška ! Unešeni emailovi nisu isti");
+           $("#error-label-email").text("Greška ! Unešeni email nije validan");
        }
    });
  });

app/views/realEstateFilters.ejs

@@ -66,19 +66,19 @@
 </form>
 
 <script>
-  $(document).ready(() => {
+  $(document).ready(function() {
-    const priceSliderOptions = {...<%- priceSliderOptions %>};
+    const priceSliderOptions = <%- priceSliderOptions %>;
-    const sizeSliderOptions = {...<%- sizeSliderOptions %>};
+    const sizeSliderOptions = <%- sizeSliderOptions %>;
     const priceStep = priceSliderOptions.step;
     const sizeStep = sizeSliderOptions.step;
     delete priceSliderOptions.step;
     delete sizeSliderOptions.step;
 
-    const updatePriceInputs = (values, handle, unencoded) => {
+    function updatePriceInputs(values, handle, unencoded) {
       $("#priceMin").val(Math.round(unencoded[0]/priceStep)*priceStep);
       $("#priceMax").val(Math.round(unencoded[1]/priceStep)*priceStep);
     }
-    const updateSizeInputs = (values, handle, unencoded) => {
+    function updateSizeInputs(values, handle, unencoded) {
       $("#sizeMin").val(Math.round(unencoded[0]/sizeStep)*sizeStep);
       $("#sizeMax").val(Math.round(unencoded[1]/sizeStep)*sizeStep);
     }
@@ -92,7 +92,7 @@
     priceSliderObject.on('slide', updatePriceInputs);
     sizeSliderObject.on('slide', updateSizeInputs);
 
-    const priceMinChangeHandler = (element) => {
+    function priceMinChangeHandler(element) {
       if (element && element.currentTarget && element.currentTarget.value){
         const currentValues = priceSliderObject.get();
         const newValue = element.currentTarget.value;
@@ -101,7 +101,7 @@
         $("#priceMin").val(Math.round(priceSliderObject.get()[0]));
       }
     }
-    const priceMaxChangeHandler = (element) => {
+    function priceMaxChangeHandler(element) {
       if (element && element.currentTarget && element.currentTarget.value){
         const newValue = element.currentTarget.value;
         priceSliderObject.set([null, newValue]);
@@ -113,7 +113,7 @@
     $("#priceMin").change(priceMinChangeHandler);
     $("#priceMax").change(priceMaxChangeHandler);
 
-    const sizeMinChangeHandler = (element) => {
+    function sizeMinChangeHandler(element) {
       if (element && element.currentTarget && element.currentTarget.value){
         const currentValues = sizeSliderObject.get();
         const newValue = element.currentTarget.value;
@@ -122,7 +122,7 @@
         $("#sizeMin").val(Math.round(sizeSliderObject.get()[0]));
       }
     }
-    const sizeMaxChangeHandler = (element) => {
+    function sizeMaxChangeHandler(element) {
       if (element && element.currentTarget && element.currentTarget.value){
         const newValue = element.currentTarget.value;
         sizeSliderObject.set([null, newValue]);
@@ -135,11 +135,11 @@
     $("#sizeMax").change(sizeMaxChangeHandler);
 
     <% if(hasGardenSize) { %>
-    const gardenSizeSliderOptions = {...<%- gardenSizeSliderOptions %>};
+    const gardenSizeSliderOptions = <%- gardenSizeSliderOptions %>;
     const gardenSizeStep = gardenSizeSliderOptions.step;
     delete gardenSizeSliderOptions.step;
 
-    const updateGardenSizeInputs = (values, handle, unencoded) => {
+    function updateGardenSizeInputs(values, handle, unencoded) {
       $("#gardenSizeMin").val(Math.round(unencoded[0]/gardenSizeStep)*gardenSizeStep);
       $("#gardenSizeMax").val(Math.round(unencoded[1]/gardenSizeStep)*gardenSizeStep);
     }
@@ -147,7 +147,7 @@
     const gardenSizeSlider = document.getElementById("gardenSizeFilter");
     const gardenSizeSliderObject = noUiSlider.create(gardenSizeSlider, gardenSizeSliderOptions);
     gardenSizeSliderObject.on('slide', updateGardenSizeInputs);
-    const gardenSizeMinChangeHandler = (element) => {
+    function gardenSizeMinChangeHandler(element) {
       if (element && element.currentTarget && element.currentTarget.value){
         const currentValues = gardenSizeSliderObject.get();
         const newValue = element.currentTarget.value;
@@ -156,7 +156,7 @@
         $("#gardenSizeMin").val(Math.round(gardenSizeSliderObject.get()[0]));
       }
     }
-    const gardenSizeMaxChangeHandler = (element) => {
+    function gardenSizeMaxChangeHandler(element) {
       if (element && element.currentTarget && element.currentTarget.value){
         const newValue = element.currentTarget.value;
         gardenSizeSliderObject.set([null, newValue]);
@@ -169,7 +169,7 @@
     $("#gardenSizeMax").change("step", gardenSizeMaxChangeHandler);
     <% } %>
 
-    $("#submit").click(() => {
+    $("#submit").click(function() {
       const priceFilterValues = priceSlider.noUiSlider.get();
       $("#priceFilterMin").val(priceFilterValues[0]);
       $("#priceFilterMax").val(priceFilterValues[1]);

app/views/redirect.ejs

@@ -20,7 +20,7 @@
     </h6>
 </div>
 <script>
-    window.onload = () => {
+    window.onload = function() {
         document.getElementById('realEstateUrl').click();
     }
 </script>