Ticket #2616: 2616.patch

File 2616.patch, 1.9 KB (added by Alfonso Martínez de Lizarrondo, 11 years ago)

Proposed patch

  • _whatsnew.html

     
    104104                        after being defocused.</li>
    105105                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2611">#2611</a>] Fixed an extra slash
    106106                        on quickupload of the asp connector.</li>
     107                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2616">#2616</a>] Fixed another situation
     108                        where new elements were inserted at the beginning of the content.</li>
    107109        </ul>
    108110        <p>
    109111                <a href="_whatsnew_history.html">See previous versions history</a></p>
  • editor/_source/internals/fckdialog.js

     
    9494                                TopWindow : topWindow
    9595                        }
    9696
    97                         FCK.ToolbarSet.CurrentInstance.Selection.Save() ;
     97                        FCK.ToolbarSet.CurrentInstance.Selection.Save( true ) ;
    9898
    9999                        // Calculate the dialog position, centering it on the screen.
    100100                        var viewSize = FCKTools.GetViewPaneSize( topWindow ) ;
  • editor/_source/internals/fckselection_ie.js

     
    210210        return FCK.EditorDocument.selection ;
    211211}
    212212
    213 FCKSelection.Save = function()
     213FCKSelection.Save = function( lock )
    214214{
    215215        var editorDocument = FCK.EditorDocument ;
    216216
    217217        if ( !editorDocument )
    218218                return ;
    219219
     220        // Avoid saving again a selection while a dialog is open #2616
     221        if ( this.locked )
     222                return ;
     223        this.locked = !!lock ;
     224
    220225        var selection = editorDocument.selection ;
    221226        var range ;
    222227
     
    277282
    278283FCKSelection.Release = function()
    279284{
     285        this.locked = false ;
    280286        delete this.SelectionData ;
    281287}
© 2003 – 2019 CKSource – Frederico Knabben. All rights reserved. | Terms of use | Privacy policy