X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fwysiwygarea%2Fplugin.js;h=e626aada71776c345d8966eebe1b60ef62a627c9;hb=refs%2Ftags%2Fv3.4.1;hp=deff9758a0d97424141adbdd2a8d417ef65ad35d;hpb=055b6b0792ce7dc53d47af606b367c04b927c2ab;p=ckeditor.git diff --git a/_source/plugins/wysiwygarea/plugin.js b/_source/plugins/wysiwygarea/plugin.js index deff975..e626aad 100644 --- a/_source/plugins/wysiwygarea/plugin.js +++ b/_source/plugins/wysiwygarea/plugin.js @@ -14,19 +14,30 @@ For licensing, see LICENSE.html or http://ckeditor.com/license var nonExitableElementNames = { table:1,pre:1 }; // Matching an empty paragraph at the end of document. - var emptyParagraphRegexp = /\s*<(p|div|address|h\d|center|li)[^>]*>\s*(?:]*>| |\u00A0| )?\s*(:?<\/\1>)?\s*(?=$|<\/body>)/gi; + var emptyParagraphRegexp = /\s*<(p|div|address|h\d|center)[^>]*>\s*(?:]*>| |\u00A0| )?\s*(:?<\/\1>)?(?=\s*$|<\/body>)/gi; var notWhitespaceEval = CKEDITOR.dom.walker.whitespaces( true ); + function checkReadOnly( selection ) + { + if ( selection.getType() == CKEDITOR.SELECTION_ELEMENT ) + return selection.getSelectedElement().isReadOnly(); + else + return selection.getCommonAncestor().isReadOnly(); + } + function onInsertHtml( evt ) { if ( this.mode == 'wysiwyg' ) { this.focus(); - this.fire( 'saveSnapshot' ); - var selection = this.getSelection(), - data = evt.data; + var selection = this.getSelection(); + if ( checkReadOnly( selection ) ) + return; + + var data = evt.data; + this.fire( 'saveSnapshot' ); if ( this.dataProcessor ) data = this.dataProcessor.toHtml( data ); @@ -39,9 +50,34 @@ For licensing, see LICENSE.html or http://ckeditor.com/license selection.unlock(); var $sel = selection.getNative(); + + // Delete control selections to avoid IE bugs on pasteHTML. if ( $sel.type == 'Control' ) $sel.clear(); - $sel.createRange().pasteHTML( data ); + else if ( selection.getType() == CKEDITOR.SELECTION_TEXT ) + { + // Due to IE bugs on handling contenteditable=false blocks + // (#6005), we need to make some checks and eventually + // delete the selection first. + + var range = selection.getRanges()[0], + endContainer = range && range.endContainer; + + if ( endContainer && + endContainer.type == CKEDITOR.NODE_ELEMENT && + endContainer.getAttribute( 'contenteditable' ) == 'false' && + range.checkBoundaryOfElement( endContainer, CKEDITOR.END ) ) + { + range.setEndAfter( range.endContainer ); + range.deleteContents(); + } + } + + try + { + $sel.createRange().pasteHTML( data ); + } + catch (e) {} if ( selIsLocked ) this.getSelection().lock(); @@ -70,15 +106,18 @@ For licensing, see LICENSE.html or http://ckeditor.com/license if ( this.mode == 'wysiwyg' ) { this.focus(); + + var selection = this.getSelection(); + if ( checkReadOnly( selection ) ) + return; + this.fire( 'saveSnapshot' ); - var element = evt.data, + var ranges = selection.getRanges(), + element = evt.data, elementName = element.getName(), isBlock = CKEDITOR.dtd.$block[ elementName ]; - var selection = this.getSelection(), - ranges = selection.getRanges(); - var selIsLocked = selection.isLocked; if ( selIsLocked ) @@ -163,7 +202,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license function restoreDirty( editor ) { if ( !editor.checkDirty() ) - setTimeout( function(){ editor.resetDirty(); } ); + setTimeout( function(){ editor.resetDirty(); }, 0 ); } var isNotWhitespace = CKEDITOR.dom.walker.whitespaces( true ), @@ -209,12 +248,21 @@ For licensing, see LICENSE.html or http://ckeditor.com/license { restoreDirty( editor ); + // Memorize scroll position to restore it later (#4472). + var hostDocument = editor.element.getDocument(); + var hostDocumentElement = hostDocument.getDocumentElement(); + var scrollTop = hostDocumentElement.$.scrollTop; + var scrollLeft = hostDocumentElement.$.scrollLeft; + // Simulating keyboard character input by dispatching a keydown of white-space text. var keyEventSimulate = doc.$.createEvent( "KeyEvents" ); keyEventSimulate.initKeyEvent( 'keypress', true, true, win.$, false, false, false, false, 0, 32 ); doc.$.dispatchEvent( keyEventSimulate ); + if ( scrollTop != hostDocumentElement.$.scrollTop || scrollLeft != hostDocumentElement.$.scrollLeft ) + hostDocument.getWindow().$.scrollTo( scrollLeft, scrollTop ); + // Restore the original document status by placing the cursor before a bogus br created (#5021). bodyChildsNum && body.getFirst().remove(); doc.getBody().appendBogus(); @@ -377,6 +425,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license ' allowTransparency="true"' + '>' ); + // Running inside of Firefox chrome the load event doesn't bubble like in a normal page (#5689) + if ( document.location.protocol == 'chrome:' ) + CKEDITOR.event.useCapture = true; + // With FF, it's better to load the data on iframe.load. (#3894,#4058) iframe.on( 'load', function( ev ) { @@ -391,7 +443,34 @@ For licensing, see LICENSE.html or http://ckeditor.com/license doc.close(); }); + // Reset adjustment back to default (#5689) + if ( document.location.protocol == 'chrome:' ) + CKEDITOR.event.useCapture = false; + + // The container must be visible when creating the iframe in FF (#5956) + var element = editor.element, + isHidden = CKEDITOR.env.gecko && !element.isVisible(), + previousStyles = {}; + if ( isHidden ) + { + element.show(); + previousStyles = { + position : element.getStyle( 'position' ), + top : element.getStyle( 'top' ) + }; + element.setStyles( { position : 'absolute', top : '-3000px' } ); + } + mainElement.append( iframe ); + + if ( isHidden ) + { + setTimeout( function() + { + element.hide(); + element.setStyles( previousStyles ); + }, 1000 ); + } }; // The script that launches the bootstrap logic on 'domReady', so the document @@ -493,6 +572,14 @@ For licensing, see LICENSE.html or http://ckeditor.com/license } ); } + // Prevent the browser opening links in read-only blocks. (#6032) + domDocument.on( 'click', function( ev ) + { + ev = ev.data; + if ( ev.getTarget().is( 'a' ) && ev.$.button != 2 ) + ev.preventDefault(); + }); + // Webkit: avoid from editing form control elements content. if ( CKEDITOR.env.webkit ) { @@ -840,7 +927,14 @@ For licensing, see LICENSE.html or http://ckeditor.com/license { if ( isLoadingData ) isPendingFocus = true; - else if ( editor.window ) + // Temporary solution caused by #6025, supposed be unified by #6154. + else if ( CKEDITOR.env.opera && editor.document ) + { + editor.document.getBody().focus(); + + editor.selectionChange(); + } + else if ( !CKEDITOR.env.opera && editor.window ) { editor.window.focus(); @@ -933,7 +1027,13 @@ For licensing, see LICENSE.html or http://ckeditor.com/license if ( element.type == CKEDITOR.NODE_ELEMENT && ( element.is( 'input' ) || element.is( 'textarea' ) ) ) { - element.setAttribute( 'contentEditable', false ); + if ( !element.isReadOnly() ) + { + element.setAttribute( 'contentEditable', false ); + // We should flag that the element was locked by our code so + // it'll be editable by the editor functions (#6046). + element.setCustomData( '_cke_notReadOnly', 1 ); + } } });