Merge remote-tracking branch 'remotes/dev/master'

oroinc · Mar 2, 2023 · 3475755 · 3475755
2 parents 15999e2 + c5f9be2
commit 3475755
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@ The upgrade instructions are available at [Oro documentation website](https://do
 
 The current file describes significant changes in the code that may affect the upgrade of your customizations.
 
+### Changed
+* Updated from `slick-carousel: 1.7.1` to fork `@oroinc/slick-carousel: 1.7.1-oro1` with patched internal `postSlide` method
+* Updated path of styles from `~slick-carousel/slick/slick.scss` to `~@oroinc/slick-carousel/slick/slick.scss`
+  and path of js from `slick-carousel/slick/slick` to `@oroinc/slick-carousel/slick/slick`
+
 ## Changes in the Platform package versions
 
 - [5.1.0](#510-unreleased)

diff --git a/composer.json b/composer.json
@@ -206,7 +206,7 @@
             "@oroinc/bootstrap": "4.3.1-oro2",
             "popper.js": "1.16.1",
             "asap": "2.0.6",
-            "slick-carousel": "1.7.1",
+            "@oroinc/slick-carousel": "1.7.1-oro1",
             "xregexp": "^5.1.0",
             "scriptjs": "2.5.9",
             "focus-visible": "5.2.0",

diff --git a/dev.json b/dev.json
@@ -209,7 +209,7 @@
             "@oroinc/bootstrap": "4.3.1-oro2",
             "popper.js": "1.16.1",
             "asap": "2.0.6",
-            "slick-carousel": "1.7.1",
+            "@oroinc/slick-carousel": "1.7.1-oro1",
             "xregexp": "^5.1.0",
             "scriptjs": "2.5.9",
             "focus-visible": "5.2.0",

diff --git a/dev.lock b/dev.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "cb2c06b83eb5ec0f9d890fbc9f3594be",
+    "content-hash": "40ffac61602a533b7a0056024a65ec2a",
     "packages": [
         {
             "name": "ass/xmlsecurity",

diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/js/filters-manager.js b/src/Oro/Bundle/FilterBundle/Resources/public/js/filters-manager.js
@@ -740,6 +740,9 @@ define(function(require, exports, module) {
                     refresh: () => {
                         this.selectWidget.onRefresh();
                     },
+                    beforeclose: () => {
+                        return this.ignoreFiltersUpdateEvents === false;
+                    },
                     close: () => {
                         this.selectWidget.onClose();
                     },

diff --git a/src/Oro/Bundle/UIBundle/Resources/config/oro/assets.yml b/src/Oro/Bundle/UIBundle/Resources/config/oro/assets.yml
@@ -12,7 +12,7 @@ css:
         - 'bundles/oroui/css/scss/bootstrap/bootstrap.scss'
 
         # Libraries styles
-        - '~slick-carousel/slick/slick.scss'
+        - '~@oroinc/slick-carousel/slick/slick.scss'
         - 'bundles/oroui/css/scss/font-awesome/_core.scss'
         - 'bundles/oroui/lib/simplecolorpicker/jquery.simplecolorpicker.css'
         - 'bundles/oroui/lib/simplecolorpicker/jquery.simplecolorpicker-fontawesome.css'

diff --git a/src/Oro/Bundle/UIBundle/Resources/config/oro/jsmodules.yml b/src/Oro/Bundle/UIBundle/Resources/config/oro/jsmodules.yml
@@ -49,7 +49,7 @@ aliases:
     popper$: popper.js/dist/popper
     popper-utils$: popper.js/dist/popper-utils
     scriptjs$: scriptjs/dist/script
-    slick$: slick-carousel/slick/slick
+    slick$: '@oroinc/slick-carousel/slick/slick'
     styled-scroll-bar$: oroui/js/app/plugins/styled-scroll-bar
     underscore$: underscore/underscore
 app-modules:

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/js/extend/jquery.multiselect.js b/src/Oro/Bundle/UIBundle/Resources/public/js/extend/jquery.multiselect.js
@@ -67,7 +67,7 @@ define(function(require) {
             this._bindHeaderEvents();
 
             const events = ['mousedown', 'clearMenus']
-                .map(eventName => `${eventName}.${this._namespaceID}`)
+                .map(eventName => `${eventName}${this._namespaceID}`)
                 .join(' ');
 
             // close each widget when clicking on any other element/anywhere else on the page
@@ -81,7 +81,7 @@ define(function(require) {
             // restored to their defaultValue prop on form reset, and the reset
             // handler fires before the form is actually reset.  delaying it a bit
             // gives the form inputs time to clear.
-            $(this.element[0].form).on(`reset.${this._namespaceID}`, () => {
+            $(this.element[0].form).on(`reset${this._namespaceID}`, () => {
                 setTimeout(this.refresh.bind(this), 10);
             });
         },

diff --git a/src/Oro/Bundle/ViewSwitcherBundle/Resources/views/layouts/view-switcher/config/assets.yml b/src/Oro/Bundle/ViewSwitcherBundle/Resources/views/layouts/view-switcher/config/assets.yml
@@ -4,7 +4,7 @@ styles:
         - 'bundles/oroui/css/scss/settings/global-settings.scss'
 
         # Styles
-        - '~slick-carousel/slick/slick.scss'
+        - '~@oroinc/slick-carousel/slick/slick.scss'
         - 'bundles/oroui/css/scss/oro/loading/loading-bar.scss'
         - 'bundles/oroui/css/scss/font-awesome/_core.scss'
         - 'bundles/oroviewswitcher/view-switcher/scss/styles.scss'

diff --git a/src/Oro/Bundle/ViewSwitcherBundle/Resources/views/layouts/view-switcher/config/jsmodules.yml b/src/Oro/Bundle/ViewSwitcherBundle/Resources/views/layouts/view-switcher/config/jsmodules.yml
@@ -10,7 +10,7 @@ aliases:
     module-config$: oroui/js/app/services/module-config
     oroui/js/app$: oroviewswitcher/js/app/views/demo/demo
     routing$: fosjsrouting/js/router
-    slick$: slick-carousel/slick/slick
+    slick$: '@oroinc/slick-carousel/slick/slick'
     underscore$: underscore/underscore
 configs:
     orotranslation/js/translator: {}