Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/318448
Change subject: Use upstream Target#setMode functionality
......................................................................
Use upstream Target#setMode functionality
Change-Id: I2fcda6ca7d82d880101d9ba2a027d4ef066aa238
Depends-On: I9d501cb77c714fbd299b5816d302b0bdde7833cd
---
M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
2 files changed, 13 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/48/318448/1
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/ve.init.mw.ArticleTarget.js
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index d7635d0..996f3d2 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
@@ -165,6 +164,11 @@
/**
* @inheritdoc
*/
+ve.init.mw.ArticleTarget.static.modes = [ 'visual', 'source' ];
+
+/**
+ * @inheritdoc
+ */
ve.init.mw.ArticleTarget.static.name = 'article';
/**
@@ -189,19 +193,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: newchange
Gerrit-Change-Id: I2fcda6ca7d82d880101d9ba2a027d4ef066aa238
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
