Index: /CKEditor/trunk/_samples/output_for_flash.html =================================================================== --- /CKEditor/trunk/_samples/output_for_flash.html (revision 6356) +++ /CKEditor/trunk/_samples/output_for_flash.html (revision 6357) @@ -246,5 +246,5 @@ } - if ( element.attributes.style == '' ) + if ( element.attributes.style === '' ) delete element.attributes.style; Index: /CKEditor/trunk/_source/core/dom/element.js =================================================================== --- /CKEditor/trunk/_source/core/dom/element.js (revision 6356) +++ /CKEditor/trunk/_source/core/dom/element.js (revision 6357) @@ -260,7 +260,7 @@ { if ( !this.isBlockBoundary() ) - return; - - var lastChild = this.getLast() ; + return null; + + var lastChild = this.getLast(); // Ignore empty/spaces text. @@ -269,9 +269,11 @@ if ( lastChild && - ( CKEDITOR.env.ie && lastChild.type == CKEDITOR.NODE_TEXT && CKEDITOR.tools.trim( lastChild.getText() ).match( /^(?: |\xa0)$/ ) - || CKEDITOR.env.gecko && CKEDITOR.env.webkit && lastChild.is( 'br' ) ) ) + ( CKEDITOR.env.ie && lastChild.type == CKEDITOR.NODE_TEXT && CKEDITOR.tools.trim( lastChild.getText() ).match( /^(?: |\xa0)$/ ) + || CKEDITOR.env.gecko && CKEDITOR.env.webkit && lastChild.is( 'br' ) ) ) { return lastChild; } + + return null; }, @@ -1584,4 +1586,6 @@ else this.setAttribute( name, value ); + + return null; } }); Index: /CKEditor/trunk/_source/core/dom/range.js =================================================================== --- /CKEditor/trunk/_source/core/dom/range.js (revision 6356) +++ /CKEditor/trunk/_source/core/dom/range.js (revision 6357) @@ -1793,5 +1793,5 @@ // Check if elements path at both boundaries are editable. - return !( checkNodesEditable( startNode, endNode ) && checkNodesEditable( endNode, startNode ) ) + return !( checkNodesEditable( startNode, endNode ) && checkNodesEditable( endNode, startNode ) ); }; })(), Index: /CKEditor/trunk/_source/plugins/placeholder/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/placeholder/plugin.js (revision 6356) +++ /CKEditor/trunk/_source/plugins/placeholder/plugin.js (revision 6357) @@ -156,4 +156,6 @@ else editor.insertElement( element ); + + return null; }, Index: /CKEditor/trunk/_source/plugins/styles/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/styles/plugin.js (revision 6356) +++ /CKEditor/trunk/_source/plugins/styles/plugin.js (revision 6357) @@ -929,5 +929,5 @@ } - var nonWhitespaces = CKEDITOR.dom.walker.whitespaces( true ); + var nonWhitespaces = CKEDITOR.dom.walker.whitespaces( 1 ); /** * Merge a
block with a previous sibling if available. @@ -1185,5 +1185,4 @@ } - var nonWhitespaces = CKEDITOR.dom.walker.whitespaces( 1 ); // If the element has no more attributes, remove it. function removeNoAttribsElement( element ) Index: /CKEditor/trunk/_source/plugins/tabletools/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/tabletools/plugin.js (revision 6356) +++ /CKEditor/trunk/_source/plugins/tabletools/plugin.js (revision 6357) @@ -232,4 +232,6 @@ selectionOrRow.remove(); } + + return null; } Index: /CKEditor/trunk/_source/plugins/wysiwygarea/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/wysiwygarea/plugin.js (revision 6356) +++ /CKEditor/trunk/_source/plugins/wysiwygarea/plugin.js (revision 6357) @@ -75,5 +75,5 @@ if ( $sel.type == 'Control' ) $sel.clear(); - else if ( selection.getType() == CKEDITOR.SELECTION_TEXT ) + else if ( selection.getType() == CKEDITOR.SELECTION_TEXT ) { // Due to IE bugs on handling contenteditable=false blocks @@ -81,6 +81,6 @@ // delete the selection first. - range = selection.getRanges()[0], - endContainer = range && range.endContainer; + range = selection.getRanges()[ 0 ]; + var endContainer = range && range.endContainer; if ( endContainer && @@ -98,9 +98,9 @@ $sel.createRange().pasteHTML( data ); } - catch (e) {} + catch (e) {} if ( selIsLocked ) this.getSelection().lock(); - } + } else this.document.$.execCommand( 'inserthtml', false, data ); @@ -630,5 +630,5 @@ var type = element.getAttribute( 'type' ); if ( type == 'submit' || type == 'reset' ) - evt.data.preventDefault() + evt.data.preventDefault(); } });