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

Merge "Make ve.ce.ProtectedNode use setup (for setup) and teardown (for teardown) events so it is going to work well after node is rewrapped (example: MWBlockImageNode)."

Browse source
This commit is contained in:
jenkins-bot 2013-05-15 17:31:53 +00:00 committed by Gerrit Code Review
parent 3bed4284dd 2a53329f0d
commit 44e0b7e345
1 changed files with 40 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,8 +19,10 @@ ve.ce.ProtectedNode = function VeCeProtectedNode() {
this.$shields = $( [] );
// Events
this.connect( this, { 'live': 'onProtectedLive' } );
this.$.on( 'mouseenter', ve.bind( this.onProtectedMouseEnter, this ) );
this.connect( this, {
'setup': 'onProtectedSetup',
'teardown': 'onProtectedTeardown'
} );
// Initialization
this.$.addClass( 've-ce-protectedNode' );
@ -57,39 +59,52 @@ ve.ce.ProtectedNode.static.$phantomTemplate = $( '<div>' )
/* Methods */
/**
* Handle live events.
* Handle setup events.
*
* @method
*/
ve.ce.ProtectedNode.prototype.onProtectedLive = function () {
ve.ce.ProtectedNode.prototype.onProtectedSetup = function () {
var $shield,
node = this,
$shieldTemplate = this.constructor.static.$shieldTemplate,
surfaceModel = this.getRoot().getSurface().getModel();
if ( this.isLive() ) {
// Events
surfaceModel.connect( this, { 'change': 'onSurfaceModelChange' } );
// Events
this.$.on( 'mouseenter.ve-ce-protectedNode', ve.bind( this.onProtectedMouseEnter, this ) );
surfaceModel.connect( this, { 'change': 'onSurfaceModelChange' } );
// Shields
this.$.add( this.$.find( '*' ) ).each( function () {
var $this = $( this );
if ( this.nodeType === Node.ELEMENT_NODE ) {
if (
( $this.css( 'float' ) === 'none' || $this.css( 'float' ) === '' ) &&
!$this.hasClass( 've-ce-protectedNode' )
) {
return;
}
$shield = $shieldTemplate.clone().appendTo( $this );
node.$shields = node.$shields.add( $shield );
// Shields
this.$.add( this.$.find( '*' ) ).each( function () {
var $this = $( this );
if ( this.nodeType === Node.ELEMENT_NODE ) {
if (
( $this.css( 'float' ) === 'none' || $this.css( 'float' ) === '' ) &&
!$this.hasClass( 've-ce-protectedNode' )
) {
return;
}
} );
} else {
surfaceModel.disconnect( this, { 'change': 'onSurfaceModelChange' } );
this.$shields.remove();
this.$shields = $( [] );
}
$shield = $shieldTemplate.clone().appendTo( $this );
node.$shields = node.$shields.add( $shield );
}
} );
};
/**
* Handle teardown events.
*
* @method
*/
ve.ce.ProtectedNode.prototype.onProtectedTeardown = function () {
var surfaceModel = this.getRoot().getSurface().getModel();
// Events
this.$.off( '.ve-ce-protectedNode' );
surfaceModel.disconnect( this, { 'change': 'onSurfaceModelChange' } );
// Shields
this.$shields.remove();
this.$shields = $( [] );
};
/**