Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

6120: Pasting table into table - base scenarios. #6786

Merged
merged 76 commits into from
May 15, 2020
Merged

6120: Pasting table into table - base scenarios. #6786

merged 76 commits into from
May 15, 2020

Commits on May 5, 2020

  1. Add tests for pasting scenarios.

    @jodator
    jodator committed May 5, 2020
    Configuration menu
    Copy the full SHA
    9ac915b View commit details
    Browse the repository at this point in the history

  2. Add paste handler stub to TableClipboard plugin.

    @jodator
    jodator committed May 5, 2020
    Configuration menu
    Copy the full SHA
    6f7ba10 View commit details
    Browse the repository at this point in the history

  3. Add test for preventing paste in read only mode.

    @jodator
    jodator committed May 5, 2020
    Configuration menu
    Copy the full SHA
    791649f View commit details
    Browse the repository at this point in the history

  4. Add test for pasting when no table cells are selected.

    @jodator
    jodator committed May 5, 2020
    Configuration menu
    Copy the full SHA
    8b90a88 View commit details
    Browse the repository at this point in the history

  5. Listen to Clipboard plugin's "inputTransformation" event.

    @jodator
    jodator committed May 5, 2020
    Configuration menu
    Copy the full SHA
    c7b28a2 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2020

  1. Handle insertContent overriding in a base paste scenario.

    @jodator
    jodator committed May 6, 2020
    Configuration menu
    Copy the full SHA
    7b0e49c View commit details
    Browse the repository at this point in the history

  2. Calculate and compare selection and inserted table areas.

    @jodator
    jodator committed May 6, 2020
    Configuration menu
    Copy the full SHA
    6522563 View commit details
    Browse the repository at this point in the history

  3. Handle simple table paste over simple selection of same size.

    @jodator
    jodator committed May 6, 2020
    Configuration menu
    Copy the full SHA
    149bb66 View commit details
    Browse the repository at this point in the history

  4. Add column/row tests for simple paste scenarios.

    @jodator
    jodator committed May 6, 2020
    Configuration menu
    Copy the full SHA
    f6e0c2f View commit details
    Browse the repository at this point in the history

  5. Handle case of pasted table that has has colspans.

    @jodator
    jodator committed May 6, 2020
    Configuration menu
    Copy the full SHA
    07a5e42 View commit details
    Browse the repository at this point in the history

  6. Handle pasting over table with colspans.

    @jodator
    jodator committed May 6, 2020
    Configuration menu
    Copy the full SHA
    06ac3f0 View commit details
    Browse the repository at this point in the history

  7. Handle various rowspan scenarios in tests.

    @jodator
    jodator committed May 6, 2020
    Configuration menu
    Copy the full SHA
    b9adc75 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2020

  1. Merge branch 'master' into i/6120

    @jodator
    jodator committed May 7, 2020
    Configuration menu
    Copy the full SHA
    a0c877f View commit details
    Browse the repository at this point in the history

  2. Add tests for mixed col- and row-spans.

    @jodator
    jodator committed May 7, 2020
    Configuration menu
    Copy the full SHA
    220e9bf View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into i/6120

    @jodator
    jodator committed May 7, 2020
    Configuration menu
    Copy the full SHA
    9532786 View commit details
    Browse the repository at this point in the history

  4. Add option to renumber table cells using letters.

    @jodator
    jodator committed May 7, 2020
    Configuration menu
    Copy the full SHA
    682f949 View commit details
    Browse the repository at this point in the history

  5. Add tests for special selection cases (wrong area calculation).

    @jodator
    jodator committed May 7, 2020
    Configuration menu
    Copy the full SHA
    1af43b2 View commit details
    Browse the repository at this point in the history

  6. Align code to the changes in table selection API.

    @jodator
    jodator committed May 7, 2020
    Configuration menu
    Copy the full SHA
    5b7fe35 View commit details
    Browse the repository at this point in the history

  7. Skip edge cases for handling paste.

    @jodator
    jodator committed May 7, 2020
    Configuration menu
    Copy the full SHA
    b9d1a84 View commit details
    Browse the repository at this point in the history

  8. Disable non-rectangular selection from paste handling.

    @jodator
    jodator committed May 7, 2020
    Configuration menu
    Copy the full SHA
    8bc3650 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2020

  1. Fix if statement that disables non-rectangular selection.

    @jodator
    jodator committed May 8, 2020
    Configuration menu
    Copy the full SHA
    432cc1b View commit details
    Browse the repository at this point in the history

  2. Re-organize code to anticipate table cropping.

    @jodator
    jodator committed May 8, 2020
    Configuration menu
    Copy the full SHA
    ec300ea View commit details
    Browse the repository at this point in the history

  3. Add early return when no table is found on paste.

    @jodator
    jodator committed May 8, 2020
    Configuration menu
    Copy the full SHA
    9d156f8 View commit details
    Browse the repository at this point in the history

  4. Refactor table cropping utilities to make them reusable.

    @jodator
    jodator committed May 8, 2020
    Configuration menu
    Copy the full SHA
    7a37015 View commit details
    Browse the repository at this point in the history

  5. Add tests for simple pasting scenarios when pasted table exceeds sele… 

    …ction.
    @jodator
    jodator committed May 8, 2020
    Configuration menu
    Copy the full SHA
    67761ce View commit details
    Browse the repository at this point in the history

  6. Update docs.

    @jodator
    jodator committed May 8, 2020
    Configuration menu
    Copy the full SHA
    f5ef5c9 View commit details
    Browse the repository at this point in the history

  7. Add stub test for bigger selection than pasted table case.

    @jodator
    jodator committed May 8, 2020
    Configuration menu
    Copy the full SHA
    32ed5df View commit details
    Browse the repository at this point in the history

  8. Add stub test for non-rectangular selection is pasted.

    @jodator
    jodator committed May 8, 2020
    Configuration menu
    Copy the full SHA
    de13de5 View commit details
    Browse the repository at this point in the history

  9. Add stub test for non-rectangular selection is pasted.

    @jodator
    jodator committed May 8, 2020
    Configuration menu
    Copy the full SHA
    448e61c View commit details
    Browse the repository at this point in the history

  10. Fix cases for "pasted table has spans" and bigger pasted table.

    @jodator
    jodator committed May 8, 2020
    Configuration menu
    Copy the full SHA
    cddb808 View commit details
    Browse the repository at this point in the history

  11. Remove special test cases.

    @jodator
    jodator committed May 8, 2020
    Configuration menu
    Copy the full SHA
    04a01ee View commit details
    Browse the repository at this point in the history

  12. Merge branch 'master' into i/6120

    @jodator
    jodator committed May 8, 2020
    Configuration menu
    Copy the full SHA
    9b2f0d5 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2020

  1. Split table clipboard tests.

    @jodator
    jodator committed May 11, 2020
    Configuration menu
    Copy the full SHA
    5117d98 View commit details
    Browse the repository at this point in the history

  2. Handle block content in pasted table cells.

    @jodator
    jodator committed May 11, 2020
    Configuration menu
    Copy the full SHA
    be31d72 View commit details
    Browse the repository at this point in the history

  3. Unify not implemented debug console logs.

    @jodator
    jodator committed May 11, 2020
    Configuration menu
    Copy the full SHA
    f36df6a View commit details
    Browse the repository at this point in the history

  4. Add tests cases for block content in pasted tables.

    @jodator
    jodator committed May 11, 2020
    Configuration menu
    Copy the full SHA
    efc0f7f View commit details
    Browse the repository at this point in the history

  5. Sort imports in tests.

    @jodator
    jodator committed May 11, 2020
    Configuration menu
    Copy the full SHA
    ac826a5 View commit details
    Browse the repository at this point in the history

  6. Handle table cell properties in pasted table.

    @jodator
    jodator committed May 11, 2020
    Configuration menu
    Copy the full SHA
    1139352 View commit details
    Browse the repository at this point in the history

  7. Add test case for table properties in paste scenarios.

    @jodator
    jodator committed May 11, 2020
    Configuration menu
    Copy the full SHA
    b20b4e2 View commit details
    Browse the repository at this point in the history

  8. Refactor _onInsertContent() logic.

    @jodator
    jodator committed May 11, 2020
    Configuration menu
    Copy the full SHA
    fb21bb0 View commit details
    Browse the repository at this point in the history

  9. Organize imports in table clipboard.

    @jodator
    jodator committed May 11, 2020
    Configuration menu
    Copy the full SHA
    58523f4 View commit details
    Browse the repository at this point in the history

  10. Update table clipboard docs.

    @jodator
    jodator committed May 11, 2020
    Configuration menu
    Copy the full SHA
    09c0375 View commit details
    Browse the repository at this point in the history

  11. Fix jsdoc comments.

    @jodator
    jodator committed May 11, 2020
    Configuration menu
    Copy the full SHA
    1912c43 View commit details
    Browse the repository at this point in the history

  12. Anticipate temporary console.log in table clipboard paste tests.

    @jodator
    jodator committed May 11, 2020
    Configuration menu
    Copy the full SHA
    b6fe69c View commit details
    Browse the repository at this point in the history

