Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/225650
Change subject: [PULL THROUGH] Rename MWSurfaceWidget to MWTargetWidget
......................................................................
[PULL THROUGH] Rename MWSurfaceWidget to MWTargetWidget
Depends on Ib019df8b in core.
Bug: T94066
Change-Id: If578e15c1ee7effd5ca1d6073521a6c59caac255
---
M .jsduck/eg-iframe.html
M extension.json
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
D modules/ve-mw/ui/widgets/ve.ui.MWSurfaceWidget.js
A modules/ve-mw/ui/widgets/ve.ui.MWTargetWidget.js
6 files changed, 61 insertions(+), 61 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/50/225650/1
diff --git a/.jsduck/eg-iframe.html b/.jsduck/eg-iframe.html
index d184564..cd1f4fc 100644
--- a/.jsduck/eg-iframe.html
+++ b/.jsduck/eg-iframe.html
@@ -48,7 +48,7 @@
<link rel=stylesheet
href="lib/ve/src/ui/styles/contextitems/ve.ui.TableContextItem.css"
class="stylesheet-ve">
<link rel=stylesheet
href="lib/ve/src/ui/styles/ve.ui.Overlay.css" class="stylesheet-ve">
<link rel=stylesheet
href="lib/ve/src/ui/styles/ve.ui.Surface.css" class="stylesheet-ve">
- <link rel=stylesheet
href="lib/ve/src/ui/styles/widgets/ve.ui.SurfaceWidget.css"
class="stylesheet-ve">
+ <link rel=stylesheet
href="lib/ve/src/ui/styles/widgets/ve.ui.TargetWidget.css"
class="stylesheet-ve">
<link rel=stylesheet
href="lib/ve/src/ui/styles/ve.ui.TableContext.css" class="stylesheet-ve">
<link rel=stylesheet
href="lib/ve/src/ui/styles/ve.ui.Toolbar.css" class="stylesheet-ve">
@@ -367,7 +367,7 @@
<script
src="lib/ve/src/ui/widgets/ve.ui.LanguageResultWidget.js"></script>
<script
src="lib/ve/src/ui/dialogs/ve.ui.LanguageSearchDialog.js"></script>
<script
src="lib/ve/src/ui/widgets/ve.ui.LanguageInputWidget.js"></script>
- <script
src="lib/ve/src/ui/widgets/ve.ui.SurfaceWidget.js"></script>
+ <script
src="lib/ve/src/ui/widgets/ve.ui.TargetWidget.js"></script>
<script
src="lib/ve/src/ui/widgets/ve.ui.LinkAnnotationWidget.js"></script>
<script
src="lib/ve/src/ui/widgets/ve.ui.ContextSelectWidget.js"></script>
<script
src="lib/ve/src/ui/widgets/ve.ui.ContextOptionWidget.js"></script>
diff --git a/extension.json b/extension.json
index 07cb25c..78e117f 100644
--- a/extension.json
+++ b/extension.json
@@ -675,7 +675,7 @@
"lib/ve/src/ui/datatransferhandlers/ve.ui.HTMLFileTransferHandler.js",
"lib/ve/src/ui/windowmanagers/ve.ui.ToolbarDialogWindowManager.js",
"lib/ve/src/ui/widgets/ve.ui.AlignWidget.js",
- "lib/ve/src/ui/widgets/ve.ui.SurfaceWidget.js",
+ "lib/ve/src/ui/widgets/ve.ui.TargetWidget.js",
"lib/ve/src/ui/widgets/ve.ui.LinkAnnotationWidget.js",
"lib/ve/src/ui/widgets/ve.ui.ContextSelectWidget.js",
"lib/ve/src/ui/widgets/ve.ui.ContextOptionWidget.js",
@@ -729,7 +729,7 @@
"lib/ve/src/ui/styles/widgets/ve.ui.MediaSizeWidget.css",
"lib/ve/src/ui/styles/inspectors/ve.ui.CommentInspector.css",
"lib/ve/src/ui/styles/inspectors/ve.ui.FragmentInspector.css",
-
"lib/ve/src/ui/styles/widgets/ve.ui.SurfaceWidget.css",
+
"lib/ve/src/ui/styles/widgets/ve.ui.TargetWidget.css",
"lib/ve/src/ui/styles/ve.ui.ContextItem.css",
"lib/ve/src/ui/styles/contextitems/ve.ui.AlignableContextItem.css",
"lib/ve/src/ui/styles/contextitems/ve.ui.CommentContextItem.css",
@@ -911,7 +911,7 @@
"modules/ve-mw/ui/ve.ui.MWCommandRegistry.js",
"modules/ve-mw/ui/ve.ui.MWSequenceRegistry.js",
"modules/ve-mw/ui/commands/ve.ui.MWWikitextWarningCommand.js",
-
"modules/ve-mw/ui/widgets/ve.ui.MWSurfaceWidget.js",
+
"modules/ve-mw/ui/widgets/ve.ui.MWTargetWidget.js",
"modules/ve-mw/ui/widgets/ve.ui.MWTocItemWidget.js",
"modules/ve-mw/ui/widgets/ve.ui.MWTocWidget.js",
"modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js",
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
index cd50a11..8c8ea4d 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
@@ -903,8 +903,8 @@
// Only check 'changed' status after the model has finished
// building itself
if ( !this.isSettingUpModel ) {
- if ( this.captionSurface && this.captionSurface.getSurface() ) {
- captionChanged =
this.captionSurface.getSurface().getModel().hasBeenModified();
+ if ( this.captionTarget && this.captionTarget.getSurface() ) {
+ captionChanged =
this.captionTarget.getSurface().getModel().hasBeenModified();
}
if (
@@ -998,7 +998,7 @@
// HACK: OO.ui.Dialog needs an API for this
this.$content.removeClass(
'oo-ui-dialog-content-footless' );
// Focus the caption surface
- this.captionSurface.focus();
+ this.captionTarget.focus();
break;
case 'search':
this.setSize( 'larger' );
@@ -1101,10 +1101,10 @@
var captionDocument,
doc = this.getFragment().getDocument();
- if ( this.captionSurface ) {
+ if ( this.captionTarget ) {
// Reset the caption surface if it already exists
- this.captionSurface.destroy();
- this.captionSurface = null;
+ this.captionTarget.destroy();
+ this.captionTarget = null;
this.captionNode = null;
}
// Get existing caption. We only do this in setup, because the caption
@@ -1144,8 +1144,8 @@
this.store = doc.getStore();
- // Set up the caption surface
- this.captionSurface = new ve.ui.MWSurfaceWidget(
+ // Set up the caption target
+ this.captionTarget = new ve.ui.MWTargetWidget(
captionDocument,
{
tools: ve.init.target.constructor.static.toolbarGroups,
@@ -1155,11 +1155,11 @@
);
// Initialization
- this.captionFieldset.$element.append( this.captionSurface.$element );
- this.captionSurface.initialize();
+ this.captionFieldset.$element.append( this.captionTarget.$element );
+ this.captionTarget.initialize();
// Events
- this.captionSurface.getSurface().getModel().connect( this, {
+ this.captionTarget.getSurface().getModel().connect( this, {
history: this.checkChanged.bind( this )
} );
};
@@ -1175,7 +1175,7 @@
this.search.getQuery().focus().select();
} else {
// Focus the caption surface
- this.captionSurface.focus();
+ this.captionTarget.focus();
}
// Revalidate size
this.sizeWidget.validateDimensions();
@@ -1195,8 +1195,8 @@
this.imageModel.disconnect( this );
this.sizeWidget.disconnect( this );
}
- this.captionSurface.destroy();
- this.captionSurface = null;
+ this.captionTarget.destroy();
+ this.captionTarget = null;
this.captionNode = null;
this.imageModel = null;
}, this );
@@ -1238,7 +1238,7 @@
// Update from the form
this.imageModel.setAltText(
this.altTextInput.getValue() );
this.imageModel.setCaptionDocument(
-
this.captionSurface.getSurface().getModel().getDocument()
+
this.captionTarget.getSurface().getModel().getDocument()
);
// TODO: Simplify this condition
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
index 2929bf2..415dc2c 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
@@ -146,7 +146,7 @@
*/
ve.ui.MWReferenceDialog.prototype.canApply = function () {
return this.documentHasContent() &&
- (
this.referenceSurface.getSurface().getModel().hasBeenModified() ||
+ (
this.referenceTarget.getSurface().getModel().hasBeenModified() ||
this.referenceGroupInput.input.getValue() !==
this.originalGroup );
};
@@ -197,7 +197,7 @@
if ( this.useExisting ) {
this.search.getQuery().focus().select();
} else {
- this.referenceSurface.focus();
+ this.referenceTarget.focus();
}
}, this );
};
@@ -236,12 +236,12 @@
}
// Cleanup
- if ( this.referenceSurface ) {
- this.referenceSurface.destroy();
+ if ( this.referenceTarget ) {
+ this.referenceTarget.destroy();
}
// Properties
- this.referenceSurface = new ve.ui.MWSurfaceWidget(
+ this.referenceTarget = new ve.ui.MWTargetWidget(
this.referenceModel.getDocument(),
{
tools: ve.copy( ve.init.mw.Target.static.toolbarGroups
),
@@ -252,15 +252,15 @@
);
// Events
- this.referenceSurface.getSurface().getModel().connect( this, {
+ this.referenceTarget.getSurface().getModel().connect( this, {
history: this.onSurfaceHistory.bind( this )
} );
// Initialization
this.originalGroup = this.referenceModel.getGroup();
this.referenceGroupInput.input.setValue( this.originalGroup );
- this.contentFieldset.$element.append( this.referenceSurface.$element );
- this.referenceSurface.initialize();
+ this.contentFieldset.$element.append( this.referenceTarget.$element );
+ this.referenceTarget.initialize();
group = this.getFragment().getDocument().getInternalList()
.getNodeGroup( this.referenceModel.getListGroup() );
@@ -417,8 +417,8 @@
return ve.ui.MWReferenceDialog.super.prototype.getTeardownProcess.call(
this, data )
.first( function () {
this.search.getQuery().setValue( '' );
- this.referenceSurface.destroy();
- this.referenceSurface = null;
+ this.referenceTarget.destroy();
+ this.referenceTarget = null;
this.referenceModel = null;
}, this );
};
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWSurfaceWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWSurfaceWidget.js
deleted file mode 100644
index 17d5397..0000000
--- a/modules/ve-mw/ui/widgets/ve.ui.MWSurfaceWidget.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/*!
- * VisualEditor UserInterface MWSurfaceWidget class.
- *
- * @copyright 2011-2015 VisualEditor Team and others; see AUTHORS.txt
- * @license The MIT License (MIT); see LICENSE.txt
- */
-
-/**
- * Creates an ve.ui.MWSurfaceWidget object.
- *
- * @class
- * @abstract
- * @extends ve.ui.SurfaceWidget
- *
- * @constructor
- * @param {ve.dm.Document} doc Document model
- * @param {Object} [config] Configuration options
- */
-ve.ui.MWSurfaceWidget = function VeUiMWSurfaceWidget( doc, config ) {
- // Parent constructor
- ve.ui.MWSurfaceWidget.super.call( this, doc, config );
-
- // Initialization
- this.$element.addClass( 've-ui-mwSurfaceWidget' );
- this.surface.getView().$element.addClass( 'mw-body-content' );
- this.surface.$placeholder.addClass( 'mw-body-content' );
-};
-
-/* Inheritance */
-
-OO.inheritClass( ve.ui.MWSurfaceWidget, ve.ui.SurfaceWidget );
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWTargetWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWTargetWidget.js
new file mode 100644
index 0000000..4cdef63
--- /dev/null
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWTargetWidget.js
@@ -0,0 +1,31 @@
+/*!
+ * VisualEditor UserInterface MWTargetWidget class.
+ *
+ * @copyright 2011-2015 VisualEditor Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+ */
+
+/**
+ * Creates an ve.ui.MWTargetWidget object.
+ *
+ * @class
+ * @abstract
+ * @extends ve.ui.TargetWidget
+ *
+ * @constructor
+ * @param {ve.dm.Document} doc Document model
+ * @param {Object} [config] Configuration options
+ */
+ve.ui.MWTargetWidget = function VeUiMWTargetWidget( doc, config ) {
+ // Parent constructor
+ ve.ui.MWTargetWidget.super.call( this, doc, config );
+
+ // Initialization
+ this.$element.addClass( 've-ui-mwTargetWidget' );
+ this.surface.getView().$element.addClass( 'mw-body-content' );
+ this.surface.$placeholder.addClass( 'mw-body-content' );
+};
+
+/* Inheritance */
+
+OO.inheritClass( ve.ui.MWTargetWidget, ve.ui.TargetWidget );
--
To view, visit https://gerrit.wikimedia.org/r/225650
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If578e15c1ee7effd5ca1d6073521a6c59caac255
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
