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

Pasting image widget into table cell #694

Merged
merged 45 commits into from
Aug 10, 2017
Merged

Pasting image widget into table cell #694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
2e16b06
unit test for pasting image2 widget to table with tableselect plugin
wojtekw92 Jun 23, 2017
6345724
whitespace fixes
wojtekw92 Jun 26, 2017
6cd7e32
Update unit test.
Comandeer Jul 26, 2017
a1b9f09
Add manual test.
Comandeer Jul 26, 2017
2e914c3
Move evt.stop after all early returns.
Comandeer Jul 26, 2017
a9a03f0
Pass pasting to other paste handlers.
Comandeer Jul 26, 2017
5b046cd
Add undo integration tests.
Comandeer Jul 26, 2017
84eaa5c
Introduce emptyCells function.
Comandeer Jul 27, 2017
a6230f3
Update unit tests.
Comandeer Jul 28, 2017
636e816
Select cells after paste.
Comandeer Jul 28, 2017
797b10a
Move assertion to afterPaste event listener.
Comandeer Aug 1, 2017
aa6f3e0
Add paste flow test case for non-tabular content.
Comandeer Aug 1, 2017
61cf773
Refactoring: tabletools.getSelectedCells() return an empty array if n…
mlewand Aug 4, 2017
90d437a
Refactoring: paste listener simplified.
mlewand Aug 4, 2017
723f0ad
Refactoring: extracted some logic from boundary case handling.
mlewand Aug 4, 2017
ffb1c13
Refactoring: extracted function responsible for parsing pasted content.
mlewand Aug 4, 2017
b118d86
Updated the comment according to my review suggestion.
mlewand Aug 4, 2017
9c79445
Minor refactorization.
mlewand Aug 4, 2017
cc3f3fb
Added a remark about further simplification possibility.
mlewand Aug 4, 2017
79c1b1d
Fixed failing tests, improved condition catching cases which should n…
mlewand Aug 8, 2017
00ce5ef
Tabletools insertRow / insertColumn will now return added elements.
mlewand Aug 8, 2017
3a800f7
Introduced TableSelection type.
mlewand Aug 8, 2017
5870f90
Refactoring: further simplification in preparation to extract paste t…
mlewand Aug 8, 2017
f58d4d2
Refactoring: extracted pasteTable method.
mlewand Aug 8, 2017
d52f17e
Refactoring: further simplifications.
mlewand Aug 8, 2017
4be8747
Added a function that will reorder selected cells according to DOM po…
mlewand Aug 9, 2017
b23b4a8
Added some API docs.
mlewand Aug 9, 2017
825c6fa
Fixed outdated cells passed to insertColumn / insertRow.
mlewand Aug 9, 2017
f127170
Fixed an edge case when inserting rows.
mlewand Aug 9, 2017
c6484e8
Fixed a case when pasting into a partially selected cell would be cus…
mlewand Aug 9, 2017
d2c0312
Refactoring: minor adjustments.
mlewand Aug 9, 2017
037d80c
Refactoring: renamed paste listener.
mlewand Aug 9, 2017
7094ce2
Make sure that cells in TableSelection are in DOM order.
mlewand Aug 9, 2017
5289cbf
Docs: corrected API docs.
mlewand Aug 9, 2017
58fe2e7
Extracted a function for erasing selected cells content.
mlewand Aug 9, 2017
77dd8af
Added unit tests for values returned by tabletools insertRow and inse…
mlewand Aug 9, 2017
517d900
Fixed a bug where merged table would have an invalid structure.
mlewand Aug 9, 2017
76de5a7
Added handling for an edge case where, in certain scenario, if rowspa…
mlewand Aug 9, 2017
51757d5
Refactoring: added code comment and a missing semicolon.
mlewand Aug 9, 2017
1048d62
Fixed test fixture id.
mlewand Aug 9, 2017
fa6bf28
Replace custom TableSelection._nodeListToArray with native NodeList.t…
Comandeer Aug 10, 2017
770bf8f
Update unit test.
Comandeer Aug 10, 2017
f11e3af
Add missing ticket number.
Comandeer Aug 10, 2017
6a54e33
Refactoring: renamed variable, joined var statements.
mlewand Aug 10, 2017
95ea14e
Changelog entry.
mlewand Aug 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ New Features:
Fixed Issues:

* [#663](https://github.com/ckeditor/ckeditor-dev/issues/663): [Chrome] Fixed: Clicking on scrollbar throws an `Uncaught TypeError: element.is is not a function` error.
* [#520](https://github.com/ckeditor/ckeditor-dev/issues/520): Fixed: Widgets cannot be properly pasted into a table cell.
* [#579](https://github.com/ckeditor/ckeditor-dev/issues/579): Fixed: Internal `cke_table-faked-selection-table` class visible in Stylesheet Classes field in [Table Properties](http://ckeditor.com/addon/table) dialog.
* [#545](https://github.com/ckeditor/ckeditor-dev/issues/545): [Edge] Fixed: Error thrown when pressing the Select All button in a [Source Mode](http://ckeditor.com/addon/sourcearea).
* [#582](https://github.com/ckeditor/ckeditor-dev/issues/582): Fixed: Double slash in path to stylesheet needed by [Table Selection](http://ckeditor.com/addon/tableselection) plugin. Thanks to [Marius Dumitru Florea](https://github.com/mflorea)!
Expand Down
6 changes: 4 additions & 2 deletions core/selection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2273,10 +2273,12 @@
* editor.getSelection().isInTable();
*
* @since 4.7.0
* @param {Boolean} [allowPartialSelection=false] Whether partial cell selection should be included.
* This parameter was added in 4.7.2.
* @returns {Boolean}
*/
isInTable: function() {
return isTableSelection( this.getRanges() );
isInTable: function( allowPartialSelection ) {
return isTableSelection( this.getRanges(), allowPartialSelection );
},

/**
Expand Down
Loading