jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332652 )
Change subject: Update VE core submodule to master (f0dcedb) ...................................................................... Update VE core submodule to master (f0dcedb) New changes: 5b448fa [BREAKING CHANGE] Merge Mobile/DesktopSurface into Surface 2d8959b Localisation updates from https://translatewiki.net. 7eee772 Follow-up 2d8959b: Fix build for added language 'io' f0dcedb ve.dm.TableMatrix: Really indent ASCII-art comments Change-Id: I62708f7caeb03b16cd318aab0b0ee3c674e75a26 --- M .jsduck/eg-iframe.html M extension.json M lib/ve M modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js M modules/ve-mw/init/ve.init.mw.Target.js R modules/ve-mw/ui/styles/ve.ui.MWWikitextSurface.css D modules/ve-mw/ui/ve.ui.MWDesktopWikitextSurface.js M modules/ve-mw/ui/ve.ui.MWMobileSurface.js A modules/ve-mw/ui/ve.ui.MWWikitextSurface.js 9 files changed, 59 insertions(+), 70 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/.jsduck/eg-iframe.html b/.jsduck/eg-iframe.html index 1ec68dd..fe70f76 100644 --- a/.jsduck/eg-iframe.html +++ b/.jsduck/eg-iframe.html @@ -467,7 +467,6 @@ <script src="lib/ve/src/ui/pages/ve.ui.SpecialCharacterPage.js"></script> <!-- visualEditor.desktop.build --> - <script src="lib/ve/src/ui/ve.ui.DesktopSurface.js"></script> <script src="lib/ve/src/ui/contexts/ve.ui.DesktopContext.js"></script> <script src="lib/ve/src/ui/windowmanagers/ve.ui.DesktopInspectorWindowManager.js"></script> diff --git a/extension.json b/extension.json index 03c95a8..520a339 100644 --- a/extension.json +++ b/extension.json @@ -1072,7 +1072,6 @@ }, "ext.visualEditor.core.desktop": { "scripts": [ - "lib/ve/src/ui/ve.ui.DesktopSurface.js", "lib/ve/src/ui/contexts/ve.ui.DesktopContext.js", "lib/ve/src/ui/windowmanagers/ve.ui.DesktopInspectorWindowManager.js" ], @@ -1088,14 +1087,12 @@ }, "ext.visualEditor.core.mobile": { "scripts": [ - "lib/ve/src/ui/ve.ui.MobileSurface.js", "lib/ve/src/ui/contexts/ve.ui.MobileContext.js", "lib/ve/src/ui/contextitems/ve.ui.MobileTableCellContextItem.js", "lib/ve/src/ui/windowmanagers/ve.ui.MobileWindowManager.js" ], "styles": [ - "lib/ve/src/ui/styles/ve.ui.MobileContext.css", - "lib/ve/src/ui/styles/ve.ui.MobileSurface.css" + "lib/ve/src/ui/styles/ve.ui.MobileContext.css" ], "dependencies": [ "ext.visualEditor.core" @@ -1783,12 +1780,12 @@ "modules/ve-mw/ui/ve.ui.MWWikitextCommandRegistry.js", "modules/ve-mw/ui/ve.ui.MWWikitextSequenceRegistry.js", "modules/ve-mw/ui/ve.ui.MWWikitextDataTransferHandlerFactory.js", - "modules/ve-mw/ui/ve.ui.MWDesktopWikitextSurface.js", + "modules/ve-mw/ui/ve.ui.MWWikitextSurface.js", "modules/ve-mw/ui/actions/ve.ui.MWWikitextAction.js", "modules/ve-mw/ui/inspectors/ve.ui.MWWikitextLinkAnnotationInspector.js" ], "styles": [ - "modules/ve-mw/ui/styles/ve.ui.MWDesktopWikitextSurface.css" + "modules/ve-mw/ui/styles/ve.ui.MWWikitextSurface.css" ], "dependencies": [ "ext.visualEditor.mwlink", diff --git a/lib/ve b/lib/ve index 6eba2e2..f0dcedb 160000 --- a/lib/ve +++ b/lib/ve @@ -1 +1 @@ -Subproject commit 6eba2e2f4c1eb3470ceea44e7313d37a84687acd +Subproject commit f0dcedb7c3b2aaaf403a02d383e5cf7c3b6e92c2 diff --git a/modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js b/modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js index 2a3eb8d..178ddef 100644 --- a/modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js +++ b/modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js @@ -112,13 +112,6 @@ /** * @inheritdoc */ -ve.init.mw.MobileArticleTarget.prototype.createSurface = function ( dmDoc, config ) { - return new ve.ui.MobileSurface( dmDoc, this.getSurfaceConfig( config ) ); -}; - -/** - * @inheritdoc - */ ve.init.mw.MobileArticleTarget.prototype.getSaveButtonLabel = function () { if ( mw.config.get( 'wgEditSubmitButtonLabelPublish' ) ) { return OO.ui.deferMsg( 'visualeditor-savedialog-label-publish-short' ); diff --git a/modules/ve-mw/init/ve.init.mw.Target.js b/modules/ve-mw/init/ve.init.mw.Target.js index ff1b4e6..ff05065 100644 --- a/modules/ve-mw/init/ve.init.mw.Target.js +++ b/modules/ve-mw/init/ve.init.mw.Target.js @@ -278,7 +278,7 @@ dataTransferHandlerFactory: ve.ui.wikitextDataTransferHandlerFactory, importRules: importRules } ) ); - return new ve.ui.MWDesktopWikitextSurface( dmDoc, config ); + return new ve.ui.MWWikitextSurface( dmDoc, config ); } // Parent method diff --git a/modules/ve-mw/ui/styles/ve.ui.MWDesktopWikitextSurface.css b/modules/ve-mw/ui/styles/ve.ui.MWWikitextSurface.css similarity index 60% rename from modules/ve-mw/ui/styles/ve.ui.MWDesktopWikitextSurface.css rename to modules/ve-mw/ui/styles/ve.ui.MWWikitextSurface.css index 6298d96..35bd796 100644 --- a/modules/ve-mw/ui/styles/ve.ui.MWDesktopWikitextSurface.css +++ b/modules/ve-mw/ui/styles/ve.ui.MWWikitextSurface.css @@ -1,16 +1,16 @@ /*! - * VisualEditor MediaWiki Initialization DesktopWikitextSurface styles. + * VisualEditor MediaWiki Initialization WikitextSurface styles. * * @copyright 2011-2017 VisualEditor Team and others; see AUTHORS.txt * @license The MIT License (MIT); see LICENSE.txt */ -.ve-ui-mwDesktopWikitextSurface .ve-ce-documentNode { +.ve-ui-mwWikitextSurface .ve-ce-documentNode { font-size: 13.3333px; /* Inherit mw-editfont setting instead of default source mode setting */ font-family: inherit; } -.ve-ui-mwDesktopWikitextSurface .ve-ce-paragraphNode { +.ve-ui-mwWikitextSurface .ve-ce-paragraphNode { line-height: 20px; } diff --git a/modules/ve-mw/ui/ve.ui.MWDesktopWikitextSurface.js b/modules/ve-mw/ui/ve.ui.MWDesktopWikitextSurface.js deleted file mode 100644 index 8fe7802..0000000 --- a/modules/ve-mw/ui/ve.ui.MWDesktopWikitextSurface.js +++ /dev/null @@ -1,49 +0,0 @@ -/*! - * VisualEditor UserInterface MWDesktopWikitextSurface class. - * - * @copyright 2011-2017 VisualEditor Team and others; see http://ve.mit-license.org - */ - -/** - * A surface is a top-level object which contains both a surface model and a surface view. - * This is the mobile version of the surface. - * - * @class - * @extends ve.ui.DesktopSurface - * - * @constructor - * @param {HTMLDocument|Array|ve.dm.LinearData|ve.dm.Document} dataOrDoc Document data to edit - * @param {Object} [config] Configuration options - */ -ve.ui.MWDesktopWikitextSurface = function VeUiMWDesktopWikitextSurface() { - // Parent constructor - ve.ui.MWDesktopWikitextSurface.super.apply( this, arguments ); - - // Initialization - // The following classes can be used here: - // * mw-editfont-default - // * mw-editfont-monospace - // * mw-editfont-sans-serif - // * mw-editfont-serif - this.getView().$element.addClass( 've-ui-mwDesktopWikitextSurface mw-editfont-' + mw.user.options.get( 'editfont' ) ); -}; - -/* Inheritance */ - -OO.inheritClass( ve.ui.MWDesktopWikitextSurface, ve.ui.DesktopSurface ); - -/* Methods */ - -/** - * @inheritdoc - */ -ve.ui.MWDesktopWikitextSurface.prototype.createModel = function ( doc ) { - return new ve.dm.MWWikitextSurface( doc ); -}; - -/** - * @inheritdoc - */ -ve.ui.MWDesktopWikitextSurface.prototype.createView = function ( model ) { - return new ve.ce.MWWikitextSurface( model, this ); -}; diff --git a/modules/ve-mw/ui/ve.ui.MWMobileSurface.js b/modules/ve-mw/ui/ve.ui.MWMobileSurface.js index 219277a..46b0809 100644 --- a/modules/ve-mw/ui/ve.ui.MWMobileSurface.js +++ b/modules/ve-mw/ui/ve.ui.MWMobileSurface.js @@ -6,7 +6,7 @@ /** * @class - * @extends ve.ui.MobileSurface + * @extends ve.ui.Surface * * @constructor * @param {HTMLDocument|Array|ve.dm.LinearData|ve.dm.Document} dataOrDoc Document data to edit @@ -19,7 +19,7 @@ /* Inheritance */ -OO.inheritClass( ve.ui.MWMobileSurface, ve.ui.MobileSurface ); +OO.inheritClass( ve.ui.MWMobileSurface, ve.ui.Surface ); /* Methods */ diff --git a/modules/ve-mw/ui/ve.ui.MWWikitextSurface.js b/modules/ve-mw/ui/ve.ui.MWWikitextSurface.js new file mode 100644 index 0000000..5138b8a --- /dev/null +++ b/modules/ve-mw/ui/ve.ui.MWWikitextSurface.js @@ -0,0 +1,49 @@ +/*! + * VisualEditor UserInterface MWWikitextSurface class. + * + * @copyright 2011-2017 VisualEditor Team and others; see http://ve.mit-license.org + */ + +/** + * A surface is a top-level object which contains both a surface model and a surface view. + * This is the mobile version of the surface. + * + * @class + * @extends ve.ui.Surface + * + * @constructor + * @param {HTMLDocument|Array|ve.dm.LinearData|ve.dm.Document} dataOrDoc Document data to edit + * @param {Object} [config] Configuration options + */ +ve.ui.MWWikitextSurface = function VeUiMWWikitextSurface() { + // Parent constructor + ve.ui.MWWikitextSurface.super.apply( this, arguments ); + + // Initialization + // The following classes can be used here: + // * mw-editfont-default + // * mw-editfont-monospace + // * mw-editfont-sans-serif + // * mw-editfont-serif + this.getView().$element.addClass( 've-ui-mwWikitextSurface mw-editfont-' + mw.user.options.get( 'editfont' ) ); +}; + +/* Inheritance */ + +OO.inheritClass( ve.ui.MWWikitextSurface, ve.ui.Surface ); + +/* Methods */ + +/** + * @inheritdoc + */ +ve.ui.MWWikitextSurface.prototype.createModel = function ( doc ) { + return new ve.dm.MWWikitextSurface( doc ); +}; + +/** + * @inheritdoc + */ +ve.ui.MWWikitextSurface.prototype.createView = function ( model ) { + return new ve.ce.MWWikitextSurface( model, this ); +}; -- To view, visit https://gerrit.wikimedia.org/r/332652 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I62708f7caeb03b16cd318aab0b0ee3c674e75a26 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders <esand...@wikimedia.org> Gerrit-Reviewer: Esanders <esand...@wikimedia.org> Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
