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.4.2
[ckeditor.git]
/
_source
/
plugins
/
enterkey
/
plugin.js
diff --git
a/_source/plugins/enterkey/plugin.js
b/_source/plugins/enterkey/plugin.js
index
f383fb4
..
5046b1d
100644
(file)
--- a/
_source/plugins/enterkey/plugin.js
+++ b/
_source/plugins/enterkey/plugin.js
@@
-69,7
+69,7
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
if ( node.is( 'li' ) )
\r
{
\r
nextBlock.breakParent( node );
\r
if ( node.is( 'li' ) )
\r
{
\r
nextBlock.breakParent( node );
\r
- nextBlock.move( nextBlock.getNext(), true );
\r
+ nextBlock.move( nextBlock.getNext(), 1 );
\r
}
\r
}
\r
else if ( previousBlock && ( node = previousBlock.getParent() ) && node.is( 'li' ) )
\r
}
\r
}
\r
else if ( previousBlock && ( node = previousBlock.getParent() ) && node.is( 'li' ) )
\r
@@
-317,7
+317,7
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
return true;
\r
}
\r
else
\r
return true;
\r
}
\r
else
\r
- return enter( editor, editor.config.shiftEnterMode, true );
\r
+ return enter( editor, editor.config.shiftEnterMode, 1 );
\r
}
\r
\r
function enter( editor, mode, forceMode )
\r
}
\r
\r
function enter( editor, mode, forceMode )
\r
@@
-335,7
+335,7
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
setTimeout( function()
\r
{
\r
editor.fire( 'saveSnapshot' ); // Save undo step.
\r
setTimeout( function()
\r
{
\r
editor.fire( 'saveSnapshot' ); // Save undo step.
\r
- if ( mode == CKEDITOR.ENTER_BR || editor.getSelection().getStartElement().hasAscendant( 'pre', true ) )
\r
+ if ( mode == CKEDITOR.ENTER_BR || editor.getSelection().getStartElement().hasAscendant( 'pre', 1 ) )
\r
enterBr( editor, mode, null, forceMode );
\r
else
\r
enterBlock( editor, mode, null, forceMode );
\r
enterBr( editor, mode, null, forceMode );
\r
else
\r
enterBlock( editor, mode, null, forceMode );
\r