jenkins-bot has submitted this change and it was merged.
Change subject: Update VE core submodule to master (e4c8003)
......................................................................
Update VE core submodule to master (e4c8003)
New changes:
e4c8003 Bring in target 'mode' property from MW
Local changes:
Use upstream Target#setMode functionality
Depends-On: I9d501cb77c714fbd299b5816d302b0bdde7833cd
Change-Id: I2fcda6ca7d82d880101d9ba2a027d4ef066aa238
---
M lib/ve
M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
M modules/ve-mw/init/targets/ve.init.mw.DesktopWikitextArticleTarget.js
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
5 files changed, 25 insertions(+), 20 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/ve b/lib/ve
index 8bdf0f7..e4c8003 160000
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit 8bdf0f796b4fba3e748c4b9697cf84a5b4cb4a3e
+Subproject commit e4c8003349ae01ba19215a3fa059a5dede9964b2
diff --git a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css
b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css
index 2c5b4e0..9065a74 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css
@@ -51,7 +51,7 @@
text-decoration: none;
}
-.ve-init-mw-articleTarget-source .catlinks {
+.ve-init-target-source .catlinks {
display: none;
}
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index b34d03c..d18c2a6 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -150,10 +150,22 @@
return
mw.libs.ve.targetLoader.loadModules();
} )
.then( function () {
- var target;
+ var target,
+ modes = [];
+
+ if ( init.isVisualAvailable ) {
+ modes.push( 'visual' );
+ }
+
+ if ( init.isWikitextAvailable ) {
+ modes.push( 'source' );
+ }
target =
ve.init.mw.targetFactory.create(
- conf.contentModels[
mw.config.get( 'wgPageContentModel' ) ]
+ conf.contentModels[
mw.config.get( 'wgPageContentModel' ) ], {
+ modes: modes,
+ mode: mode
+ }
);
target.setContainer( $( '#content' ) );
targetLoaded = true;
@@ -163,13 +175,12 @@
} );
}
- targetPromise.then( function ( target ) {
+ targetPromise.then( function () {
// Enqueue the loading of deferred modules (that is,
modules which provide
// functionality that is not needed for loading the
editor).
setTimeout( function () {
mw.loader.load( 'easy-deflate.deflate' );
}, 500 );
- target.setMode( mode );
} );
return targetPromise;
diff --git
a/modules/ve-mw/init/targets/ve.init.mw.DesktopWikitextArticleTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.DesktopWikitextArticleTarget.js
index 2facd2f..17588d7 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopWikitextArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopWikitextArticleTarget.js
@@ -424,6 +424,6 @@
// Parent method
ve.ui.MWEditModeVisualTool.super.prototype.onUpdateState.apply( this,
arguments );
- this.setDisabled( !mw.libs.ve.isVisualAvailable );
+ this.setDisabled( ve.init.target.modes.indexOf( 'visual' ) === -1 );
};
ve.ui.toolFactory.register( ve.ui.MWEditModeVisualTool );
diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index d7635d0..18c7197 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -39,7 +39,6 @@
this.pageName = pageName;
this.pageExists = mw.config.get( 'wgRelevantArticleId', 0 ) !== 0;
this.toolbarScrollOffset = mw.config.get(
'wgVisualEditorToolbarScrollOffset', 0 );
- this.mode = config.mode || 'visual';
this.section = null;
// Sometimes we actually don't want to send a useful oldid
@@ -189,19 +188,14 @@
/* Methods */
/**
- * Set editing mode
- *
- * @param {string} mode Editing mode, 'visual' or 'source'
+ * @inheritdoc
*/
-ve.init.mw.ArticleTarget.prototype.setMode = function ( mode ) {
- if ( mode !== this.mode ) {
- // The follow classes are used here:
- // * ve-init-mw-articleTarget-visual
- // * ve-init-mw-articleTarget-source
- this.$element
- .removeClass( 've-init-mw-articleTarget-' + this.mode )
- .addClass( 've-init-mw-articleTarget-' + mode );
- this.mode = mode;
+ve.init.mw.ArticleTarget.prototype.setMode = function () {
+ var oldMode = this.mode;
+ // Parent method
+ ve.init.mw.ArticleTarget.super.prototype.setMode.apply( this, arguments
);
+
+ if ( this.mode !== oldMode ) {
this.updateTabs( true );
}
};
--
To view, visit https://gerrit.wikimedia.org/r/318448
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2fcda6ca7d82d880101d9ba2a027d4ef066aa238
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
