jenkins-bot has submitted this change and it was merged.
Change subject: Update VE core submodule to master (9ac8136)
......................................................................
Update VE core submodule to master (9ac8136)
New changes:
9929b6d [BREAKING CHANGE] Make ve.init.target an OO.ui.Element
Local changes:
* Fix target constructors now they generate this.$element
Change-Id: Ia6bf604c67305834a3f73863a10336cfbb83fa77
---
M lib/ve
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
M modules/ve-mw/init/ve.init.mw.Target.js
M modules/ve-mw/tests/ve.test.utils.js
M modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
6 files changed, 8 insertions(+), 11 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/ve b/lib/ve
index 17c36e7..9ac8136 160000
--- a/lib/ve
+++ b/lib/ve
-Subproject commit 17c36e74ecb684c3466f20721bca585f4f5c6b2c
+Subproject commit 9ac81365d2469e3416e70ef81476d1e16a594e21
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
index 766ffce..33bc04d 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
@@ -30,6 +30,7 @@
targetPromise = mw.loader.using(
'ext.visualEditor.viewPageTarget' )
.then( function () {
var target = new
ve.init.mw.ViewPageTarget();
+ $( '#content' ).append( target.$element
);
// Transfer methods
ve.init.mw.ViewPageTarget.prototype.setupSectionEditLinks =
init.setupSectionLinks;
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index 68054f9..8b52807 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -23,11 +23,7 @@
conf = mw.config.get( 'wgVisualEditorConfig' );
// Parent constructor
- ve.init.mw.Target.call(
- this, $( '#content' ),
- mw.config.get( 'wgRelevantPageName' ),
- currentUri.query.oldid
- );
+ ve.init.mw.Target.call( this, mw.config.get( 'wgRelevantPageName' ),
currentUri.query.oldid );
// Properties
this.toolbarSaveButton = null;
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js
b/modules/ve-mw/init/ve.init.mw.Target.js
index ba287e8..9b79b64 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -14,14 +14,13 @@
* @extends ve.init.Target
*
* @constructor
- * @param {jQuery} $container Container to render target into
* @param {string} pageName Name of target page
* @param {number} [revisionId] If the editor should load a revision of the
page, pass the
* revision id here. Defaults to loading the latest version (see #load).
*/
-ve.init.mw.Target = function VeInitMwTarget( $container, pageName, revisionId
) {
+ve.init.mw.Target = function VeInitMwTarget( pageName, revisionId ) {
// Parent constructor
- ve.init.Target.call( this, $container, { shadow: true, actions: true,
floatable: true } );
+ ve.init.Target.call( this, { shadow: true, actions: true, floatable:
true } );
var conf = mw.config.get( 'wgVisualEditorConfig' );
diff --git a/modules/ve-mw/tests/ve.test.utils.js
b/modules/ve-mw/tests/ve.test.utils.js
index be51a62..815e52b 100644
--- a/modules/ve-mw/tests/ve.test.utils.js
+++ b/modules/ve-mw/tests/ve.test.utils.js
@@ -10,9 +10,10 @@
ve.init.platform.initialized = $.Deferred();
// HACK: MW targets are async and heavy, use an SA target but
// override the global registration
- var target = new ve.init.sa.Target( $( '#qunit-fixture' ) ),
- mwTarget = new ve.init.mw.Target( $( '<div>' ).appendTo( $(
'#qunit-fixture' ) ) );
+ var target = new ve.init.sa.Target(),
+ mwTarget = new ve.init.mw.Target();
+ $( '#qunit-fixture' ).append( target.$element );
target.addSurface( doc );
ve.init.platform.initialized.resolve();
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
index caf58c2..4317439 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
@@ -9,7 +9,7 @@
* Dialog for editing MediaWiki page information.
*
* @class
- * @extends OO.ui.ProcessDialog
+ * @extends ve.ui.FragmentDialog
*
* @constructor
* @param {Object} [config] Configuration options
--
To view, visit https://gerrit.wikimedia.org/r/178670
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6bf604c67305834a3f73863a10336cfbb83fa77
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
