Review main Merged

72628[TASK] Unpatch jquery-ui/ui/sortable.js

Benjamin Franzke CR +2 V +2 Easy +12 −8 updated 12/14/21, 14:24

Commit message

jquery-ui/sortable has been patched as minified file in #83593
with a patch taken from https://github.com/jquery/jquery-ui/pull/1093

That pull request never got merged, but in the meantime the
chrome bug seems to be fixed (the original report is no longer
reproducable), therefore we now remove the patch.

Note: Our binary patch (#83593) implicitly reverted jquery-ui/sortable
to a 2013er version. Thus, this change implicitly updated our copy
back to version 1.11.4 (from 2015) as defined in our package.json

Review

  • Code review CR +2 Done
    • Oliver Hader +2
    • Benni Mack +1
  • Verified V +2 Done
    • Oliver Hader +2
    • Benni Mack +1
    • core-ci +1 CI

Issues 3

Files 2

Review log 2027

Show 2 earlier messages
  1. Benjamin Franzke uploaded patch set 1 12/10/21, 20:27

  2. Benjamin Franzke wrote 12/10/21, 20:27

    Topic set to esm
  1. core-ci voted on patch set 1 V -1 12/10/21, 20:43 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20956

  2. core-ci commented on patch set 1 12/10/21, 20:54 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20956

  3. core-ci commented on patch set 1 12/10/21, 21:01 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20956

  4. Benjamin Franzke uploaded patch set 2 12/10/21, 21:09

  5. Benjamin Franzke rebased onto patch set 3 12/10/21, 21:26

  6. Benjamin Franzke rebased onto patch set 4 12/10/21, 21:26

  7. core-ci voted on patch set 2 V -1 12/10/21, 21:29 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20958

  8. core-ci voted on patch set 4 V +1 12/10/21, 21:46 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20962

  9. Benjamin Franzke commented on patch set 4 12/13/21, 20:33

    Can be tested via EXT:form Backend FormManager, uses this module to reorder items.
  10. Benni Mack voted on patch set 4 V +1 CR +1 12/13/21, 20:37

  11. Oliver Hader voted on patch set 4 CR +1 12/14/21, 09:45

  12. Oliver Hader voted on patch set 4 V +2 CR +2 12/14/21, 09:48

  13. Oliver Hader voted on patch set 4 CR 0 12/14/21, 09:52

  14. Oliver Hader commented on patch set 4 12/14/21, 09:59

    I'm puzzled about that change concerning `document` vs. `this.document` in the minified JS file. Before: `return"absolute"===this.cssPosition&&this.scrollParent[0]!==document&&this.scrollParent[0]!==document.body` After: `return"absolute"===this.cssPosition&&this.scrollParent[0]!==this.document[0]&&this.scrollParent[0]!==document.body`

    sortable.js:4 Unresolved

    I'm puzzled about this change and `document` vs. `this.document`

    sortable.js:11 Unresolved

    ... and the corresponding couter-part
  15. Oliver Hader voted on patch set 4 CR -1 12/14/21, 09:59

  16. Benjamin Franzke commented on patch set 4 12/14/21, 10:14

    Reply

    Yea, our jquery-ui version (as installed by yarn) is another (newer) version than that has been binary-patched in https://review.typo3.org/c/Packages/TYPO3.CMS/+/55389/ Inspecting the changelog of https://review.typo3.org/c/Packages/TYPO3.CMS/+/55389/ shows that this.document[0] has been used before this patch. So to say it clearly: https://review.typo3.org/c/Packages/TYPO3.CMS/+/55389/ implicitly reverted jquery-ui/sortable to an older, but patched version. That is because the pull request this patch has been taken from was from 2013: https://github.com/jquery/jquery-ui/pull/1093 – while our jquery-ui version is from 2015: https://github.com/jquery/jquery-ui/commits/1.11.4 Therefore I adapted the 2013er patch to match the 2015er jquery-ui 1.11.4er version. Hope that makes sense.
  17. Benjamin Franzke commented on patch set 4 12/14/21, 10:15

    Reply

    The adaption of the pull request is documented in the commit message (no manual changed from my side) besides that curl/sed pipeline.
  18. Benni Mack commented on patch set 4 12/14/21, 13:16

    Well, we should check if newer jquery UI versions have resolved this (and then update respectively), or patch the newer versions. Can't reproduce the issue in modern browsers anymore... https://github.com/jquery/jquery-ui/pull/1093
  19. Benjamin Franzke uploaded patch set 5 12/14/21, 13:42

  20. Benjamin Franzke commented on patch set 5 12/14/21, 13:42

    Reply

    Marking as done as I've pushed a patchset that removes the patch (per Benni's comments)

    Reply

    Yea, I'm also fine with simply dropping the patch and using vanilla code instead.
  21. core-ci voted on patch set 5 V -1 12/14/21, 14:16 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/21082

  22. core-ci voted on patch set 5 V +1 12/14/21, 14:21 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/21082

  23. Benni Mack voted on patch set 5 V +1 CR +1 12/14/21, 14:22

  24. Oliver Hader commented on patch set 5 V +2 CR +2 12/14/21, 14:23

    Tested again (does not look like it is still required at all)
  25. Oliver Hader merged patch set 6 12/14/21, 14:24