assets/themes/j1/adapter/js/justifiedGallery.js in j1-template-2022.2.3 vs assets/themes/j1/adapter/js/justifiedGallery.js in j1-template-2022.3.0.rc0
- old
+ new
@@ -43,10 +43,12 @@
{% comment %} Set config options
-------------------------------------------------------------------------------- {% endcomment %}
{% assign jf_gallery_options = jf_gallery_defaults | merge: jf_gallery_settings %}
+{% comment %} Detect prod mode
+-------------------------------------------------------------------------------- {% endcomment %}
{% assign production = false %}
{% if environment == 'prod' or environment == 'production' %}
{% assign production = true %}
{% endif %}
@@ -129,10 +131,10 @@
/* eslint-disable */
moduleOptions = $.extend({}, {{jf_gallery_options | replace: '=>', ':' | replace: 'nil', '""'}});
/* eslint-enable */
if (typeof settings !== 'undefined') {
- moduleOptions = j1.mergeData(moduleOptions, settings);
+ moduleOptions = $.extend({}, moduleOptions, settings);
}
_this.initialize(moduleOptions);
_this.setState('finished');