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

(bug 42134) Add shields after node is attached to the live DOM

Browse source 
This changeset introduces new variable property of ve.ce.Node called "live", which stores information whether or not given node is attached to the live DOM. When the value of this property changes event "live" is called.

Change-Id: I6d0ce923c25ff2c4015914f367582c9a15e62c65
This commit is contained in:
Inez Korczyński 2012-11-15 14:17:04 -08:00
parent 55a5c35a14
commit ebbd297841
4 changed files with 55 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
modules/ve/ce/nodes/ve.ce.AlienBlockNode.js
View file

@ -24,6 +24,7 @@ ve.ce.AlienBlockNode = function VeCeAlienBlockNode( model ) {
// Events
this.model.addListenerMethod( this, 'update', 'onUpdate' );
this.$.on( 'mouseenter', ve.bind( this.onMouseEnter, this ) );
this.addListenerMethod( this, 'live', 'onLive' );
// Initialization
this.onUpdate();
@ -48,21 +49,26 @@ ve.ce.AlienBlockNode.rules = {
/* Methods */
ve.ce.AlienBlockNode.prototype.onUpdate = function () {
var $shieldTemplate = this.constructor.static.$shieldTemplate;
this.$.html( this.model.getAttribute( 'html' ) );
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-alienBlockNode' )
) {
return;
ve.ce.AlienBlockNode.prototype.onLive = function (live) {
if( this.live === true ) {
var $shieldTemplate = this.constructor.static.$shieldTemplate;
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-alienBlockNode' )
) {
return;
}
$this.append( $shieldTemplate.clone() );
}
$this.append( $shieldTemplate.clone() );
}
} );
} );
}
};
ve.ce.AlienBlockNode.prototype.onUpdate = function () {
this.$.html( this.model.getAttribute( 'html' ) );
};
ve.ce.AlienBlockNode.prototype.onMouseEnter = function () {

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

@ -167,6 +167,7 @@ ve.ce.BranchNode.prototype.onSplice = function ( index ) {
removals[i].detach();
// Update DOM
removals[i].$.detach();
removals[i].setLive( false );
}
if ( args.length >= 3 ) {
if ( index ) {
@ -180,6 +181,9 @@ ve.ce.BranchNode.prototype.onSplice = function ( index ) {
} else {
this.$.prepend( args[i].$ );
}
if ( this.live !== args[i].isLive() ) {
args[i].setLive( this.live );
}
}
}
@ -251,3 +255,14 @@ ve.ce.BranchNode.prototype.clean = function () {
}
this.setupSlugs();
};
/**
* @method
*/
ve.ce.BranchNode.prototype.setLive = function ( live ) {
this.live = live;
this.emit( 'live' );
for ( var i = 0; i < this.children.length; i++ ) {
this.children[i].setLive( live );
}
};

18
modules/ve/ce/ve.ce.Node.js
View file

@ -24,6 +24,8 @@ ve.ce.Node = function VeCeNode( type, model, $element ) {
this.model = model;
this.$ = $element || $( '<div>' );
this.parent = null;
// Holds the information about whether or not the node is attached to the live DOM
this.live = false;
this.$.data( 'node', this );
@ -231,3 +233,19 @@ ve.ce.Node.getSplitableNode = function ( node ) {
return splitableNode;
};
/**
* @method
* @returns {Boolean} Node is attached to the live DOM
*/
ve.ce.Node.prototype.isLive = function () {
return this.live;
};
/**
* @method
*/
ve.ce.Node.prototype.setLive = function ( live ) {
this.live = live;
this.emit( 'live' );
};

2
modules/ve/ve.Surface.js
View file

@ -39,6 +39,8 @@ ve.Surface = function VeSurface( parent, dom, options ) {
);
// Initialization
// Propagate to each node information that it is live (attached to the live DOM)
this.view.getDocument().getDocumentNode().setLive( true );
this.setupToolbars();
this.setupCommands();
ve.instances.push( this );