X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fwysiwygarea%2Fplugin.js;h=5ea1f1aaed438cc26459d302b5ee96bc92e6bada;hb=039a051ccf3901311661022a30afd60fc38130c9;hp=deff9758a0d97424141adbdd2a8d417ef65ad35d;hpb=055b6b0792ce7dc53d47af606b367c04b927c2ab;p=ckeditor.git diff --git a/_source/plugins/wysiwygarea/plugin.js b/_source/plugins/wysiwygarea/plugin.js index deff975..5ea1f1a 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*(:?<\/\2>)?\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(); @@ -56,6 +92,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license var marker = this.document.getById( 'cke_paste_marker' ); marker.scrollIntoView(); marker.remove(); + marker = null; } CKEDITOR.tools.setTimeout( function() @@ -70,15 +107,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 ) @@ -93,14 +133,14 @@ For licensing, see LICENSE.html or http://ckeditor.com/license // Remove the original contents. range.deleteContents(); - clone = !i && element || element.clone( true ); + clone = !i && element || element.clone( 1 ); // If we're inserting a block at dtd-violated position, split // the parent blocks until we reach blockLimit. var current, dtd; if ( isBlock ) { - while ( ( current = range.getCommonAncestor( false, true ) ) + while ( ( current = range.getCommonAncestor( 0, 1 ) ) && ( dtd = CKEDITOR.dtd[ current.getName() ] ) && !( dtd && dtd [ elementName ] ) ) { @@ -163,7 +203,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 +249,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 +426,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 +444,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 @@ -451,7 +531,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license CKEDITOR.env.gecko && CKEDITOR.tools.setTimeout( activateEditing, 0, null, editor ); - domWindow = editor.window = new CKEDITOR.dom.window( domWindow ); + domWindow = editor.window = new CKEDITOR.dom.window( domWindow ); domDocument = editor.document = new CKEDITOR.dom.document( domDocument ); domDocument.on( 'dblclick', function( evt ) @@ -463,7 +543,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license }); // Gecko/Webkit need some help when selecting control type elements. (#3448) - if ( !( CKEDITOR.env.ie || CKEDITOR.env.opera) ) + if ( !( CKEDITOR.env.ie || CKEDITOR.env.opera ) ) { domDocument.on( 'mousedown', function( ev ) { @@ -493,6 +573,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 ) { @@ -538,6 +626,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license editor.focusManager.blur(); }); + var wasFocused; + domWindow.on( 'focus', function() { var doc = editor.document; @@ -546,6 +636,15 @@ For licensing, see LICENSE.html or http://ckeditor.com/license blinkCursor(); else if ( CKEDITOR.env.opera ) doc.getBody().focus(); + // Webkit needs focus for the first time on the HTML element. (#6153) + else if ( CKEDITOR.env.webkit ) + { + if ( !wasFocused ) + { + editor.document.getDocumentElement().focus(); + wasFocused = 1; + } + } editor.focusManager.focus(); }); @@ -786,9 +885,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license if ( editor.dataProcessor ) data = editor.dataProcessor.toDataFormat( data, fixForBody ); - // Strip the last blank paragraph within document. + // Reset empty if the document contains only one empty paragraph. if ( config.ignoreEmptyParagraph ) - data = data.replace( emptyParagraphRegexp, '' ); + data = data.replace( emptyParagraphRegexp, function( match, lookback ) { return lookback; } ); if ( docType ) data = docType + '\n' + data; @@ -840,7 +939,18 @@ 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 ) + { + // Required for Opera when switching focus + // from another iframe, e.g. panels. (#6444) + var iframe = editor.window.$.frameElement; + iframe.blur(), iframe.focus(); + editor.document.getBody().focus(); + + editor.selectionChange(); + } + else if ( !CKEDITOR.env.opera && editor.window ) { editor.window.focus(); @@ -858,7 +968,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license var titleBackup; // Setting voice label as window title, backup the original one // and restore it before running into use. - editor.on( 'contentDom', function () + editor.on( 'contentDom', function() { var title = editor.document.getElementsByTag( 'title' ).getItem( 0 ); title.setAttribute( '_cke_title', editor.document.$.title ); @@ -876,6 +986,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license selectors.push( 'html.CSS1Compat ' + tag + '[contenteditable=false]' ); editor.addCss( selectors.join( ',' ) + '{ display:inline-block;}' ); } + // Set the HTML style to 100% to have the text cursor in affect (#6341) + else if ( CKEDITOR.env.gecko ) + editor.addCss( 'html { height: 100% !important; }' ); // Switch on design mode for a short while and close it after then. function blinkCursor( retry ) @@ -884,10 +997,11 @@ For licensing, see LICENSE.html or http://ckeditor.com/license function() { editor.document.$.designMode = 'on'; - setTimeout( function () + setTimeout( function() { editor.document.$.designMode = 'off'; - editor.document.getBody().focus(); + if ( CKEDITOR.currentInstance == editor ) + editor.document.getBody().focus(); }, 50 ); }, function() @@ -933,7 +1047,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 ); + } } }); @@ -943,7 +1063,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license // Fixing Firefox 'Back-Forward Cache' break design mode. (#4514) if ( CKEDITOR.env.gecko ) { - ( function () + (function() { var body = document.body;