Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Resolve conflicts.
Matthew Kennedy73e3666e9cae
diff --git a/backend/app/assets/javascripts/spree/backend/cms/_index.es6 b/backend/app/assets/javascripts/spree/backend/cms/_index.es6index e0edcc6ac5..aab67e5fdd 100644--- a/backend/app/assets/javascripts/spree/backend/cms/_index.es6+++ b/backend/app/assets/javascripts/spree/backend/cms/_index.es6@@ -1,4 +1,3 @@//= require spree/backend/cms/page//= require spree/backend/cms/section-//= require spree/backend/cms/linkable//= require spree/backend/cms/linksdiff --git a/backend/app/assets/javascripts/spree/backend/cms/linkable.es6 b/backend/app/assets/javascripts/spree/backend/cms/linkable.es6deleted file mode 100644index 69b1109182..0000000000--- a/backend/app/assets/javascripts/spree/backend/cms/linkable.es6+++ /dev/null@@ -1,24 +0,0 @@-document.addEventListener('DOMContentLoaded', function() {- const linkSwitcher = $('.link_switcher').select2()-- linkSwitcher.on('change', function() {- const selectedLinkTo = $(linkSwitcher).val()- const message = document.getElementById('linkClickUpdate')- const activePanel = document.querySelector('[data-panel-type]')- const panelType = activePanel.dataset.panelType-- if (selectedLinkTo === panelType) {- activePanel.classList = ''- activePanel.classList.add('d-block')-- message.classList = ''- message.classList.add('d-none')- } else {- activePanel.classList = ''- activePanel.classList.add('d-none')-- message.classList = ''- message.classList.add('d-block')- }- })-})