Skip to content
Permalink
Browse files

Merge branch 't/11972'

  • Loading branch information...
Reinmar committed Jun 16, 2014
2 parents c6b36c2 + 702ca0f commit c151a1b9f497254d770041a66ffb7074c54851c5
Showing with 9 additions and 9 deletions.
  1. +1 −0 CHANGES.md
  2. +8 −9 core/dom/element.js
@@ -24,6 +24,7 @@ Fixed Issues:
* [#11387](http://dev.ckeditor.com/ticket/11387): Fixed: `role="radiogroup"` should be applied only to radio inputs' container.
* [#7975](http://dev.ckeditor.com/ticket/7975): [IE8] Fixed: Errors when trying to select empty table cell on IE8.
* [#11947](http://dev.ckeditor.com/ticket/11947): [FF+IE11] Fixed: Shift+Enter in lists produces two line breaks.
* [#11972](http://dev.ckeditor.com/ticket/11972): Fixed: Feature detection in the [`element.setText()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-setText) method should not trigger layout engine.

## CKEditor 4.4.1

@@ -469,16 +469,15 @@ CKEDITOR.tools.extend( CKEDITOR.dom.element.prototype, {
* @param {String} text The text to be set.
* @returns {String} The inserted text.
*/
setText: function( text ) {
CKEDITOR.dom.element.prototype.setText = ( this.$.innerText != undefined ) ?
function( text ) {
return this.$.innerText = text;
} : function( text ) {
return this.$.textContent = text;
};
setText: ( function() {
var supportsTextContent = document.createElement( 'p' );
supportsTextContent.innerHTML = 'x';
supportsTextContent = supportsTextContent.textContent;

return this.setText( text );
},
return function( text ) {
this.$[ supportsTextContent ? 'textContent' : 'innerText' ] = text;
};
} )(),

/**
* Gets the value of an element attribute.

0 comments on commit c151a1b

Please sign in to comment.
You can’t perform that action at this time.