Merge "Prevent adding content to aliens in IE"

This commit is contained in:
jenkins-bot 2013-03-26 23:04:41 +00:00 committed by Gerrit Code Review
commit a5dcf7cd1b
2 changed files with 5 additions and 1 deletions

View file

@ -19,7 +19,10 @@ ve.ce.AlienNode = function VeCeAlienNode( model ) {
// DOM Changes
this.$.addClass( 've-ce-alienNode' );
this.$.attr( 'contenteditable', false );
// ce="false" inside of ce="true" does not prevent editing in IE
// Strangely enough, ce="true" inside of ce="true" does.
this.$.attr( 'contenteditable', !!$.browser.msie );
// Events
this.model.addListenerMethod( this, 'update', 'onUpdate' );

View file

@ -182,6 +182,7 @@ ve.ce.Surface.prototype.documentOnFocus = function () {
ve.ce.Surface.prototype.documentOnBlur = function () {
this.$document.off( '.ve-ce-Surface' );
this.surfaceObserver.stop( true );
this.dragging = false;
};
/**