Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
ckeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vanilla ckeditor-3.1
[ckeditor.git]
/
_source
/
plugins
/
table
/
dialogs
/
table.js
diff --git
a/_source/plugins/table/dialogs/table.js
b/_source/plugins/table/dialogs/table.js
index
6a082d2
..
215a373
100644
(file)
--- a/
_source/plugins/table/dialogs/table.js
+++ b/
_source/plugins/table/dialogs/table.js
@@
-1,5
+1,5
@@
/*
\r
/*
\r
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
\r
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
\r
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
*/
\r
\r
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
*/
\r
\r
@@
-68,6
+68,12
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
},
\r
onOk : function()
\r
{
\r
},
\r
onOk : function()
\r
{
\r
+ if ( this._.selectedElement )
\r
+ {
\r
+ var selection = editor.getSelection(),
\r
+ bms = editor.getSelection().createBookmarks();
\r
+ }
\r
+
\r
var table = this._.selectedElement || makeElement( 'table' ),
\r
me = this,
\r
data = {};
\r
var table = this._.selectedElement || makeElement( 'table' ),
\r
me = this,
\r
data = {};
\r
@@
-193,6
+199,9
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
// Insert the table element if we're creating one.
\r
if ( !this._.selectedElement )
\r
editor.insertElement( table );
\r
// Insert the table element if we're creating one.
\r
if ( !this._.selectedElement )
\r
editor.insertElement( table );
\r
+ // Properly restore the selection inside table. (#4822)
\r
+ else
\r
+ selection.selectBookmarks( bms );
\r
\r
return true;
\r
},
\r
\r
return true;
\r
},
\r