Ticket #4543: 4543.patch
File 4543.patch, 2.3 KB (added by , 14 years ago) |
---|
-
_source/plugins/wysiwygarea/plugin.js
187 187 whitespaceGuard = CKEDITOR.dom.walker.whitespaces( true ), 188 188 previousElement = fixedBlock.getPrevious( whitespaceGuard ), 189 189 nextElement = fixedBlock.getNext( whitespaceGuard ), 190 enterBlock;190 destBlock; 191 191 if ( previousElement && previousElement.getName 192 && !( previousElement.getName() in nonExitableElementNames ) ) 193 enterBlock = previousElement; 192 && !( previousElement.getName() in nonExitableElementNames ) 193 && range.moveToElementEditStart( previousElement, true ) ) 194 destBlock = previousElement; 194 195 else if ( nextElement && nextElement.getName 195 && !( nextElement.getName() in nonExitableElementNames ) ) 196 enterBlock = nextElement; 196 && !( nextElement.getName() in nonExitableElementNames ) 197 && range.moveToElementEditStart( nextElement, true ) ) 198 destBlock = nextElement; 197 199 198 200 // Not all blocks are editable, e.g. <hr />, further checking it.(#3994) 199 201 if( ( !count 200 202 || ( firstChild = children.getItem( 0 ) ) && firstChild.is && firstChild.is( 'br' ) ) 201 && enterBlock 202 && range.moveToElementEditStart( enterBlock ) ) 203 && destBlock ) 203 204 { 204 205 fixedBlock.remove(); 206 range.moveToElementEditStart( destBlock ); 205 207 range.select(); 206 208 } 207 209 } -
_source/core/dom/range.js
1587 1587 * @param {CKEDITOR.dom.element} targetElement The element into which 1588 1588 * look for the editing spot. 1589 1589 */ 1590 moveToElementEditStart : function( targetElement )1590 moveToElementEditStart : function( targetElement, justTry ) 1591 1591 { 1592 1592 var editableElement; 1593 1593 … … 1603 1603 1604 1604 if ( editableElement ) 1605 1605 { 1606 this.moveToPosition(editableElement, CKEDITOR.POSITION_AFTER_START);1606 !justTry && this.moveToPosition( editableElement, CKEDITOR.POSITION_AFTER_START ); 1607 1607 return true; 1608 1608 } 1609 1609 else