Merge "Use new MWInlineExtensionNode and DM node construction"

This commit is contained in:
jenkins-bot 2014-06-07 03:47:54 +00:00 committed by Gerrit Code Review
commit 09359385b4
2 changed files with 8 additions and 9 deletions

View file

@ -11,7 +11,7 @@
* ContentEditable MediaWiki math node. * ContentEditable MediaWiki math node.
* *
* @class * @class
* @extends ve.ce.MWExtensionNode * @extends ve.ce.MWInlineExtensionNode
* *
* @constructor * @constructor
* @param {ve.dm.MWMathNode} model Model to observe * @param {ve.dm.MWMathNode} model Model to observe
@ -19,7 +19,7 @@
*/ */
ve.ce.MWMathNode = function VeCeMWMathNode( model, config ) { ve.ce.MWMathNode = function VeCeMWMathNode( model, config ) {
// Parent constructor // Parent constructor
ve.ce.MWExtensionNode.call( this, model, config ); ve.ce.MWInlineExtensionNode.call( this, model, config );
// DOM changes // DOM changes
this.$element.addClass( 've-ce-mwMathNode' ); this.$element.addClass( 've-ce-mwMathNode' );
@ -27,7 +27,7 @@ ve.ce.MWMathNode = function VeCeMWMathNode( model, config ) {
/* Inheritance */ /* Inheritance */
OO.inheritClass( ve.ce.MWMathNode, ve.ce.MWExtensionNode ); OO.inheritClass( ve.ce.MWMathNode, ve.ce.MWInlineExtensionNode );
/* Static Properties */ /* Static Properties */

View file

@ -11,20 +11,19 @@
* DataModel MediaWiki math node. * DataModel MediaWiki math node.
* *
* @class * @class
* @extends ve.dm.MWExtensionNode * @extends ve.dm.MWInlineExtensionNode
* *
* @constructor * @constructor
* @param {number} [length] Length of content data (ignored, forced to 0) * @param {Object} [element]
* @param {Object} [element] Reference to element in linear model
*/ */
ve.dm.MWMathNode = function VeDmMWMathNode( length, element ) { ve.dm.MWMathNode = function VeDmMWMathNode() {
// Parent constructor // Parent constructor
ve.dm.MWExtensionNode.call( this, 0, element ); ve.dm.MWInlineExtensionNode.apply( this, arguments );
}; };
/* Inheritance */ /* Inheritance */
OO.inheritClass( ve.dm.MWMathNode, ve.dm.MWExtensionNode ); OO.inheritClass( ve.dm.MWMathNode, ve.dm.MWInlineExtensionNode );
/* Static members */ /* Static members */