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 "Use cloneWithData"

Browse source
This commit is contained in:
jenkins-bot 2016-05-30 21:21:46 +00:00 committed by Gerrit Code Review
parent 0f61ca8196 35c0a0dc69
commit d5ad1d3ff8
3 changed files with 10 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
modules/ve-mw/dm/models/ve.dm.MWImageModel.js
View file

@ -821,26 +821,12 @@ ve.dm.MWImageModel.prototype.getCurrentDimensions = function () {
*/ */
ve.dm.MWImageModel.prototype.getCaptionDocument = function () { ve.dm.MWImageModel.prototype.getCaptionDocument = function () {
if ( !this.captionDoc ) { if ( !this.captionDoc ) {
this.captionDoc = new ve.dm.Document( this.captionDoc = this.parentDoc.cloneWithData( [
[ { type: 'paragraph', internal: { generated: 'wrapper' } },
{ type: 'paragraph', internal: { generated: 'wrapper' } }, { type: '/paragraph' },
{ type: '/paragraph' }, { type: 'internalList' },
{ type: 'internalList' }, { type: '/internalList' }
{ type: '/internalList' } ] );
],
// htmlDocument
this.parentDoc.getHtmlDocument(),
// parentDocument
null,
// internalList
null,
// innerWhitespace
null,
// lang
this.parentDoc.getLang(),
// dir
this.parentDoc.getDir()
);
} }
return this.captionDoc; return this.captionDoc;
}; };

3
modules/ve-mw/ui/dialogs/ve.ui.MWExtensionPreviewDialog.js
View file

@ -55,7 +55,8 @@ ve.ui.MWExtensionPreviewDialog.prototype.getSetupProcess = function ( data ) {
doc = this.selectedNode.getDocument().cloneFromRange( this.selectedNode.getOuterRange() ); doc = this.selectedNode.getDocument().cloneFromRange( this.selectedNode.getOuterRange() );
} else { } else {
element = this.getNewElement(); element = this.getNewElement();
doc = new ve.dm.Document( [ // We assume that WindowAction pass
doc = data.fragment.getDocument().cloneWithData( [
element, element,
{ type: '/' + element.type }, { type: '/' + element.type },
{ type: 'internalList' }, { type: 'internalList' },

9
modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
View file

@ -1271,17 +1271,12 @@ ve.ui.MWMediaDialog.prototype.resetCaption = function () {
if ( this.imageModel ) { if ( this.imageModel ) {
captionDocument = this.imageModel.getCaptionDocument(); captionDocument = this.imageModel.getCaptionDocument();
} else { } else {
captionDocument = new ve.dm.Document( [ captionDocument = doc.cloneWithData( [
{ type: 'paragraph', internal: { generated: 'wrapper' } }, { type: 'paragraph', internal: { generated: 'wrapper' } },
{ type: '/paragraph' }, { type: '/paragraph' },
{ type: 'internalList' }, { type: 'internalList' },
{ type: '/internalList' } { type: '/internalList' }
], ] );
// The ve.dm.Document constructor expects
// ( data, htmlDocument, parentDocument, internalList, innerWhitespace, lang, dir )
// as parameters. We are only interested in setting up language, hence the
// multiple 'null' values.
null, null, null, null, doc.getLang(), doc.getDir() );
} }
this.store = doc.getStore(); this.store = doc.getStore();