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.5.3
[ckeditor.git]
/
_source
/
plugins
/
div
/
plugin.js
diff --git
a/_source/plugins/div/plugin.js
b/_source/plugins/div/plugin.js
index
3a7ec8d
..
2f954dc
100644
(file)
--- a/
_source/plugins/div/plugin.js
+++ b/
_source/plugins/div/plugin.js
@@
-1,5
+1,5
@@
/*
\r
/*
\r
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
\r
+Copyright (c) 2003-2011, 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
@@
-12,7
+12,7
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
{
\r
CKEDITOR.plugins.add( 'div',
\r
{
\r
{
\r
CKEDITOR.plugins.add( 'div',
\r
{
\r
- requires : [ 'editingblock', 'domiterator' ],
\r
+ requires : [ 'editingblock', 'domiterator', 'styles' ],
\r
\r
init : function( editor )
\r
{
\r
\r
init : function( editor )
\r
{
\r
@@
-37,17
+37,17
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
blockLimit = path.blockLimit,
\r
div = blockLimit.is( 'div' ) && blockLimit;
\r
\r
blockLimit = path.blockLimit,
\r
div = blockLimit.is( 'div' ) && blockLimit;
\r
\r
- if ( div && !div.getAttribute( '_cke_div_added' ) )
\r
+ if ( div && !div.data( 'cke-div-added' ) )
\r
{
\r
toRemove.push( div );
\r
{
\r
toRemove.push( div );
\r
- div.setAttribute( '_cke_div_added' );
\r
+ div.data( 'cke-div-added' );
\r
}
\r
}
\r
\r
for ( var i = 0 ; i < ranges.length ; i++ )
\r
{
\r
range = ranges[ i ];
\r
}
\r
}
\r
\r
for ( var i = 0 ; i < ranges.length ; i++ )
\r
{
\r
range = ranges[ i ];
\r
- if( range.collapsed )
\r
+ if ( range.collapsed )
\r
findDiv( selection.getStartElement() );
\r
else
\r
{
\r
findDiv( selection.getStartElement() );
\r
else
\r
{
\r
@@
-95,7
+95,7
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
{
\r
editor.contextMenu.addListener( function( element, selection )
\r
{
\r
{
\r
editor.contextMenu.addListener( function( element, selection )
\r
{
\r
- if ( !element )
\r
+ if ( !element || element.isReadOnly() )
\r
return null;
\r
\r
var elementPath = new CKEDITOR.dom.elementPath( element ),
\r
return null;
\r
\r
var elementPath = new CKEDITOR.dom.elementPath( element ),
\r