]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commitdiff
Merge branch 'refs/heads/develop' into feature_fomichev_erp-387_main_image_matrix_bou...
authorfomichev <vladimir.fomichev@erp-flowers.ru>
Fri, 28 Mar 2025 08:57:49 +0000 (11:57 +0300)
committerfomichev <vladimir.fomichev@erp-flowers.ru>
Fri, 28 Mar 2025 08:57:49 +0000 (11:57 +0300)
# Conflicts:
# erp24/web/js/bouquet/bouquet.js

1  2 
erp24/views/bouquet/_form.php
erp24/web/js/bouquet/bouquet.js

Simple merge
index d79e0b91698c598f72c2fcbcf7798cf84f6f22c4,96f4f4436d93d6273a1aab4dcba07c6f25533e79..316b0a2e0d032fe0863d1019cae21ae8bd478207
@@@ -6,16 -6,36 +6,44 @@@ document.addEventListener('DOMContentLo
              this.play();
          });
      });
 +
 +    $('#bouquet-file-upload').on('filesorted', function(event, params) {
 +        var order = params.stack.map(function(file) {
 +            return file.key;
 +        });
 +        //console.log(JSON.stringify(order));
 +        $('#photo-order').val(JSON.stringify(order));
 +    });
+     console.log('check');
+     function cleanDropZoneText(selector) {
+         const dropZone = document.querySelector(selector);
+         if (dropZone && dropZone.innerHTML.includes('(Или щёлкните, чтобы выбрать файл)')) {
+             dropZone.innerHTML = dropZone.innerHTML.replace('(Или щёлкните, чтобы выбрать файл)', '');
+             return true;
+         }
+         return false;
+     }
+     function observeAndClean(selector) {
+         if (cleanDropZoneText(selector)) {
+             return;
+         }
+         const observer = new MutationObserver((mutations, obs) => {
+             if (cleanDropZoneText(selector)) {
+                 obs.disconnect();
+             }
+         });
+         observer.observe(document.body, {
+             childList: true,
+             subtree: true
+         });
+     }
+     observeAndClean('.field-video-file-upload .file-drop-zone-title');
+     observeAndClean('.field-presentation-file-upload .file-drop-zone-title');
  });
  
  $(document).ready(function () {
      if (window.location.pathname.includes('/bouquet/view')) {
          $('.year-picker, .month-picker').on('change', function () {