Commits on May 12, 2020

  1. Add table clipboard tests and update its requires call.

    @jodator
    jodator committed May 12, 2020
    Configuration menu
    Copy the full SHA
    af0fac6 View commit details
    Browse the repository at this point in the history

  2. Refactor cropTableToDimensions().

    @jodator
    jodator committed May 12, 2020
    Configuration menu
    Copy the full SHA
    3ac58ce View commit details
    Browse the repository at this point in the history

Commits on May 13, 2020

  1. Update documentation of cropTableToDimensions() util.

    @jodator
    jodator committed May 13, 2020
    Configuration menu
    Copy the full SHA
    85290c7 View commit details
    Browse the repository at this point in the history

  2. Fix copy table tests.

    @jodator
    jodator committed May 13, 2020
    Configuration menu
    Copy the full SHA
    d01555d View commit details
    Browse the repository at this point in the history

  3. Refactor variable names in insert content method.

    @jodator
    jodator committed May 13, 2020
    Configuration menu
    Copy the full SHA
    07500b6 View commit details
    Browse the repository at this point in the history

  4. Refactor insertionMap to use an array.

    @jodator
    jodator committed May 13, 2020
    Configuration menu
    Copy the full SHA
    42cc975 View commit details
    Browse the repository at this point in the history

  5. Refactor insertion map to a two dimensional location map. 

    The access by [ row ][ column ] is self explanatory. No need to calculate location by the table width.
    @jodator
    jodator committed May 13, 2020
    Configuration menu
    Copy the full SHA
    80022e0 View commit details
    Browse the repository at this point in the history

  6. Make table paste work only for document selection.

    @jodator
    jodator committed May 13, 2020
    Configuration menu
    Copy the full SHA
    4926e94 View commit details
    Browse the repository at this point in the history

  7. Refactor cell replace algorithm to make more clear.

    @jodator
    jodator committed May 13, 2020
    Configuration menu
    Copy the full SHA
    70b23ae View commit details
    Browse the repository at this point in the history

  8. Add information about content table replacing goals.

    @jodator
    jodator committed May 13, 2020
    Configuration menu
    Copy the full SHA
    afde3cf View commit details
    Browse the repository at this point in the history

  9. Fix: Pasted table after spanned slots will not break table geometry.

    @jodator
    jodator committed May 13, 2020
    Configuration menu
    Copy the full SHA
    1228069 View commit details
    Browse the repository at this point in the history

  10. Code style - inline simple arrow function. 

    Co-authored-by: Kuba Niegowski <[email protected]>
    @jodator @niegowski
    jodator and niegowski authored May 13, 2020
    Configuration menu
    Copy the full SHA
    098b763 View commit details
    Browse the repository at this point in the history

  11. Improve pasted/selected nomenclature.

    @jodator
    jodator committed May 13, 2020
    Configuration menu
    Copy the full SHA
    22ca037 View commit details
    Browse the repository at this point in the history

  12. Use selected table cells in isSelectionRectangular().

    @jodator
    jodator committed May 13, 2020
    Configuration menu
    Copy the full SHA
    0c09a2e View commit details
    Browse the repository at this point in the history

  13. Use getChildren() to iterate over document fragment.

    @jodator
    jodator committed May 13, 2020
    Configuration menu
    Copy the full SHA
    3e723af View commit details
    Browse the repository at this point in the history

  14. Remove confusing comment.

    @jodator
    jodator committed May 13, 2020
    Configuration menu
    Copy the full SHA
    7f5451f View commit details
    Browse the repository at this point in the history

  15. Rename tableMap to selectedTableMap.

    @jodator
    jodator committed May 13, 2020
    Configuration menu
    Copy the full SHA
    c51cd4d View commit details
    Browse the repository at this point in the history

  16. Refactor crop table utilities to use object parameter for crop dimens… 

    …ions.
    @jodator
    jodator committed May 13, 2020
    Configuration menu
    Copy the full SHA
    5d2c1e9 View commit details
    Browse the repository at this point in the history

  17. Fix jsdoc errors.

    @jodator
    jodator committed May 13, 2020
    Configuration menu
    Copy the full SHA
    9b46958 View commit details
    Browse the repository at this point in the history

  18. Minor refactor.

    @jodator
    jodator committed May 13, 2020
    Configuration menu
    Copy the full SHA
    4c0bd10 View commit details
    Browse the repository at this point in the history

  19. Restore comment about location map.

    @jodator
    jodator committed May 13, 2020
    Configuration menu
    Copy the full SHA
    92083f8 View commit details
    Browse the repository at this point in the history

  20. Change params order for cropTableToSelection.

    @jodator
    jodator committed May 13, 2020
    Configuration menu
    Copy the full SHA
    3b03eb6 View commit details
    Browse the repository at this point in the history

  21. Adjust trimTableCellIfNeeded parameter names and logic to the functio… 

    …n purpose.
    @jodator
    jodator committed May 13, 2020
    Configuration menu
    Copy the full SHA
    932cd63 View commit details
    Browse the repository at this point in the history

  22. Merge branch 'master' into i/6120 

    # Conflicts:
