wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-24 22:35:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply DOM changes in onProtectedSetup and onProtectedTeardown instead of constructor

Browse source 
It's important in case of replacing root element ($) of a node, so new element
does have CSS class and contenteditable property set.




Change-Id: Icf14e2164e89114e6b7c10672b782d02f4c5daac
This commit is contained in:
Inez Korczyński 2013-09-05 13:25:35 -07:00 committed by Inez
parent 27dfe83e6f
commit 301b287515
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/ve-mw/test/ce/ve.ce.ContentBranchNode.test.js
View file

@ -37,9 +37,8 @@ QUnit.test( 'getRenderedContents', function ( assert ) {
], ],
'html': 'a<b>b<span typeof="mw:Entity" class="ve-ce-leafNode ' + 'html': 'a<b>b<span typeof="mw:Entity" class="ve-ce-leafNode ' +
've-ce-mwEntityNode" contenteditable="false">c</span>d<span ' + 've-ce-mwEntityNode" contenteditable="false">c</span>d<span ' +
'class="ve-ce-leafNode ve-ce-protectedNode ve-ce-generatedContentNode ' + 'class="ve-ce-leafNode ve-ce-generatedContentNode ' +
've-ce-alienNode ve-ce-alienInlineNode" ' + 've-ce-alienNode ve-ce-alienInlineNode"><tt>e</tt></span></b>'
'contenteditable="false"><tt>e</tt></span></b>'
} }
]; ];
QUnit.expect( cases.length ); QUnit.expect( cases.length );

15
modules/ve/ce/ve.ce.ProtectedNode.js
View file

@ -26,11 +26,6 @@ ve.ce.ProtectedNode = function VeCeProtectedNode( $phantomable ) {
'setup': 'onProtectedSetup', 'setup': 'onProtectedSetup',
'teardown': 'onProtectedTeardown' 'teardown': 'onProtectedTeardown'
} ); } );
// DOM changes
this.$
.addClass( 've-ce-protectedNode' )
.prop( 'contentEditable', 'false' );
}; };
/* Static Properties */ /* Static Properties */
@ -85,6 +80,11 @@ ve.ce.ProtectedNode.prototype.onProtectedSetup = function () {
this.getRoot().getSurface().getSurface() this.getRoot().getSurface().getSurface()
.connect( this, { 'position': 'positionPhantoms' } ); .connect( this, { 'position': 'positionPhantoms' } );
// DOM changes
this.$
.addClass( 've-ce-protectedNode' )
.prop( 'contentEditable', 'false' );
// Shields // Shields
this.$.add( this.$.find( '*' ) ).each( function () { this.$.add( this.$.find( '*' ) ).each( function () {
var $this = $( this ); var $this = $( this );
@ -130,6 +130,11 @@ ve.ce.ProtectedNode.prototype.onProtectedTeardown = function () {
// Phantoms // Phantoms
this.clearPhantoms(); this.clearPhantoms();
// DOM changes
this.$
.removeClass( 've-ce-protectedNode' )
.removeProp( 'contentEditable' );
this.isSetup = false; this.isSetup = false;
}; };