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.1
[ckeditor.git]
/
_source
/
plugins
/
div
/
dialogs
/
div.js
diff --git
a/_source/plugins/div/dialogs/div.js
b/_source/plugins/div/dialogs/div.js
index
619a3f8
..
c63e061
100644
(file)
--- a/
_source/plugins/div/dialogs/div.js
+++ b/
_source/plugins/div/dialogs/div.js
@@
-27,10
+27,10
@@
{
\r
var retval = [];
\r
var children = element.getChildren();
\r
{
\r
var retval = [];
\r
var children = element.getChildren();
\r
- for( var i = 0 ; i < children.count() ; i++ )
\r
+ for ( var i = 0 ; i < children.count() ; i++ )
\r
{
\r
var child = children.getItem( i );
\r
{
\r
var child = children.getItem( i );
\r
- if( ! ( child.type === CKEDITOR.NODE_TEXT
\r
+ if ( ! ( child.type === CKEDITOR.NODE_TEXT
\r
&& ( /^[ \t\n\r]+$/ ).test( child.getText() ) ) )
\r
retval.push( child );
\r
}
\r
&& ( /^[ \t\n\r]+$/ ).test( child.getText() ) ) )
\r
retval.push( child );
\r
}
\r
@@
-55,7
+55,7
@@
delete definition.div;
\r
\r
// Exclude 'td' and 'th' when 'wrapping table'
\r
delete definition.div;
\r
\r
// Exclude 'td' and 'th' when 'wrapping table'
\r
- if( editor.config.div_wrapTable )
\r
+ if ( editor.config.div_wrapTable )
\r
{
\r
delete definition.td;
\r
delete definition.th;
\r
{
\r
delete definition.td;
\r
delete definition.th;
\r
@@
-94,7
+94,7
@@
this.foreach( function( field )
\r
{
\r
// Exclude layout container elements
\r
this.foreach( function( field )
\r
{
\r
// Exclude layout container elements
\r
- if( /^(?!vbox|hbox)/.test( field.type ) )
\r
+ if ( /^(?!vbox|hbox)/.test( field.type ) )
\r
{
\r
if ( !field.setup )
\r
{
\r
{
\r
if ( !field.setup )
\r
{
\r
@@
-149,13
+149,13
@@
var blockTag = editor.config.enterMode == CKEDITOR.ENTER_DIV ? 'div' : 'p';
\r
\r
// collect all included elements from dom-iterator
\r
var blockTag = editor.config.enterMode == CKEDITOR.ENTER_DIV ? 'div' : 'p';
\r
\r
// collect all included elements from dom-iterator
\r
- for( i = 0 ; i < ranges.length ; i++ )
\r
+ for ( i = 0 ; i < ranges.length ; i++ )
\r
{
\r
iterator = ranges[ i ].createIterator();
\r
{
\r
iterator = ranges[ i ].createIterator();
\r
- while( ( block = iterator.getNextParagraph() ) )
\r
+ while ( ( block = iterator.getNextParagraph() ) )
\r
{
\r
// include contents of blockLimit elements.
\r
{
\r
// include contents of blockLimit elements.
\r
- if( block.getName() in divLimitDefinition )
\r
+ if ( block.getName() in divLimitDefinition )
\r
{
\r
var j, childNodes = block.getChildren();
\r
for ( j = 0 ; j < childNodes.count() ; j++ )
\r
{
\r
var j, childNodes = block.getChildren();
\r
for ( j = 0 ; j < childNodes.count() ; j++ )
\r
@@
-164,7
+164,7
@@
else
\r
{
\r
// Bypass dtd disallowed elements.
\r
else
\r
{
\r
// Bypass dtd disallowed elements.
\r
- while( !dtd[ block.getName() ] && block.getName() != 'body' )
\r
+ while ( !dtd[ block.getName() ] && block.getName() != 'body' )
\r
block = block.getParent();
\r
addSafely( containedBlocks, block, database );
\r
}
\r
block = block.getParent();
\r
addSafely( containedBlocks, block, database );
\r
}
\r
@@
-176,7
+176,7
@@
var blockGroups = groupByDivLimit( containedBlocks );
\r
var ancestor, blockEl, divElement;
\r
\r
var blockGroups = groupByDivLimit( containedBlocks );
\r
var ancestor, blockEl, divElement;
\r
\r
- for( i = 0 ; i < blockGroups.length ; i++ )
\r
+ for ( i = 0 ; i < blockGroups.length ; i++ )
\r
{
\r
var currentNode = blockGroups[ i ][ 0 ];
\r
\r
{
\r
var currentNode = blockGroups[ i ][ 0 ];
\r
\r
@@
-188,11
+188,11
@@
divElement = new CKEDITOR.dom.element( 'div', editor.document );
\r
\r
// Normalize the blocks in each group to a common parent.
\r
divElement = new CKEDITOR.dom.element( 'div', editor.document );
\r
\r
// Normalize the blocks in each group to a common parent.
\r
- for( j = 0; j < blockGroups[ i ].length ; j++ )
\r
+ for ( j = 0; j < blockGroups[ i ].length ; j++ )
\r
{
\r
currentNode = blockGroups[ i ][ j ];
\r
\r
{
\r
currentNode = blockGroups[ i ][ j ];
\r
\r
- while( !currentNode.getParent().equals( ancestor ) )
\r
+ while ( !currentNode.getParent().equals( ancestor ) )
\r
currentNode = currentNode.getParent();
\r
\r
// This could introduce some duplicated elements in array.
\r
currentNode = currentNode.getParent();
\r
\r
// This could introduce some duplicated elements in array.
\r
@@
-410,13
+410,13
@@
},
\r
onOk : function()
\r
{
\r
},
\r
onOk : function()
\r
{
\r
- if( command == 'editdiv' )
\r
+ if ( command == 'editdiv' )
\r
containers = [ this._element ];
\r
else
\r
containers = createDiv( editor, true );
\r
\r
// Update elements attributes
\r
containers = [ this._element ];
\r
else
\r
containers = createDiv( editor, true );
\r
\r
// Update elements attributes
\r
- for( var i = 0 ; i < containers.length ; i++ )
\r
+ for ( var i = 0 ; i < containers.length ; i++ )
\r
this.commitContent( containers[ i ] );
\r
this.hide();
\r
}
\r
this.commitContent( containers[ i ] );
\r
this.hide();
\r
}
\r