#	packages/ckeditor5-table/src/commands/mergecellscommand.js
    @jodator
    jodator committed May 13, 2020
    Configuration menu
    Copy the full SHA
    eaeddf8 View commit details
    Browse the repository at this point in the history

  23. Fixed complex copy-table fragment test (ascii-art should match test, … 

    …renumbering cells).
    @niegowski
    niegowski committed May 13, 2020
    Configuration menu
    Copy the full SHA
    27330d9 View commit details
    Browse the repository at this point in the history

  24. Added missing spaces in tests.

    @niegowski
    niegowski committed May 13, 2020
    Configuration menu
    Copy the full SHA
    ede28f4 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2020

  1. Merge branch 'master' into i/6120

    @jodator
    jodator committed May 14, 2020
    Configuration menu
    Copy the full SHA
    7af3c7f View commit details
    Browse the repository at this point in the history

  2. Remove cropTableToSelection() util method.

    @jodator
    jodator committed May 14, 2020
    Configuration menu
    Copy the full SHA
    507f0de View commit details
    Browse the repository at this point in the history

  3. Fix cropTableToDimensions jsdoc.

    @jodator
    jodator committed May 14, 2020
    Configuration menu
    Copy the full SHA
    cc68497 View commit details
    Browse the repository at this point in the history

  4. Handle paste only when alone table is pasted.

    @jodator
    jodator committed May 14, 2020
    Configuration menu
    Copy the full SHA
    d002dc9 View commit details
    Browse the repository at this point in the history

  5. Add test for content without table is pasted.

    @jodator
    jodator committed May 14, 2020
    Configuration menu
    Copy the full SHA
    27a4903 View commit details
    Browse the repository at this point in the history

  6. Fixed getTableIfOnlyTableInContent if content has no children.

    @niegowski
    niegowski committed May 14, 2020
    Configuration menu
    Copy the full SHA
    3633a36 View commit details
    Browse the repository at this point in the history