Ticket #1603: 1603.patch
File 1603.patch, 2.6 KB (added by , 16 years ago) |
---|
-
_whatsnew.html
57 57 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/339">#339</a>] [<a 58 58 target="_blank" href="http://dev.fckeditor.net/ticket/681">#681</a>] The SpellerPages 59 59 spell checker will now completely ignore the presence of HTML tags in the text.</li> 60 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1603">#1603</a>] Certain 61 specific markup was making FCKeditor entering in a loop, blocking its execution.</li> 60 62 </ul> 61 63 <p> 62 64 <a href="_whatsnew_history.html">See previous versions history</a> -
editor/_source/classes/fckdomrangeiterator.js
125 125 break ; 126 126 } 127 127 128 // The range must finish right before the boundary, 129 // including possibly skipped empty spaces. (#1603) 130 if ( range ) 131 range.SetEnd( currentNode, 3, true ) ; 132 128 133 closeRange = true ; 129 134 } 130 135 else … … 181 186 } 182 187 183 188 currentNode = parentNode ; 189 includeNode = true ; 184 190 isLast = ( currentNode == lastNode ) ; 185 191 continueFromSibling = true ; 186 192 } -
editor/_source/classes/fckelementpath.js
46 46 47 47 if ( FCKListsLib.PathBlockLimitElements[ sElementName ] != null ) 48 48 { 49 // DIV is considered the Block, if no block is available (#525). 50 if ( !eBlock && sElementName == 'div' ) 49 // DIV is considered the Block, if no block is available (#525) 50 // and if it doesn't contain other blocks. 51 if ( !eBlock && sElementName == 'div' && !FCKElementPath._CheckHasBlock( e ) ) 51 52 eBlock = e ; 52 53 else 53 54 eBlockLimit = e ; … … 67 68 this.Elements = aElements ; 68 69 } 69 70 70 71 /** 72 * Check if an element contains any block element. 73 */ 74 FCKElementPath._CheckHasBlock = function( element ) 75 { 76 var childNodes = element.childNodes ; 77 78 for ( var i = 0, count = childNodes.length ; i < count ; i++ ) 79 { 80 var child = childNodes[i] ; 81 82 if ( child.nodeType == 1 && FCKListsLib.BlockElements[ child.nodeName.toLowerCase() ] ) 83 return true ; 84 } 85 86 return false ; 87 } 88 No newline at end of file