golem/Math
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Update VE implementation to use model-only inpsectors"

Browse Source
This commit is contained in:
jenkins-bot 2014-04-15 23:25:08 +00:00 committed by Gerrit Code Review
commit 49eb59a43b
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
modules/VisualEditor/ve.ui.MWMathInspector.js
View File

@ -14,12 +14,11 @@
* @extends ve.ui.MWExtensionInspector * @extends ve.ui.MWExtensionInspector
* *
* @constructor * @constructor
* @param {ve.ui.WindowSet} windowSet Window set this inspector is part of
* @param {Object} [config] Configuration options * @param {Object} [config] Configuration options
*/ */
ve.ui.MWMathInspector = function VeUiMWMathInspector( windowSet, config ) { ve.ui.MWMathInspector = function VeUiMWMathInspector( config ) {
// Parent constructor // Parent constructor
ve.ui.MWExtensionInspector.call( this, windowSet, config ); ve.ui.MWExtensionInspector.call( this, config );
this.onChangeHandler = ve.debounce( ve.bind( this.updatePreview, this ), 250 ); this.onChangeHandler = ve.debounce( ve.bind( this.updatePreview, this ), 250 );
}; };
@ -46,9 +45,13 @@ ve.ui.MWMathInspector.static.nodeModel = ve.dm.MWMathNode;
* Update the math node rendering to reflect the content entered into the inspector. * Update the math node rendering to reflect the content entered into the inspector.
*/ */
ve.ui.MWMathInspector.prototype.updatePreview = function () { ve.ui.MWMathInspector.prototype.updatePreview = function () {
var newsrc = this.input.getValue(); var mwData = ve.copy( this.node.getAttribute( 'mw' ) ),
newsrc = this.input.getValue();
mwData.body.extsrc = newsrc;
if ( this.visible ) { if ( this.visible ) {
this.node.update( { 'extsrc': newsrc } ); this.getFragment().changeAttributes( { 'mw': mwData } );
} }
}; };
@ -59,28 +62,30 @@ ve.ui.MWMathInspector.prototype.setup = function ( data ) {
// Parent method // Parent method
ve.ui.MWExtensionInspector.prototype.setup.call( this, data ); ve.ui.MWExtensionInspector.prototype.setup.call( this, data );
var mw, surfaceModel = this.surface.getModel(); this.getFragment().getSurface().pushStaging();
this.node = this.surface.getView().getFocusedNode(); var mwData;
if ( !this.node ) {
this.node = this.getFragment().getSelectedNode();
if ( !this.node || !( this.node instanceof ve.dm.MWMathNode ) ) {
// Create a dummy node, needed for live preview // Create a dummy node, needed for live preview
mw = { mwData = {
'name': 'math', 'name': 'math',
'attrs': {}, 'attrs': {},
'body': { 'body': {
'extsrc': '' 'extsrc': ''
} }
}; };
surfaceModel.getFragment().collapseRangeToEnd().insertContent( [ this.getFragment().collapseRangeToEnd().insertContent( [
{ {
'type': 'mwMath', 'type': 'mwMath',
'attributes': { 'attributes': {
'mw': mw 'mw': mwData
} }
}, },
{ 'type': '/mwMath' } { 'type': '/mwMath' }
] ); ] );
this.node = this.surface.getView().getFocusedNode(); this.node = this.getFragment().getSelectedNode();
} }
this.input.on( 'change', this.onChangeHandler ); this.input.on( 'change', this.onChangeHandler );
@ -95,21 +100,20 @@ ve.ui.MWMathInspector.prototype.setup = function ( data ) {
*/ */
ve.ui.MWMathInspector.prototype.teardown = function ( data ) { ve.ui.MWMathInspector.prototype.teardown = function ( data ) {
var newsrc = this.input.getValue(), var newsrc = this.input.getValue(),
surfaceModel = this.surface.getModel(); surfaceModel = this.getFragment().getSurface();
this.input.off( 'change', this.onChangeHandler ); this.input.off( 'change', this.onChangeHandler );
if ( newsrc !== '' ) { this.getFragment().getSurface().applyStaging();
// Parent method
ve.ui.MWExtensionInspector.prototype.teardown.call( this, data ); if ( newsrc === '' ) {
} else {
// The user tried to empty the node, remove it // The user tried to empty the node, remove it
surfaceModel.change( ve.dm.Transaction.newFromRemoval( surfaceModel.change( ve.dm.Transaction.newFromRemoval(
surfaceModel.getDocument(), this.node.getOuterRange() surfaceModel.getDocument(), this.node.getOuterRange()
) ); ) );
// Grandparent method; we're overriding the parent behavior in this case
ve.ui.Inspector.prototype.teardown.call( this, data );
} }
// Grandparent method; we're overriding the parent behavior with applyStaging
ve.ui.Inspector.prototype.teardown.call( this, data );
}; };
/* Registration */ /* Registration */