X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Ffloatpanel%2Fplugin.js;h=505ecbd77ef0d952b19ce23f0c370bfc6f14da1c;hb=9afde8772159bd3436f1f5b7862960307710ae5a;hp=79c5197d1c8658ac5d07592175cb9671e474e881;hpb=941b0a9ba4e673e292510d80a5a86806994b8ea6;p=ckeditor.git diff --git a/_source/plugins/floatpanel/plugin.js b/_source/plugins/floatpanel/plugin.js index 79c5197..505ecbd 100644 --- a/_source/plugins/floatpanel/plugin.js +++ b/_source/plugins/floatpanel/plugin.js @@ -16,14 +16,8 @@ CKEDITOR.plugins.add( 'floatpanel', function getPanel( editor, doc, parentElement, definition, level ) { // Generates the panel key: docId-eleId-skinName-langDir[-uiColor][-CSSs][-level] - var key = - doc.getUniqueId() + - '-' + parentElement.getUniqueId() + - '-' + editor.skinName + - '-' + editor.lang.dir + - ( ( editor.uiColor && ( '-' + editor.uiColor ) ) || '' ) + - ( ( definition.css && ( '-' + definition.css ) ) || '' ) + - ( ( level && ( '-' + level ) ) || '' ); + var key = CKEDITOR.tools.genKey( doc.getUniqueId(), parentElement.getUniqueId(), editor.skinName, editor.lang.dir, + editor.uiColor || '', definition.css || '', level || '' ); var panel = panels[ key ]; @@ -46,7 +40,7 @@ CKEDITOR.plugins.add( 'floatpanel', { $ : function( editor, parentElement, definition, level ) { - definition.forceIFrame = true; + definition.forceIFrame = 1; var doc = parentElement.getDocument(), panel = getPanel( editor, doc, parentElement, definition, level || 0 ), @@ -66,6 +60,8 @@ CKEDITOR.plugins.add( 'floatpanel', children : [], dir : editor.lang.dir }; + + editor.on( 'mode', function(){ this.hide(); }, this ); }, proto : @@ -104,7 +100,7 @@ CKEDITOR.plugins.add( 'floatpanel', block = panel.showBlock( name ); this.allowBlur( false ); - isShowing = true; + isShowing = 1; var element = this.element, iframe = this._.iframe, @@ -130,11 +126,17 @@ CKEDITOR.plugins.add( 'floatpanel', element.setStyles( { top : top + 'px', - left : '-3000px', - opacity : '0', // FF3 is ignoring "visibility" + left: 0, display : '' }); + // Don't use display or visibility style because we need to + // calculate the rendering layout later and focus the element. + element.setOpacity( 0 ); + + // To allow the context menu to decrease back their width + element.getFirst().removeStyle( 'width' ); + // Configure the IFrame blur event. Do that only once. if ( !this._.blurSet ) { @@ -155,10 +157,10 @@ CKEDITOR.plugins.add( 'floatpanel', // the blur event may get fired even when focusing // inside the window itself, so we must ensure the // target is out of it. - var target = ev.data.getTarget(), - targetWindow = target.getWindow && target.getWindow(); - - if ( targetWindow && targetWindow.equals( focused ) ) + var target; + if ( CKEDITOR.env.ie && !this.allowBlur() + || ( target = ev.data.getTarget() ) + && target.getName && target.getName() != 'iframe' ) return; if ( this.visible && !this._.activeChild && !isShowing ) @@ -179,9 +181,10 @@ CKEDITOR.plugins.add( 'floatpanel', this._.blurSet = 1; } - panel.onEscape = CKEDITOR.tools.bind( function() + panel.onEscape = CKEDITOR.tools.bind( function( keystroke ) { - this.onEscape && this.onEscape(); + if ( this.onEscape && this.onEscape( keystroke ) === false ) + return false; }, this ); @@ -192,9 +195,34 @@ CKEDITOR.plugins.add( 'floatpanel', var panelLoad = CKEDITOR.tools.bind( function () { + var target = element.getFirst(); + if ( block.autoSize ) { - var target = element.getFirst(); + // We must adjust first the width or IE6 could include extra lines in the height computation + var widthNode = block.element.$; + + if ( CKEDITOR.env.gecko || CKEDITOR.env.opera ) + widthNode = widthNode.parentNode; + + if ( CKEDITOR.env.ie ) + widthNode = widthNode.document.body; + + var width = widthNode.scrollWidth; + // Account for extra height needed due to IE quirks box model bug: + // http://en.wikipedia.org/wiki/Internet_Explorer_box_model_bug + // (#3426) + if ( CKEDITOR.env.ie && CKEDITOR.env.quirks && width > 0 ) + width += ( target.$.offsetWidth || 0 ) - ( target.$.clientWidth || 0 ); + // A little extra at the end. + // If not present, IE6 might break into the next line, but also it looks better this way + width += 4 ; + + target.setStyle( 'width', width + 'px' ); + + // IE doesn't compute the scrollWidth if a filter is applied previously + block.element.addClass( 'cke_frameLoaded' ); + var height = block.element.$.scrollHeight; // Account for extra height needed due to IE quirks box model bug: @@ -209,7 +237,7 @@ CKEDITOR.plugins.add( 'floatpanel', panel._.currentBlock.element.setStyle( 'display', 'none' ).removeStyle( 'display' ); } else - element.getFirst().removeStyle( 'height' ); + target.removeStyle( 'height' ); var panelElement = panel.element, panelWindow = panelElement.getWindow(), @@ -227,47 +255,63 @@ CKEDITOR.plugins.add( 'floatpanel', left += ( panelSize.width * ( rtl ? 1 : -1 ) ); // Vertical off screen is simpler. - if( top + panelSize.height > viewportSize.height + windowScroll.y ) + if ( top + panelSize.height > viewportSize.height + windowScroll.y ) top -= panelSize.height; + // If IE is in RTL, we have troubles with absolute + // position and horizontal scrolls. Here we have a + // series of hacks to workaround it. (#6146) + if ( CKEDITOR.env.ie ) + { + var offsetParent = new CKEDITOR.dom.element( element.$.offsetParent ), + scrollParent = offsetParent; + + // Quirks returns , but standards returns . + if ( scrollParent.getName() == 'html' ) + scrollParent = scrollParent.getDocument().getBody(); + + if ( scrollParent.getComputedStyle( 'direction' ) == 'rtl' ) + { + // For IE8, there is not much logic on this, but it works. + if ( CKEDITOR.env.ie8Compat ) + left -= element.getDocument().getDocumentElement().$.scrollLeft * 2; + else + left -= ( offsetParent.$.scrollWidth - offsetParent.$.clientWidth ); + } + } + + // Trigger the onHide event of the previously active panel to prevent + // incorrect styles from being applied (#6170) + var innerElement = element.getFirst(), + activePanel; + if ( ( activePanel = innerElement.getCustomData( 'activePanel' ) ) ) + activePanel.onHide && activePanel.onHide.call( this, 1 ); + innerElement.setCustomData( 'activePanel', this ); + element.setStyles( { top : top + 'px', - left : left + 'px', - opacity : '1' + left : left + 'px' } ); - + element.setOpacity( 1 ); } , this ); panel.isLoaded ? panelLoad() : panel.onLoad = panelLoad; // Set the panel frame focus, so the blur event gets fired. CKEDITOR.tools.setTimeout( function() - { - if ( definition.voiceLabel ) - { - if ( CKEDITOR.env.gecko ) - { - var container = iframe.getParent(); - container.setAttribute( 'role', 'region' ); - container.setAttribute( 'title', definition.voiceLabel ); - iframe.setAttribute( 'role', 'region' ); - iframe.setAttribute( 'title', ' ' ); - } - } - - iframe.$.contentWindow.focus(); - // We need this get fired manually because of unfired focus() function. - this.allowBlur( true ); - - }, 0, this); - }, 0, this); + { + iframe.$.contentWindow.focus(); + // We need this get fired manually because of unfired focus() function. + this.allowBlur( true ); + }, 0, this); + }, CKEDITOR.env.air ? 200 : 0, this); this.visible = 1; if ( this.onShow ) this.onShow.call( this ); - isShowing = false; + isShowing = 0; }, hide : function() @@ -277,6 +321,7 @@ CKEDITOR.plugins.add( 'floatpanel', this.hideChild(); this.element.setStyle( 'display', 'none' ); this.visible = 0; + this.element.getFirst().removeCustomData( 'activePanel' ); } }, @@ -343,11 +388,11 @@ CKEDITOR.plugins.add( 'floatpanel', { var isLastInstance = CKEDITOR.tools.isEmpty( CKEDITOR.instances ); - for( var i in panels ) + for ( var i in panels ) { var panel = panels[ i ]; // Safe to destroy it since there're no more instances.(#4241) - if( isLastInstance ) + if ( isLastInstance ) panel.destroy(); // Panel might be used by other instances, just hide them.(#4552) else