Merge pull request #3671 from Laravel-Backpack/fix-conflicting-code

Add back IE support (fix conflicting code)

Author: tabacitu

src/resources/views/base/inc/alerts.blade.php

@@ -19,17 +19,25 @@
                 ? JSON.parse(localStorage.getItem('backpack_alerts')) : {};
 
             // merge both php alerts and localstorage alerts
-            Object.entries($alerts_from_php).forEach(([type, messages]) => {
-                if(typeof $alerts_from_localstorage[type] !== 'undefined') {
-                    $alerts_from_localstorage[type].push(...messages);
+            Object.entries($alerts_from_php).forEach(function(type) {
+                if(typeof $alerts_from_localstorage[type[0]] !== 'undefined') {
+                    type[1].forEach(function(msg) {
+                        $alerts_from_localstorage[type[0]].push(msg);
+                    });
                 } else {
-                    $alerts_from_localstorage[type] = messages;
+                    $alerts_from_localstorage[type[0]] = type[1];
                 }
             });
 
             for (var type in $alerts_from_localstorage) {
                 let messages = new Set($alerts_from_localstorage[type]);
-                messages.forEach(text => new Noty({type, text}).show());
+
+                messages.forEach(function(text) {
+                    let alert = {};
+                    alert['type'] = type;
+                    alert['text'] = text;
+                    new Noty(alert).show()
+            });
             }
 
             // in the end, remove backpack alerts from localStorage

src/resources/views/base/inc/scripts.blade.php

@@ -17,6 +17,38 @@
     // To make Pace works on Ajax calls
     $(document).ajaxStart(function() { Pace.restart(); });
 
+    // polyfill for `startsWith` from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/startsWith
+    if (!String.prototype.startsWith) {
+    Object.defineProperty(String.prototype, 'startsWith', {
+        value: function(search, rawPos) {
+            var pos = rawPos > 0 ? rawPos|0 : 0;
+            return this.substring(pos, pos + search.length) === search;
+        }
+    });
+    }
+
+
+
+    // polyfill for entries and keys from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/entries#polyfill
+    if (!Object.keys) Object.keys = function(o) {
+        if (o !== Object(o))
+            throw new TypeError('Object.keys called on a non-object');
+        var k=[],p;
+        for (p in o) if (Object.prototype.hasOwnProperty.call(o,p)) k.push(p);
+        return k;
+    }
+
+    if (!Object.entries) {
+        Object.entries = function( obj ){
+            var ownProps = Object.keys( obj ),
+                i = ownProps.length,
+                resArray = new Array(i); // preallocate the Array
+            while (i--)
+            resArray[i] = [ownProps[i], obj[ownProps[i]]];
+            return resArray;
+        };
+    }
+
     // Ajax calls should always have the CSRF token attached to them, otherwise they won't work
     $.ajaxSetup({
         headers: {
@@ -30,4 +62,4 @@
     $('.nav-tabs a').on('shown.bs.tab', function (e) {
         location.hash = e.target.hash.replace("#tab_", "#");
     });
-</script>
+</script>

src/resources/views/base/inc/sidebar.blade.php

@@ -25,7 +25,9 @@
   <script type="text/javascript">
     // Save default sidebar class
     let sidebarClass = (document.body.className.match(/sidebar-(sm|md|lg|xl)-show/) || ['sidebar-lg-show'])[0];
-    let sidebarTransition = value => document.querySelector('.app-body > .sidebar').style.transition = value || '';
+    let sidebarTransition = function(value) {
+        document.querySelector('.app-body > .sidebar').style.transition = value || '';
+    };
 
     // Recover sidebar state
     let sessionState = sessionStorage.getItem('sidebar-collapsed');
@@ -44,11 +46,11 @@
 @push('after_scripts')
   <script>
       // Store sidebar state
-      document.querySelectorAll('.sidebar-toggler').forEach(toggler => 
-        toggler.addEventListener('click', () => 
+      document.querySelectorAll('.sidebar-toggler').forEach(function(toggler) {
+        toggler.addEventListener('click', function() {
           sessionStorage.setItem('sidebar-collapsed', Number(!document.body.classList.contains(sidebarClass)))
-        )
-      );
+        })
+      });
       // Set active state on menu element
       var full_url = "{{ Request::fullUrl() }}";
       var $navLinks = $(".sidebar-nav li a, .app-header li a");
@@ -73,7 +75,7 @@ function() { return $(this).attr('href') === full_url; }
           });
       }
 
-      // for the found links that can be considered current, make sure 
+      // for the found links that can be considered current, make sure
       // - the parent item is open
       $curentPageLink.parents('li').addClass('open');
       // - the actual element is active

src/resources/views/crud/fields/image.blade.php

@@ -238,7 +238,7 @@ function bpFieldInitCropperImageElement(element) {
                         const maxImageSize = {{ $max_image_size_in_bytes }};
                         if(maxImageSize > 0 && file.size > maxImageSize) {
 
-                            alert(`Please pick an image smaller than ${maxImageSize} bytes.`);
+                            alert('Please pick an image smaller than '+maxImageSize+'  bytes.');
                         } else if (/^image\/\w+$/.test(file.type)) {
 
                             fileReader.readAsDataURL(file);

src/resources/views/crud/fields/relationship/fetch.blade.php

@@ -155,8 +155,8 @@
                     $value = processItemText(result[0], $relatedAttribute);
                 }
 
-                $pair = { [$relatedKeyName] : $key, [$relatedAttribute] : $value}
-                $return = {...$return, ...$pair};
+                $return[$relatedKeyName] = $key;
+                $return[$relatedAttribute] = $value;
 
                 $(element).attr('data-current-value', JSON.stringify($return));
                 resolve($return);
@@ -225,7 +225,7 @@ function bpFieldInitFetchElement(element) {
             $selectedOptions != [])
         {
             var optionsForSelect = [];
-            FetchAjaxFetchSelectedEntry(element).then(result => {
+            FetchAjaxFetchSelectedEntry(element).then(function(result) {
                 result.forEach(function(item) {
                     $itemText = processItemText(item, $fieldAttribute);
                     $itemValue = item[$connectedEntityKeyName];
@@ -255,17 +255,20 @@ function bpFieldInitFetchElement(element) {
         //we reselect the previously selected options if any.
         var selectedOptions = [];
 
-        for (const [key, value] of Object.entries($currentValue)) {
-            selectedOptions.push(key);
-            var $option = new Option(value, key);
+        var $currentValue = $item ? $value : {};
+
+        //we reselect the previously selected options if any.
+        Object.entries($currentValue).forEach(function(option) {
+            selectedOptions.push(option[0]);
+            var $option = new Option(option[1], option[0]);
             $(element).append($option);
-        }
+        });
 
         $(element).val(selectedOptions);
 
 
         if (!$allows_null && $item === false && $selectedOptions == null) {
-            fetchDefaultEntry(element).then(result => {
+            fetchDefaultEntry(element).then(function(result) {
                 var $item = JSON.parse(element.attr('data-current-value'));
                 $(element).append('<option value="'+$item[$modelKey]+'">'+$item[$fieldAttribute]+'</option>');
                 $(element).val($item[$modelKey]);
@@ -349,7 +352,7 @@ function bpFieldInitFetchElement(element) {
                 var $dependency = $dependencies[i];
                 //if element does not have a custom-selector attribute we use the name attribute
                 if(typeof element.attr('data-custom-selector') == 'undefined') {
-                    form.find(`[name="${$dependency}"], [name="${$dependency}[]"]`).change(function(el) {
+                    form.find('[name="'+$dependency+'"], [name="'+$dependency+'[]"]').change(function(el) {
                             $(element.find('option:not([value=""])')).remove();
                             element.val(null).trigger("change");
                     });
@@ -381,7 +384,7 @@ function processItemText(item, $fieldAttribute) {
 
             // try to retreive the item in app language; then fallback language; then first entry; if nothing found empty translation string
             return typeof $itemField === 'object' && $itemField !== null
-                ? $itemField[$appLang] ?? $itemField[$appLangFallback] ?? Object.values($itemField)[0] ?? $emptyTranslation
+                ? $itemField[$appLang] ? $itemField[$appLang] : $itemField[$appLangFallback] ? $itemField[$appLangFallback] : Object.values($itemField)[0] ? Object.values($itemField)[0] : $emptyTranslation
                 : $itemField;
         }
     }