Merge pull request #153 from collective/petschki-reset-button

Reset to last saved state
collective · Oct 18, 2023 · 0ec0127 · 0ec0127
2 parents 1ee4d17 + f3a4476
commit 0ec0127
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 13 deletions.
diff --git a/news/153.bugfix b/news/153.bugfix
@@ -0,0 +1,2 @@
+Reset to last saved state when hitting the reset button.
+[petschki]
diff --git a/resources/js/cropperpattern.js b/resources/js/cropperpattern.js
@@ -87,7 +87,7 @@ export default Base.extend({
     reset: function () {
         log.info("RESET");
         this.while_reset = true;
-        this.cropper.setData(this.initial_data);
+        this.cropper.setData(this.original_data);
         this.visualize_selected_area();
         this.while_reset = false;
         this.update_badges();

diff --git a/src/plone/app/imagecropping/browser/editor.pt b/src/plone/app/imagecropping/browser/editor.pt
@@ -190,16 +190,16 @@
                             >
                               <span i18n:translate="button_save">Save</span>
                               ${python:view.field_label(fieldname)} ${python:scale['title']}</button>
-                            <button class="btn btn-danger remove standalone"
-                                    title="Delete the manual chosen cropping area and auto scale on the server side."
-                                    i18n:attributes="title button_remove_description"
-                                    i18n:translate="button_remove"
-                            >Remove</button>
                             <button class="btn btn-warning reset standalone"
                                     title="Set to initial value of ${scale/current/w}&times;${scale/current/h}. offset ${scale/current/x}, ${scale/current/y}"
                                     i18n:attributes="title button_reset_description"
                                     i18n:translate="button_reset"
                             >Reset</button>
+                            <button class="btn btn-danger remove standalone"
+                                    title="Delete the manual chosen cropping area and auto scale on the server side."
+                                    i18n:attributes="title button_remove_description"
+                                    i18n:translate="button_remove"
+                            >Remove</button>
                           </div>
                         </div>
                       </div>

diff --git a/...ic/chunks/906.9f58e54ab468bbe78ff9.min.js → ...ic/chunks/906.02172322e302d0cad69a.min.js b/...ic/chunks/906.9f58e54ab468bbe78ff9.min.js → ...ic/chunks/906.02172322e302d0cad69a.min.js
diff --git a/src/plone/app/imagecropping/browser/static/chunks/906.02172322e302d0cad69a.min.js.map b/src/plone/app/imagecropping/browser/static/chunks/906.02172322e302d0cad69a.min.js.map
diff --git a/src/plone/app/imagecropping/browser/static/chunks/906.9f58e54ab468bbe78ff9.min.js.map b/src/plone/app/imagecropping/browser/static/chunks/906.9f58e54ab468bbe78ff9.min.js.map
diff --git a/src/plone/app/imagecropping/browser/static/imagecropping-remote.min.js b/src/plone/app/imagecropping/browser/static/imagecropping-remote.min.js
diff --git a/src/plone/app/imagecropping/browser/static/imagecropping-remote.min.js.map b/src/plone/app/imagecropping/browser/static/imagecropping-remote.min.js.map