Open ZTrotter opened 2 months ago
On a page with both Save as new draft and Submit buttons, pressing the Enter key inside a element triggers the Save as new draft button by default.
In order to fix this behaviour, the following code could be added to Core.Form.js.
$('body').on('keydown', 'input', function (Event) { if (Event.keyCode == 13 && $(this).closest('form').find(':submit').length > 0) { Event.preventDefault(); $(this.form).find(':submit').last().click(); } });
Additionally, the code that handles the user attempting to submit a form from within a when <strong><em>Frontend::RichText</em></strong> is disabled could be updated to similarly trigger the expected button by changing the logic of how the button is selected. Currently it selects the first element with the type submit, which it mistakenly believes to be <strong><em>Save as new draft</em></strong>, changing this to last() instead will trigger the expected button.</p> <pre><code> $('body').on('keydown', 'textarea', function (Event) { if ((Event.ctrlKey || Event.metaKey) && Event.keyCode == 13) { // We need to click() instead of submit(), since click() has // a few useful event handlers tied to it, like validation. Event.preventDefault(); $(this.form).find(':submit').last().click(); } });</code></pre> <h2>Type of change</h2> <!-- What type of change does your PR introduce to Znuny? NOTE: Please add only one label with a starting '1 - ' to this PR! If your PR requires multiple labels to be applied, you'll most likely need to split it into multiple PRs. This makes things easier and faster for the code review. - '1 - 🆙 dependency upgrade - Dependency upgrade (e.g. libraries) - '1 - 🐞 bug 🐞' - Bugfix (non-breaking change which fixes an issue) - '1 - 💎 code quality' - Code quality improvements to existing code or addition of unit tests - '1 - 🚀 feature' - New feature (which adds functionality to an existing integration) - '1 - ...' --> <p>1 - 🐞 bug 🐞</p> <!-- If your PR contains a breaking change, it is important to tell what breaks, how to make it work again and why it is necessary. This piece of text is published with the release notes, so it helps if you write it for the users, not the maintainer. Note: Remove this section if this PR is NOT a breaking change. --> <h2>Additional information</h2> <!-- Details are important and help maintainers processing your PR. Please be sure to fill out additional details, if applicable. Note: Remove this section if not needed. If a PR is related to an issue, please use the 'Linked issues' function on the sidebar. --> <ul> <li>Navigate to AgentTicketZoom</li> <li>Click on Communication and select Note</li> <li>Enter some dummy information in both Subject and Text, click inside of Subject and click Enter</li> <li>You will be presented with the Add new draft popup instead of the form submitting</li> </ul> <!-- - This PR is related to PR: # - ... --> <h2>Checklist</h2> <!-- Put an 'x' in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code. ❕ - nice to have ❗ - required before review --> <ul> <li>[x] The code change is tested and works locally.(❗)</li> <li>[x] There is no commented out code in this PR.(❕)</li> <li>[ ] You improved or added new unit tests.(❕)</li> <li>[ ] Local ZnunyCodePolicy passed.(❕)</li> <li>[ ] Local UnitTests / Selenium passed.(❕)</li> <li>[ ] GitHub workflow CI (UnitTests / Selenium) passed.(❗)</li> </ul> <!-- Thank you for contributing ❤ Znuny @znuny/znuny --> </div> </div> <div class="page-bar-simple"> </div> <div class="footer"> <ul class="body"> <li>© <script> document.write(new Date().getFullYear()) </script> Githubissues.</li> <li>Githubissues is a development platform for aggregating issues.</li> </ul> </div> <script src="https://cdn.jsdelivr.net/npm/jquery@3.5.1/dist/jquery.min.js"></script> <script src="/githubissues/assets/js.js"></script> <script src="/githubissues/assets/markdown.js"></script> <script src="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.4.0/build/highlight.min.js"></script> <script src="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.4.0/build/languages/go.min.js"></script> <script> hljs.highlightAll(); </script> </body> </html>
Proposed change
On a page with both Save as new draft and Submit buttons, pressing the Enter key inside a element triggers the Save as new draft button by default.
In order to fix this behaviour, the following code could be added to Core.Form.js.
Additionally, the code that handles the user attempting to submit a form from within a