Merge branch '2.0' into 2

silverstripe · Aug 7, 2023 · 30a47aa · 30a47aa
2 parents a52e094 + 4be853d
commit 30a47aa
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/client/dist/js/TinyMCE_sslink-file.js b/client/dist/js/TinyMCE_sslink-file.js
diff --git a/client/dist/js/TinyMCE_ssmedia.js b/client/dist/js/TinyMCE_ssmedia.js
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/components/AssetDropzone/AssetDropzone.js b/client/src/components/AssetDropzone/AssetDropzone.js
@@ -60,7 +60,7 @@ class AssetDropzone extends Component {
       this.dropzone.hiddenFileInput.classList.add(`dz-input-${name}`);
     }
     // add listeners when necessary
-    if (this.props.canUpload && prevProps.canUpload !== this.props.canUpload) {
+    if (this.props.canUpload && prevProps.options !== this.props.options) {
       if (this.dropzone) {
         this.dropzone.enable();