wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-27 04:06:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Add templates from toolbar"

Browse source
This commit is contained in:
jenkins-bot 2013-06-19 00:27:08 +00:00 committed by Gerrit Code Review
parent 3d5c6f8b0f 4a7503ac10
commit 89cc6f21fb
3 changed files with 29 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
View file

@ -202,7 +202,9 @@ ve.init.mw.ViewPageTarget.compatibility = {
ve.init.mw.ViewPageTarget.static.toolbarTools = [
{ 'items': ['undo', 'redo'] },
{ 'items': ['mwFormat'] },
{ 'items': ['bold', 'italic', 'mwLink', 'clear', 'mwMediaInsert', 'mwReference'] },
{ 'items': [
'bold', 'italic', 'mwLink', 'clear', 'mwMediaInsert', 'mwReference', 'mwTransclusion'
] },
{ 'items': ['number', 'bullet', 'outdent', 'indent'] }
];

2
modules/ve/ui/dialogs/ve.ui.MWReferenceDialog.js
View file

@ -38,7 +38,7 @@ ve.ui.MWReferenceDialog.static.modelClasses = [ ve.dm.MWReferenceNode ];
ve.ui.MWReferenceDialog.static.toolbarTools = [
{ 'items': ['undo', 'redo'] },
{ 'items': ['mwFormat'] },
{ 'items': ['bold', 'italic', 'mwLink', 'clear', 'mwMediaInsert'] }
{ 'items': ['bold', 'italic', 'mwLink', 'clear', 'mwMediaInsert', 'mwTransclusion'] }
];
ve.ui.MWReferenceDialog.static.surfaceCommands = [

44
modules/ve/ui/dialogs/ve.ui.MWTransclusionDialog.js
View file

@ -78,8 +78,6 @@ ve.ui.MWTransclusionDialog.prototype.initialize = function () {
* Handle frame open events.
*
* @method
* @throws {Error} If the surface doesn't have a focused node
* @throws {Error} If the focused node is not a transclusion
*/
ve.ui.MWTransclusionDialog.prototype.onOpen = function () {
// Parent method
@ -87,19 +85,18 @@ ve.ui.MWTransclusionDialog.prototype.onOpen = function () {
// Sanity check
this.node = this.surface.getView().getFocusedNode();
if ( !this.node ) {
throw new Error( 'Surface does not have a focused node' );
}
if ( !( this.node instanceof ve.ce.MWTransclusionNode ) ) {
throw new Error( 'Focused node is not a transclusion' );
}
// Properties
this.transclusion = new ve.dm.MWTransclusionModel();
// Initialization
this.transclusion.load( ve.copyObject( this.node.getModel().getAttribute( 'mw' ) ) )
.always( ve.bind( this.setupPages, this ) );
if ( this.node instanceof ve.ce.MWTransclusionNode ) {
this.transclusion.load( ve.copyObject( this.node.getModel().getAttribute( 'mw' ) ) )
.always( ve.bind( this.setupPages, this ) );
} else {
this.transclusion.addPlaceholder();
this.setupPages();
}
};
/**
@ -108,19 +105,25 @@ ve.ui.MWTransclusionDialog.prototype.onOpen = function () {
* @param {string} action Action that caused the window to be closed
*/
ve.ui.MWTransclusionDialog.prototype.onClose = function ( action ) {
var surfaceModel = this.surface.getModel();
var surfaceModel = this.surface.getModel(),
obj = this.transclusion.getPlainObject();
// Save changes
if ( action === 'apply' ) {
// TODO: Wrap attribute changes in ve.dm.SurfaceFragment
surfaceModel.change(
ve.dm.Transaction.newFromAttributeChanges(
surfaceModel.getDocument(),
this.node.getOffset(),
{ 'mw': this.transclusion.getPlainObject() }
)
);
if ( this.node instanceof ve.ce.MWTransclusionNode ) {
surfaceModel.getFragment().changeAttributes( { 'mw': obj } );
} else {
surfaceModel.getFragment().collapseRangeToEnd().insertContent( [
{
'type': 'mwTransclusionInline',
'attributes': {
'mw': obj
}
},
{ 'type': '/mwTransclusionInline' }
] );
}
}
this.clearPages();
@ -337,6 +340,9 @@ ve.ui.MWTransclusionDialog.prototype.setupPages = function () {
} else if ( part instanceof ve.dm.MWTransclusionContentModel ) {
// Add wikitext page
this.addPage( part.getId(), this.getContentPage( part ) );
} else if ( part instanceof ve.dm.MWTemplatePlaceholderModel ) {
// Add template placeholder page
this.addPage( part.getId(), this.getPlaceholderPage( part ) );
}
}