Skip to content

armgit / spree

Public Imported from GitHub
0

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.

Fixed V-3275 uploader with crop option

Damian Legawiecb835f8019ce1
diff --git a/admin/app/assets/stylesheets/spree/admin/plugins/uppy_fixes.scss b/admin/app/assets/stylesheets/spree/admin/plugins/uppy_fixes.scss
index 7f723eca64..96fae84c2b 100644
--- a/admin/app/assets/stylesheets/spree/admin/plugins/uppy_fixes.scss
+++ b/admin/app/assets/stylesheets/spree/admin/plugins/uppy_fixes.scss
@@ -30,11 +30,17 @@
border-color: $modal-content-border-color !important;
}
-.uppy-Dashboard-browse {
+.uppy-Dashboard-browse, .uppy-DashboardContent-back {
@extend .btn;
@extend .btn-light;
+}
+.uppy-Dashboard-browse {
@extend .ml-2;
}
+.uppy-DashboardContent-save {
+ @extend .btn;
+ @extend .btn-primary;
+}
.uppy-Dashboard-close {
@extend .btn-close;
diff --git a/admin/app/javascript/spree/admin/controllers/active_storage_upload_controller.js b/admin/app/javascript/spree/admin/controllers/active_storage_upload_controller.js
index 6eaa8913d7..496e25f5b3 100644
--- a/admin/app/javascript/spree/admin/controllers/active_storage_upload_controller.js
+++ b/admin/app/javascript/spree/admin/controllers/active_storage_upload_controller.js
@@ -38,11 +38,13 @@ export default class extends Controller {
crop: this.cropValue
})
- let dashboardOptions = {}
+ let dashboardOptions = {
+ closeAfterFinish: this.closeAfterFinishValue
+ }
if (this.cropValue == true) {
dashboardOptions = {
autoOpen: 'imageEditor',
- closeAfterFinish: this.closeAfterFinishValue
+ closeAfterFinish: false
}
}