Skip to content

Commit

Permalink
Merge pull request #694 from ckeditor/t/520
Browse files Browse the repository at this point in the history
Widgets cannot be properly pasted into a table cell.
  • Loading branch information
f1ames authored Aug 10, 2017
2 parents 63983c8 + 95ea14e commit deed636
Show file tree
Hide file tree
Showing 17 changed files with 849 additions and 215 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
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
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

0 comments on commit deed636

Please sign in to comment.