[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: CommentNode: Protect against call after teardown
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/406013 ) Change subject: CommentNode: Protect against call after teardown .. CommentNode: Protect against call after teardown Change-Id: I276cc64e522556f482f9fc7d0bb43f32d521defa --- M src/ce/nodes/ve.ce.CommentNode.js 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/13/406013/1 diff --git a/src/ce/nodes/ve.ce.CommentNode.js b/src/ce/nodes/ve.ce.CommentNode.js index 210a931..a2030e3 100644 --- a/src/ce/nodes/ve.ce.CommentNode.js +++ b/src/ce/nodes/ve.ce.CommentNode.js @@ -95,7 +95,13 @@ * @inheritdoc */ ve.ce.CommentNode.prototype.createInvisibleIcon = function () { - var icon = new OO.ui.ButtonWidget( { + var icon; + // Check the node hasn't been destroyed, as this method is + // called after an rAF in ve.ce.FocusableNode + if ( !this.getModel() ) { + return; + } + icon = new OO.ui.ButtonWidget( { classes: [ 've-ce-focusableNode-invisibleIcon' ], framed: false, icon: this.constructor.static.iconWhenInvisible, -- To view, visit https://gerrit.wikimedia.org/r/406013 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I276cc64e522556f482f9fc7d0bb43f32d521defa Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Sync tempWikitextEditor just before building target, not on ...
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405943 ) Change subject: Sync tempWikitextEditor just before building target, not on every change .. Sync tempWikitextEditor just before building target, not on every change Change-Id: Idc30a9dc00491b8c85353d73cb9ff70afea1d51c --- M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js M modules/ve-mw/init/ve.init.mw.TempWikitextEditorWidget.js 2 files changed, 21 insertions(+), 15 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/43/405943/1 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 d9f9d40..e971dff 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 @@ -21,7 +21,7 @@ var conf, tabMessages, uri, pageExists, viewUri, veEditUri, veEditSourceUri, isViewPage, isEditPage, pageCanLoadEditor, init, targetPromise, enable, tempdisable, autodisable, tabPreference, enabledForUser, initialWikitext, oldId, - isLoading, tempWikitextEditor, $toolbarPlaceholder, + isLoading, tempWikitextEditor, tempWikitextEditorData, $toolbarPlaceholder, editModes = { edit: 'visual' }, @@ -107,18 +107,8 @@ } function setupTempWikitextEditor( data ) { - tempWikitextEditor = new mw.libs.ve.MWTempWikitextEditorWidget( { - value: data.content, - onChange: function () { - // Write changes back to response data object, - // which will be used to construct the surface. - data.content = tempWikitextEditor.getValue(); - // TODO: Consider writing changes using a - // transaction so they can be undone. - // For now, just mark surface as pre-modified - data.fromEditedState = true; - } - } ); + tempWikitextEditor = new mw.libs.ve.MWTempWikitextEditorWidget( { value: data.content } ); + tempWikitextEditorData = data; // Create an equal-height placeholder for the toolbar to avoid vertical jump // when the real toolbar is ready. @@ -143,6 +133,19 @@ ve.track( 'mwedit.ready', { mode: 'source' } ); } + function syncTempWikitextEditor() { + var newContent = tempWikitextEditor.getValue(); + if ( newContent !== tempWikitextEditorData.content ) { + // Write changes back to response data object, + // which will be used to construct the surface. + tempWikitextEditorData.content = newContent; + // TODO: Consider writing changes using a + // transaction so they can be undone. + // For now, just mark surface as pre-modified + tempWikitextEditorData.fromEditedState = true; + } + } + function teardownTempWikitextEditor() { var range, nativeRange = tempWikitextEditor.getRange(), @@ -155,6 +158,7 @@ // Destroy widget and placeholder tempWikitextEditor.$element.remove(); tempWikitextEditor = null; + tempWikitextEditorData = null; $toolbarPlaceholder.remove(); $toolbarPlaceholder = null; @@ -372,6 +376,9 @@ init.$loading.detach(); // If target was already loaded, ensure the mode is correct target.setDefaultMode( mode ); + if ( tempWikitextEditor ) { + syncTempWikitextEditor(); + } activatePromise = target.activate( dataPromise ); $( '#content' ).prepend( init.$loading ); return activatePromise; diff --git a/modules/ve-mw/init/ve.init.mw.TempWikitextEditorWidget.js b/modules/ve-mw/init/ve.init.mw.TempWikitextEditorWidget.js index 5bc228c..baf53dd 100644 --- a/modules/ve-mw/init/ve.init.mw.TempWikitextEditorWidget.js +++ b/modules/ve-mw/init/ve.init.mw.TempWikitextEditorWidget.js @@ -32,8 +32,7 @@ lang: lang, dir: dir } ) - .val( config.value ) - .on( 'input', config.onChange ); +
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Toolbars: Replace $.height with clientHeight/offsetHeight
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405940 ) Change subject: Toolbars: Replace $.height with clientHeight/offsetHeight .. Toolbars: Replace $.height with clientHeight/offsetHeight Bug: T185599 Change-Id: I43fbce8f221553e9ae03f8385f39a19de01e8eb7 --- M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/40/405940/1 diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js index 2b16d96..3f4fddf 100644 --- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js +++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js @@ -256,7 +256,8 @@ } else { setTimeout( function () { toolbar.$element - .css( 'height', toolbar.$bar.outerHeight() ) + // Avoid $bar[ 0 ].offsetHeight as this returns null in IE9 when $bar is position:fixed + .css( 'height', toolbar.$bar[ 0 ].clientHeight ) .addClass( 've-init-mw-desktopArticleTarget-toolbar-open' ); setTimeout( function () { // Clear to allow growth during use and when resizing window @@ -1151,7 +1152,8 @@ return deferred.resolve().promise(); } - this.toolbar.$element.css( 'height', this.toolbar.$bar.outerHeight() ); + // Avoid $bar[ 0 ].offsetHeight as this returns null in IE9 when $bar is position:fixed + this.toolbar.$element.css( 'height', this.toolbar.$bar[ 0 ].clientHeight ); setTimeout( function () { target.toolbar.$element .css( 'height', '0' ) -- To view, visit https://gerrit.wikimedia.org/r/405940 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I43fbce8f221553e9ae03f8385f39a19de01e8eb7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Toolbars: Replace $.width with clientWidth/offsetWidth
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405934 ) Change subject: Toolbars: Replace $.width with clientWidth/offsetWidth .. Toolbars: Replace $.width with clientWidth/offsetWidth Bug: T185599 Change-Id: Id32e38f85eb11f4574ef72ce45df06dde43251b4 --- M src/ui/ve.ui.PositionedTargetToolbar.js 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/34/405934/1 diff --git a/src/ui/ve.ui.PositionedTargetToolbar.js b/src/ui/ve.ui.PositionedTargetToolbar.js index 5cc557c..e429d43 100644 --- a/src/ui/ve.ui.PositionedTargetToolbar.js +++ b/src/ui/ve.ui.PositionedTargetToolbar.js @@ -104,7 +104,7 @@ */ ve.ui.PositionedTargetToolbar.prototype.calculateOffset = function () { this.elementOffset = this.$element.offset(); - this.elementOffset.right = this.$window.width() - this.$element.outerWidth() - this.elementOffset.left; + this.elementOffset.right = document.documentElement.clientWidth - this.$element[ 0 ].offsetWidth - this.elementOffset.left; }; /** @@ -133,7 +133,7 @@ */ ve.ui.PositionedTargetToolbar.prototype.float = function () { if ( !this.floating ) { - this.height = this.$element.height(); + this.height = this.$element[ 0 ].offsetHeight; // When switching into floating mode, set the height of the wrapper and // move the bar to the same offset as the in-flow element this.$element -- To view, visit https://gerrit.wikimedia.org/r/405934 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id32e38f85eb11f4574ef72ce45df06dde43251b4 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Toolbars: Replace $.width with clientWidth/offsetWidth
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405931 ) Change subject: Toolbars: Replace $.width with clientWidth/offsetWidth .. Toolbars: Replace $.width with clientWidth/offsetWidth Bug: T185599 Change-Id: I8f36244f1d605424594c1a61b5d107b3075213fa --- M src/Toolbar.js 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/31/405931/1 diff --git a/src/Toolbar.js b/src/Toolbar.js index 7720b5d..559bc2a 100644 --- a/src/Toolbar.js +++ b/src/Toolbar.js @@ -388,7 +388,7 @@ OO.ui.Toolbar.prototype.onWindowResize = function () { this.$element.toggleClass( 'oo-ui-toolbar-narrow', - this.$bar.width() <= this.getNarrowThreshold() + this.$bar[ 0 ].clientWidth <= this.getNarrowThreshold() ); }; @@ -401,7 +401,7 @@ */ OO.ui.Toolbar.prototype.getNarrowThreshold = function () { if ( this.narrowThreshold === null ) { - this.narrowThreshold = this.$group.width() + this.$actions.width(); + this.narrowThreshold = this.$group[ 0 ].offsetWidth + this.$actions[ 0 ].offsetWidth; } return this.narrowThreshold; }; -- To view, visit https://gerrit.wikimedia.org/r/405931 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8f36244f1d605424594c1a61b5d107b3075213fa Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Don't hide notification popup when scrolling
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405816 ) Change subject: Don't hide notification popup when scrolling .. Don't hide notification popup when scrolling hideWhenOutOfView is for preventing popups from appearing outside their container, but in this case the container is the document, so it is already clipped. Bug: T178384 Change-Id: Ie0cd83849446cf74b61e708f0a1fa79f2384a94a --- M modules/ui/mw.echo.ui.NotificationBadgeWidget.js 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo refs/changes/16/405816/1 diff --git a/modules/ui/mw.echo.ui.NotificationBadgeWidget.js b/modules/ui/mw.echo.ui.NotificationBadgeWidget.js index ce7956d..de02adc 100644 --- a/modules/ui/mw.echo.ui.NotificationBadgeWidget.js +++ b/modules/ui/mw.echo.ui.NotificationBadgeWidget.js @@ -130,6 +130,7 @@ $content: this.notificationsWidget.$element, $footer: $footer, width: config.popupWidth || 500, + hideWhenOutOfView: false, autoFlip: false, autoClose: true, containerPadding: 20, -- To view, visit https://gerrit.wikimedia.org/r/405816 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie0cd83849446cf74b61e708f0a1fa79f2384a94a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Echo Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Use child selectors for menuLayout
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405815 ) Change subject: Use child selectors for menuLayout .. Use child selectors for menuLayout Prevents broken layouts when menus are nested. Bug: T185544 Change-Id: I1795fcefeac22d728aa7a716f7e23f87fff1bef0 --- M src/styles/layouts/MenuLayout.less 1 file changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/15/405815/1 diff --git a/src/styles/layouts/MenuLayout.less b/src/styles/layouts/MenuLayout.less index 474d0d0..19270af 100644 --- a/src/styles/layouts/MenuLayout.less +++ b/src/styles/layouts/MenuLayout.less @@ -7,14 +7,14 @@ bottom: 0; &-expanded, - &-expanded .oo-ui-menuLayout-menu, - &-expanded .oo-ui-menuLayout-content { + &-expanded > .oo-ui-menuLayout-menu, + &-expanded > .oo-ui-menuLayout-content { position: absolute; } // If anything overflows out of the menu, display it on top of the content, // as it's probably some important interactive widget. - &-expanded .oo-ui-menuLayout-menu { + &-expanded > .oo-ui-menuLayout-menu { z-index: 1; } @@ -24,27 +24,27 @@ display: table; width: 100%; - .oo-ui-menuLayout-menu, - .oo-ui-menuLayout-content { + > .oo-ui-menuLayout-menu, + > .oo-ui-menuLayout-content { display: table-cell; vertical-align: top; } } } - &-menu, - &-content { + > .oo-ui-menuLayout-menu, + > .oo-ui-menuLayout-content { .oo-ui-transition( all 200ms ease ); } // These are overridden with 'auto' or '0' later - &-menu { + > .oo-ui-menuLayout-menu { height: 18em; width: 18em; } // These are overridden with 'auto' or '0' later - &-content { + > .oo-ui-menuLayout-content { top: 18em; left: 18em; right: 18em; -- To view, visit https://gerrit.wikimedia.org/r/405815 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1795fcefeac22d728aa7a716f7e23f87fff1bef0 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Workaround missing child selector in OOUI for menuLayout
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405814 ) Change subject: Workaround missing child selector in OOUI for menuLayout .. Workaround missing child selector in OOUI for menuLayout Bug: T185544 Change-Id: Ib93ef55115465c7de77e33c57f65eb966fadec24 --- M src/ui/styles/ve.ui.Surface.css 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/14/405814/1 diff --git a/src/ui/styles/ve.ui.Surface.css b/src/ui/styles/ve.ui.Surface.css index 1d2aa2d..10a7129 100644 --- a/src/ui/styles/ve.ui.Surface.css +++ b/src/ui/styles/ve.ui.Surface.css @@ -42,3 +42,9 @@ word-wrap: break-word; white-space: pre-wrap; } + +/* HACK: Fix missing child selector in OOUI (T185544) */ +.oo-ui-menuLayout-expanded .oo-ui-menuLayout:not( .oo-ui-menuLayout-expanded ) .oo-ui-menuLayout-content, +.oo-ui-menuLayout-expanded .oo-ui-menuLayout:not( .oo-ui-menuLayout-expanded ) .oo-ui-menuLayout-menu { + position: static; +} -- To view, visit https://gerrit.wikimedia.org/r/405814 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib93ef55115465c7de77e33c57f65eb966fadec24 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Cite[master]: Remove metadata from unit tests
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405810 ) Change subject: Remove metadata from unit tests .. Remove metadata from unit tests Metadata is being removed from VE. Change-Id: Icc614ed7a9792b7d9475d7a804bb8eea48424043 --- M modules/ve-cite/tests/ve.dm.Transaction.test.js M modules/ve-cite/tests/ve.dm.citeExample.js 2 files changed, 2 insertions(+), 110 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cite refs/changes/10/405810/1 diff --git a/modules/ve-cite/tests/ve.dm.Transaction.test.js b/modules/ve-cite/tests/ve.dm.Transaction.test.js index 57032a6..18f0486 100644 --- a/modules/ve-cite/tests/ve.dm.Transaction.test.js +++ b/modules/ve-cite/tests/ve.dm.Transaction.test.js @@ -11,7 +11,6 @@ QUnit.test( 'newFromDocumentInsertion with references', function ( assert ) { var i, j, doc2, tx, actualStoreItems, expectedStoreItems, removalOps, doc, complexDoc = ve.dm.citeExample.createExampleDocument( 'complexInternalData' ), - comment = { type: 'alienMeta', originalDomElements: $( '' ).toArray() }, withReference = [ { type: 'paragraph' }, 'B', 'a', 'r', @@ -38,96 +37,6 @@ ], cases = [ { - msg: 'metadata insertion', - doc: 'complexInternalData', - offset: 0, - range: new ve.Range( 0, 7 ), - modify: function ( newDoc ) { - newDoc.commit( ve.dm.TransactionBuilder.static.newFromMetadataInsertion( - newDoc, 4, 0, [ comment ] - ) ); - }, - removalOps: [ - { - type: 'replace', - remove: complexDoc.getData( new ve.Range( 0, 7 ) ), - insert: [ - { type: 'paragraph' }, - { type: '/paragraph' } - ], - removeMetadata: complexDoc.getMetadata( new ve.Range( 0, 7 ) ), - insertMetadata: [ undefined, undefined ], - insertedDataLength: 2, - insertedDataOffset: 0 - }, - { type: 'retain', length: 26 } - ], - expectedOps: [ - { - type: 'replace', - remove: [], - insert: complexDoc.getData( new ve.Range( 0, 4 ) ) - // Reference gets (unnecessarily) renumbered from auto/0 to auto/1 - .concat( [ - ve.extendObject( true, {}, complexDoc.data.data[ 4 ], - { attributes: { listKey: 'auto/1' } } - ) - ] ) - .concat( complexDoc.getData( new ve.Range( 5, 7 ) ) ), - removeMetadata: [], - insertMetadata: complexDoc.getMetadata( new ve.Range( 0, 4 ) ) - .concat( [ [ comment ] ] ) - .concat( complexDoc.getMetadata( new ve.Range( 5, 7 ) ) ) - }, - { type: 'retain', length: 3 }, - { - type: 'replace', - remove: complexDoc.getData( new ve.Range( 8, 32 ) ), - insert: complexDoc.getData( new ve.Range( 8, 32 ) ), - removeMetadata: complexDoc.getMetadata( new ve.Range( 8, 32 ) ), - insertMetadata: complexDoc.getMetadata( new ve.Range( 8, 32 ) ) -
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Remove
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405809 ) Change subject: Remove
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Fix help icon negative margin in Apex
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405758 ) Change subject: Fix help icon negative margin in Apex .. Fix help icon negative margin in Apex Bug: T185529 Change-Id: I30563754ea1f74e0a74caa0e52390b1a816a8406 --- M src/themes/apex/layouts.less 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/58/405758/1 diff --git a/src/themes/apex/layouts.less b/src/themes/apex/layouts.less index 032c6d4..28e6572 100644 --- a/src/themes/apex/layouts.less +++ b/src/themes/apex/layouts.less @@ -38,7 +38,7 @@ // Override the default margin-right: 0; // Move into the space of `margin-right` of header - margin-left: -@size-icon; + margin-left: -( @size-icon + ( 2 * @padding-horizontal-frameless ) ); } > .oo-ui-fieldLayout-field { -- To view, visit https://gerrit.wikimedia.org/r/405758 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I30563754ea1f74e0a74caa0e52390b1a816a8406 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Remove Firefox support comment
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405753 ) Change subject: Remove Firefox support comment .. Remove Firefox support comment This line isn't solely for supporting FF52, that is the order in which it is called (move after attach, not before), but that matches all our other widgets, so not sure it needs commenting. Change-Id: I6f3cc5687f1e4b995dff700d0765d14de1927d51 --- M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/53/405753/1 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 832dadc..d9f9d40 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 @@ -139,7 +139,6 @@ // Resize the textarea to fit content. We could do this more often (e.g. on change) // but hopefully this temporary textarea won't be visible for too long. - // Support: Firefox =< 52 tempWikitextEditor.adjustSize().moveCursorToStart(); ve.track( 'mwedit.ready', { mode: 'source' } ); } -- To view, visit https://gerrit.wikimedia.org/r/405753 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6f3cc5687f1e4b995dff700d0765d14de1927d51 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Implement simple methods from $.textSelection API
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405752 ) Change subject: Implement simple methods from $.textSelection API .. Implement simple methods from $.textSelection API This should make it easier for some gadgets to work with NWE. Change-Id: Ic60440f345b8226fb5acaeb966e25eb003ad7866 --- M modules/ve-mw/ui/ve.ui.MWWikitextSurface.js 1 file changed, 47 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/52/405752/1 diff --git a/modules/ve-mw/ui/ve.ui.MWWikitextSurface.js b/modules/ve-mw/ui/ve.ui.MWWikitextSurface.js index 3d6ce6a..d826759 100644 --- a/modules/ve-mw/ui/ve.ui.MWWikitextSurface.js +++ b/modules/ve-mw/ui/ve.ui.MWWikitextSurface.js @@ -16,6 +16,8 @@ * @param {Object} [config] Configuration options */ ve.ui.MWWikitextSurface = function VeUiMWWikitextSurface() { + var surface = this; + // Parent constructor ve.ui.MWWikitextSurface.super.apply( this, arguments ); @@ -27,6 +29,42 @@ this.$element.addClass( 've-ui-mwWikitextSurface' ); this.getView().$element.addClass( 'mw-editfont-' + mw.user.options.get( 'editfont' ) ); this.$placeholder.addClass( 'mw-editfont-' + mw.user.options.get( 'editfont' ) ); + this.$textbox = $( '#wpTextbox1' ); + + if ( !this.$textbox.length ) { + this.$textbox = $( '' ) + .attr( 'id', 'wpTextbox1' ) + .addClass( 've-dummyTextbox oo-ui-element-hidden' ); + // Append a dummy textbox to the surface, so it gets destroyed with it + this.$element.append( this.$textbox ); + } + + // Backwards support for the textSelection API + this.$textbox.textSelection( 'register', { + getContents: function () { + return surface.getDom(); + }, + setContents: function ( content ) { + surface.getModel().getLinearFragment( new ve.Range( 0, surface.getModel().getDocument().data.getLength() ), true ) + .insertContent( content ); + }, + getSelection: function () { + var range = surface.getModel().getSelection().getCoveringRange(); + if ( !range ) { + return ''; + } + return surface.getModel().getDocument().data.getSourceText( range ); + }, + getCaretPosition: function () { + // TODO + }, + encapsulateSelection: function () { + // TODO + }, + scrollToCaretPosition: function () { + surface.scrollCursorIntoView(); + } + } ); }; /* Inheritance */ @@ -48,3 +86,12 @@ ve.ui.MWWikitextSurface.prototype.createView = function ( model ) { return new ve.ce.MWWikitextSurface( model, this ); }; + +/** + * @inheritdoc + */ +ve.ui.MWWikitextSurface.prototype.destroy = function () { + this.$textbox.textSelection( 'unregister' ); + // Parent method + return ve.ui.MWWikitextSurface.super.prototype.destroy.apply( this, arguments ); +}; -- To view, visit https://gerrit.wikimedia.org/r/405752 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic60440f345b8226fb5acaeb966e25eb003ad7866 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Simplify textSelection overrides using 'register' and 'unreg...
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405748 ) Change subject: Simplify textSelection overrides using 'register' and 'unregister' .. Simplify textSelection overrides using 'register' and 'unregister' Change-Id: I46ac070ca141c3c2f993bee6ab898c96cb1edd4f --- M resources/ext.CodeMirror.js 1 file changed, 106 insertions(+), 215 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror refs/changes/48/405748/1 diff --git a/resources/ext.CodeMirror.js b/resources/ext.CodeMirror.js index 3903755..0346cc8 100644 --- a/resources/ext.CodeMirror.js +++ b/resources/ext.CodeMirror.js @@ -1,6 +1,6 @@ ( function ( mw, $ ) { - var origTextSelection, useCodeMirror, codeMirror, api, originHooksTextarea, - wikiEditorToolbarEnabled, textBox, + var useCodeMirror, codeMirror, api, originHooksTextarea, + wikiEditorToolbarEnabled, cmTextSelection, enableContentEditable = true; if ( mw.config.get( 'wgCodeEditorCurrentLanguage' ) ) { // If the CodeEditor is used then just exit; @@ -16,10 +16,6 @@ if ( !wikiEditorToolbarEnabled && !mw.loader.getState( 'mediawiki.toolbar' ) ) { return; } - - // codeMirror needs a special textselection jQuery function to work, save the current one to restore when - // CodeMirror get's disabled. - origTextSelection = $.fn.textSelection; useCodeMirror = mw.user.options.get( 'usecodemirror' ) > 0; api = new mw.Api(); @@ -56,229 +52,126 @@ CodeMirror.keyMap.pcDefault[ 'Alt-Left' ] = false; CodeMirror.keyMap.pcDefault[ 'Alt-Right' ] = false; - // function for a textselection function for CodeMirror - function cmTextSelection( command, options ) { - var fn, retval; + // jQuery.textSelection overrides for CodeMirror. + // See jQuery.textSelection.js for method documentation + cmTextSelection = { + getContents: function () { + return codeMirror.doc.getValue(); + }, + setContents: function ( content ) { + codeMirror.doc.setValue( content ); + }, + getSelection: function () { + return codeMirror.doc.getSelection(); + }, + setSelection: function ( options ) { + return this.each( function () { + codeMirror.doc.setSelection( codeMirror.doc.posFromIndex( options.start ), codeMirror.doc.posFromIndex( options.end ) ); + codeMirror.focus(); + } ); + }, + encapsulateSelection: function ( options ) { + return this.each( function () { + var insertText, + selText, + selectPeri = options.selectPeri, + pre = options.pre, + post = options.post, + startCursor = codeMirror.doc.getCursor( true ), + endCursor = codeMirror.doc.getCursor( false ); - if ( !codeMirror || - ( this[ 0 ] !== textBox && this[ 0 ] !== codeMirror.getWrapperElement() ) - ) { - return origTextSelection.call( this, command, options ); - } + if ( options.selectionStart !== undefined ) { + // fn[command].call( this, options ); + cmTextSelection.setSelection.call( $( this ), { start: options.selectionStart, end: options.selectionEnd } ); // not tested + } - fn = { - /** -* Get the contents of the textarea -* -* @return {string} -*/ - getContents: function () { - return codeMirror.doc.getValue(); - }, - - setContents: function ( newContents ) { - codeMirror.doc.setValue( newContents ); - }, - - /** -* Get the currently selected text in this textarea. Will focus the textarea -* in some browsers (IE/Opera) -* -* @return {string} -*/ - getSelection: function () { - return codeMirror.doc.getSelection(); - }, - - /** -
[MediaWiki-commits] [Gerrit] mediawiki...Linter[master]: Fix NWE integration to use new tempWikitextEditor
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405747 ) Change subject: Fix NWE integration to use new tempWikitextEditor .. Fix NWE integration to use new tempWikitextEditor Bug: T185279 Depends-On: I3678996bcf644cc889dd168ac3ce48b5c3633ec1 Change-Id: I31a21e10b3fcd88fbce6881475f02a9d37df39c2 --- M modules/ext.linter.edit.js 1 file changed, 3 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Linter refs/changes/47/405747/1 diff --git a/modules/ext.linter.edit.js b/modules/ext.linter.edit.js index 63a3c01..619c9c3 100644 --- a/modules/ext.linter.edit.js +++ b/modules/ext.linter.edit.js @@ -7,19 +7,9 @@ if ( $textbox.length ) { $textbox.focus().textSelection( 'setSelection', { start: location[ 0 ], end: location[ 1 ] } ); } - // Register NWE code should it be loaded - // TODO: We should somehow force source mode if VE is opened - mw.hook( 've.activationComplete' ).add( function () { - // Selection is reset on a setTimeout after activation, so wait for that. - setTimeout( function () { - var range, - surface = ve.init.target.getSurface(); - - if ( surface.getMode() === 'source' ) { - range = surface.getModel().getRangeFromSourceOffsets( location[ 0 ], location[ 1 ] ); - surface.getModel().setLinearSelection( range ); - } - } ); + mw.hook( 've.tempWikitextReady' ).add( function () { + mw.libs.ve.tempWikitextEditor.$element[ 0 ].setSelectionRange( location[ 0 ], location[ 1 ] ); + mw.libs.ve.tempWikitextEditor.focus(); } ); } } ); -- To view, visit https://gerrit.wikimedia.org/r/405747 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I31a21e10b3fcd88fbce6881475f02a9d37df39c2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Linter Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Public API for the tempWikitextEditor
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405746 ) Change subject: Public API for the tempWikitextEditor .. Public API for the tempWikitextEditor Allows users to know when the widget has been constructed, and access it (e.g. to set an initial selection) Bug: T185279 Change-Id: I3678996bcf644cc889dd168ac3ce48b5c3633ec1 --- M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/46/405746/1 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 a737d41..52037a9 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 @@ -141,6 +141,8 @@ // but hopefully this temporary textarea won't be visible for too long. tempWikitextEditor.adjustSize().focus(); ve.track( 'mwedit.ready', { mode: 'source' } ); + mw.libs.ve.tempWikitextEditor = tempWikitextEditor; + mw.hook( 've.tempWikitextReady' ).fire(); } function teardownTempWikitextEditor() { @@ -154,7 +156,7 @@ // Destroy widget and placeholder tempWikitextEditor.$element.remove(); - tempWikitextEditor = null; + mw.libs.ve.tempWikitextEditor = tempWikitextEditor = null; $toolbarPlaceholder.remove(); $toolbarPlaceholder = null; -- To view, visit https://gerrit.wikimedia.org/r/405746 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3678996bcf644cc889dd168ac3ce48b5c3633ec1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TemplateData[master]: Use textSelection API to modify textarea
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405668 ) Change subject: Use textSelection API to modify textarea .. Use textSelection API to modify textarea Bug: T73363 Change-Id: I411027236cbb3b349372a64ecbf670062758cfab --- M modules/ext.templateDataGenerator.target.js 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateData refs/changes/68/405668/1 diff --git a/modules/ext.templateDataGenerator.target.js b/modules/ext.templateDataGenerator.target.js index df6f063..a208f81 100644 --- a/modules/ext.templateDataGenerator.target.js +++ b/modules/ext.templateDataGenerator.target.js @@ -338,11 +338,11 @@ OO.inheritClass( mw.TemplateData.TextareaTarget, mw.TemplateData.Target ); mw.TemplateData.TextareaTarget.prototype.getWikitext = function () { - return this.$textarea.val(); + return this.$textarea.textSelection( 'getContents' ); }; mw.TemplateData.TextareaTarget.prototype.setWikitext = function ( newWikitext ) { - this.$textarea.val( newWikitext ); + this.$textarea.textSelection( 'setContents', newWikitext ); }; /* global ve */ -- To view, visit https://gerrit.wikimedia.org/r/405668 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I411027236cbb3b349372a64ecbf670062758cfab Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TemplateData Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: NWE: Don't attempt to set selection on unattached textarea
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405662 ) Change subject: NWE: Don't attempt to set selection on unattached textarea .. NWE: Don't attempt to set selection on unattached textarea Prevents an exception being thrown in Firefox <= 52. Bug: T185304 Change-Id: Ic9a43e3cf12d4cc566cebb328f8e807e464af634 --- M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js M modules/ve-mw/init/ve.init.mw.TempWikitextEditorWidget.js 2 files changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/62/405662/1 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 a737d41..d9f9d40 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 @@ -139,7 +139,7 @@ // Resize the textarea to fit content. We could do this more often (e.g. on change) // but hopefully this temporary textarea won't be visible for too long. - tempWikitextEditor.adjustSize().focus(); + tempWikitextEditor.adjustSize().moveCursorToStart(); ve.track( 'mwedit.ready', { mode: 'source' } ); } diff --git a/modules/ve-mw/init/ve.init.mw.TempWikitextEditorWidget.js b/modules/ve-mw/init/ve.init.mw.TempWikitextEditorWidget.js index 829ef78..5bc228c 100644 --- a/modules/ve-mw/init/ve.init.mw.TempWikitextEditorWidget.js +++ b/modules/ve-mw/init/ve.init.mw.TempWikitextEditorWidget.js @@ -34,9 +34,18 @@ } ) .val( config.value ) .on( 'input', config.onChange ); +}; +/** + * Focus the input and move the cursor to the start. + * + * @chainable + */ +mw.libs.ve.MWTempWikitextEditorWidget.prototype.moveCursorToStart = function () { // Move cursor to start this.$element[ 0 ].setSelectionRange( 0, 0 ); + this.focus(); + return this; }; /** -- To view, visit https://gerrit.wikimedia.org/r/405662 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic9a43e3cf12d4cc566cebb328f8e807e464af634 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Remove JSCS comments
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405626 ) Change subject: Remove JSCS comments .. Remove JSCS comments Change-Id: I5ed4ae64800f2ba508302256ee85274ba7a0f5dd --- M src/ce/ve.ce.TextState.js M tests/ve.qunit.js 2 files changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/26/405626/1 diff --git a/src/ce/ve.ce.TextState.js b/src/ce/ve.ce.TextState.js index 15d810d..80f85aa 100644 --- a/src/ce/ve.ce.TextState.js +++ b/src/ce/ve.ce.TextState.js @@ -101,7 +101,6 @@ continue; } // Else no child nodes; do nothing - // jscs:enable disallowEmptyBlocks // Step out of this node, then keep stepping outwards until there is a next sibling while ( true ) { diff --git a/tests/ve.qunit.js b/tests/ve.qunit.js index 4d58ab7..436c025 100644 --- a/tests/ve.qunit.js +++ b/tests/ve.qunit.js @@ -324,9 +324,7 @@ var oLines = difflib.stringAsLines( unescapeText( o ) ), nLines = difflib.stringAsLines( unescapeText( n ) ), sm = new difflib.SequenceMatcher( oLines, nLines ), - // jscs:disable requireCamelCaseOrUpperCaseIdentifiers (awaiting eslint replacement; T149261) opcodes = sm.get_opcodes(), - // jscs:enable requireCamelCaseOrUpperCaseIdentifiers $div = $( '' ); $div.append( diffview.buildView( { -- To view, visit https://gerrit.wikimedia.org/r/405626 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5ed4ae64800f2ba508302256ee85274ba7a0f5dd Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: NWE: Fix padding in Vector
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405260 ) Change subject: NWE: Fix padding in Vector .. NWE: Fix padding in Vector Bug: T185299 Change-Id: Iea8e61654608259ddc90286aef59014a37e4f44d --- M resources/modules/ve-cm/ve.ui.CodeMirror.init.less 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror refs/changes/60/405260/1 diff --git a/resources/modules/ve-cm/ve.ui.CodeMirror.init.less b/resources/modules/ve-cm/ve.ui.CodeMirror.init.less index b7c42aa..33accbc 100644 --- a/resources/modules/ve-cm/ve.ui.CodeMirror.init.less +++ b/resources/modules/ve-cm/ve.ui.CodeMirror.init.less @@ -18,9 +18,10 @@ // Skin specific paddings .skin-vector & { - padding: 0 1.14286em; /* 1/0.875 */ + padding: 0 1.2em; + @media screen and ( min-width: 982px ) { - padding: 0 1.71429em; /* surface-margin-left (1.5em) / (mw-body-content font-size) 0.875em */ + padding: 0 1.8em; } } -- To view, visit https://gerrit.wikimedia.org/r/405260 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iea8e61654608259ddc90286aef59014a37e4f44d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CodeMirror Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikiEditor[master]: Restore isSupported as deprecated dummy function
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404962 ) Change subject: Restore isSupported as deprecated dummy function .. Restore isSupported as deprecated dummy function Bug: T185143 Change-Id: I0be5d09390b70ee581262b4ba6421f5f51f2e696 --- M modules/jquery.wikiEditor.js 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiEditor refs/changes/62/404962/1 diff --git a/modules/jquery.wikiEditor.js b/modules/jquery.wikiEditor.js index 5b098d8..691bcb3 100644 --- a/modules/jquery.wikiEditor.js +++ b/modules/jquery.wikiEditor.js @@ -61,6 +61,20 @@ imgPath: mw.config.get( 'wgExtensionAssetsPath' ) + '/WikiEditor/modules/images/', /** +* Checks if the client supports WikiEditor. +* +* Since 1.31 this check is deprecated and can be skipped as all browsers +* which are served JS by MediaWiki support WikiEditor. +* +* @deprecated since 1.31 +* @return {boolean} +*/ + isSupported: function () { + mw.log.warn( '$.wikiEditor.isSupported is deprecated.' ); + return true; + }, + + /** * Checks if a module has a specific requirement * * @param {Object} module Module object -- To view, visit https://gerrit.wikimedia.org/r/404962 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0be5d09390b70ee581262b4ba6421f5f51f2e696 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikiEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Resize link context item after getting description
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404699 ) Change subject: Resize link context item after getting description .. Resize link context item after getting description Descriptions can run to more than two lines. Bug: T183650 Change-Id: I3d0a5787cab19abc4851340b08fe4a109e7aec31 --- M modules/ve-mw/ui/contextitems/ve.ui.MWInternalLinkContextItem.js 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/99/404699/1 diff --git a/modules/ve-mw/ui/contextitems/ve.ui.MWInternalLinkContextItem.js b/modules/ve-mw/ui/contextitems/ve.ui.MWInternalLinkContextItem.js index 53078e1..a6112e6 100644 --- a/modules/ve-mw/ui/contextitems/ve.ui.MWInternalLinkContextItem.js +++ b/modules/ve-mw/ui/contextitems/ve.ui.MWInternalLinkContextItem.js @@ -41,9 +41,10 @@ * @param {ve.init.mw.LinkCache} linkCache The link cache to use * @param {ve.dm.MWInternalLinkAnnotation} model The annotation model * @param {HTMLDocument} htmlDoc The HTML document (for URL resolution) + * @param {ve.ui.Context} context Context (for resizing) * @return {jQuery} The jQuery object of the link context item */ -ve.ui.MWInternalLinkContextItem.static.generateBody = function ( linkCache, model, htmlDoc ) { +ve.ui.MWInternalLinkContextItem.static.generateBody = function ( linkCache, model, htmlDoc, context ) { var icon, $description, title = model.getAttribute( 'lookupTitle' ), description = model.getAttribute( 'normalizedTitle' ), @@ -95,6 +96,8 @@ .addClass( 've-ui-mwInternalLinkContextItem-description' ) .text( linkData.description ); $wrapper.append( $description ); + // Multiline descriptions may make the context bigger (T183650) + context.updateDimensions(); } } ); } @@ -117,7 +120,8 @@ this.$body.empty().append( this.constructor.static.generateBody( ve.init.platform.linkCache, this.model, - this.context.getSurface().getModel().getDocument().getHtmlDocument() + this.context.getSurface().getModel().getDocument().getHtmlDocument(), + this.context ) ); }; -- To view, visit https://gerrit.wikimedia.org/r/404699 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3d0a5787cab19abc4851340b08fe4a109e7aec31 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: getSelectedItem() -> findSelectedItem()
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404673 ) Change subject: getSelectedItem() -> findSelectedItem() .. getSelectedItem() -> findSelectedItem() Change-Id: I2f08b7afa3f3bb118e781e972a12511d643e09a7 --- M modules/ve/node/ve.ui.MWPagequalityInspector.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage refs/changes/73/404673/1 diff --git a/modules/ve/node/ve.ui.MWPagequalityInspector.js b/modules/ve/node/ve.ui.MWPagequalityInspector.js index 9538c0c..bc90fa5 100644 --- a/modules/ve/node/ve.ui.MWPagequalityInspector.js +++ b/modules/ve/node/ve.ui.MWPagequalityInspector.js @@ -128,7 +128,7 @@ * @return {int|null} */ ve.ui.MWPagequalityInspector.prototype.getSelectedQualityLevel = function () { - var selectedQualityOption = this.qualitySelector.getSelectedItem(); + var selectedQualityOption = this.qualitySelector.findSelectedItem(); if ( selectedQualityOption === null ) { return null; } -- To view, visit https://gerrit.wikimedia.org/r/404673 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2f08b7afa3f3bb118e781e972a12511d643e09a7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ProofreadPage Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Math[master]: getSelectedItem() -> findSelectedItem()
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404671 ) Change subject: getSelectedItem() -> findSelectedItem() .. getSelectedItem() -> findSelectedItem() Change-Id: I6ddf1ab488774f22fd566846c38483dcaf35ab27 --- M modules/ve-math/ve.ui.MWLatexDialog.js M modules/ve-math/ve.ui.MWLatexInspector.js 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Math refs/changes/71/404671/1 diff --git a/modules/ve-math/ve.ui.MWLatexDialog.js b/modules/ve-math/ve.ui.MWLatexDialog.js index 402976d..5434106 100644 --- a/modules/ve-math/ve.ui.MWLatexDialog.js +++ b/modules/ve-math/ve.ui.MWLatexDialog.js @@ -254,7 +254,7 @@ ve.ui.MWLatexDialog.super.prototype.updateMwData.call( this, mwData ); // Get data from dialog - display = this.displaySelect.getSelectedItem().getData(); + display = this.displaySelect.findSelectedItem().getData(); id = this.idInput.getValue(); // Update attributes diff --git a/modules/ve-math/ve.ui.MWLatexInspector.js b/modules/ve-math/ve.ui.MWLatexInspector.js index b343b34..53af4a3 100644 --- a/modules/ve-math/ve.ui.MWLatexInspector.js +++ b/modules/ve-math/ve.ui.MWLatexInspector.js @@ -116,7 +116,7 @@ // Parent method ve.ui.MWLatexInspector.super.prototype.updateMwData.call( this, mwData ); - display = this.displaySelect.getSelectedItem().getData(); + display = this.displaySelect.findSelectedItem().getData(); id = this.idInput.getValue(); mwData.attrs.display = display !== 'default' ? display : undefined; -- To view, visit https://gerrit.wikimedia.org/r/404671 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6ddf1ab488774f22fd566846c38483dcaf35ab27 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Math Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: build: Update linters
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404670 ) Change subject: build: Update linters .. build: Update linters Change-Id: I92912debb177ad7d920e2a32899e5bb770f6ad21 --- M package.json M styles/kartographer.less M styles/specialMap.less 3 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer refs/changes/70/404670/1 diff --git a/package.json b/package.json index 425dfc5..19f5d6c 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "browserify": "^13.0.0", -"eslint-config-wikimedia": "0.4.0", +"eslint-config-wikimedia": "0.5.0", "grunt": "1.0.1", "grunt-banana-checker": "0.6.0", "grunt-contrib-watch": "1.0.0", @@ -21,8 +21,8 @@ "prunecluster": "^2.0.0-beta.3", "rollup": "^0.36.1", "rollup-plugin-commonjs": "^5.0.4", -"stylelint": "7.8.0", -"stylelint-config-wikimedia": "0.4.1" +"stylelint": "8.2.0", +"stylelint-config-wikimedia": "0.4.2" }, "dependencies": { "leaflet-sleep": "juliengirault/Leaflet.Sleep", diff --git a/styles/kartographer.less b/styles/kartographer.less index 2ff1141..98e9918 100644 --- a/styles/kartographer.less +++ b/styles/kartographer.less @@ -90,7 +90,7 @@ margin-right: 0; } -.mw-kartographer-container:not(.mw-kartographer-full) { +.mw-kartographer-container:not( .mw-kartographer-full ) { max-width: 100%; /* Fixes `align=center` use case */ diff --git a/styles/specialMap.less b/styles/specialMap.less index 71c4fe8..c55e801 100644 --- a/styles/specialMap.less +++ b/styles/specialMap.less @@ -3,7 +3,7 @@ @markerColor: #7b4e10; @markerSize: 10px; -/* stylelint-disable selector-no-id */ +/* stylelint-disable selector-max-id */ div#mw-specialMap-container { -- To view, visit https://gerrit.wikimedia.org/r/404670 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I92912debb177ad7d920e2a32899e5bb770f6ad21 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Kartographer Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: getSelectedItem() -> findSelectedItem()
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404669 ) Change subject: getSelectedItem() -> findSelectedItem() .. getSelectedItem() -> findSelectedItem() Change-Id: I9d3803761b16001ae7a4ab0628ceb2ed8129ca01 --- M modules/ve-maps/ve.ui.MWMapsDialog.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer refs/changes/69/404669/1 diff --git a/modules/ve-maps/ve.ui.MWMapsDialog.js b/modules/ve-maps/ve.ui.MWMapsDialog.js index 96b731e..4fd60fa 100644 --- a/modules/ve-maps/ve.ui.MWMapsDialog.js +++ b/modules/ve-maps/ve.ui.MWMapsDialog.js @@ -240,7 +240,7 @@ if ( !( this.selectedNode instanceof ve.dm.MWInlineMapsNode ) ) { mwData.attrs.width = dimensions.width.toString(); mwData.attrs.height = dimensions.height.toString(); - mwData.attrs.align = this.align.getSelectedItem().getData(); + mwData.attrs.align = this.align.findSelectedItem().getData(); } }; -- To view, visit https://gerrit.wikimedia.org/r/404669 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9d3803761b16001ae7a4ab0628ceb2ed8129ca01 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Kartographer Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: getSelectedItem() -> findSelectedItem()
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404667 ) Change subject: getSelectedItem() -> findSelectedItem() .. getSelectedItem() -> findSelectedItem() Change-Id: Idf55594aa0bdf57083cf60e4ecfc2c67f93d35b8 --- M demos/ve/ve.demo.SurfaceContainer.js M demos/ve/ve.demo.init.js M src/ui/widgets/ve.ui.LanguageInputWidget.js M src/ui/widgets/ve.ui.MediaSizeWidget.js 4 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/67/404667/1 diff --git a/demos/ve/ve.demo.SurfaceContainer.js b/demos/ve/ve.demo.SurfaceContainer.js index 2203dcd..5368887 100644 --- a/demos/ve/ve.demo.SurfaceContainer.js +++ b/demos/ve/ve.demo.SurfaceContainer.js @@ -339,5 +339,5 @@ } localStorage.setItem( 've-demo-saved-markup', html ); this.pageMenu.selectItemByData( 'localStorage/ve-demo-saved-markup' ); - this.pageMenu.getSelectedItem().setDisabled( false ); + this.pageMenu.findSelectedItem().setDisabled( false ); }; diff --git a/demos/ve/ve.demo.init.js b/demos/ve/ve.demo.init.js index 03a4877..b7840f2 100644 --- a/demos/ve/ve.demo.init.js +++ b/demos/ve/ve.demo.init.js @@ -128,7 +128,7 @@ } if ( history.replaceState ) { for ( i = 0; i < ve.demo.surfaceContainers.length; i++ ) { - pages.push( ve.demo.surfaceContainers[ i ].pageMenu.getSelectedItem().getData() ); + pages.push( ve.demo.surfaceContainers[ i ].pageMenu.findSelectedItem().getData() ); } history.replaceState( null, document.title, '#!' + pages.join( ',' ) ); } @@ -138,7 +138,7 @@ var surfaceContainer; if ( !page && ve.demo.surfaceContainers.length ) { - page = ve.demo.surfaceContainers[ ve.demo.surfaceContainers.length - 1 ].pageMenu.getSelectedItem().getData(); + page = ve.demo.surfaceContainers[ ve.demo.surfaceContainers.length - 1 ].pageMenu.findSelectedItem().getData(); } surfaceContainer = new ve.demo.SurfaceContainer( target, page, currentLang, currentDir ); diff --git a/src/ui/widgets/ve.ui.LanguageInputWidget.js b/src/ui/widgets/ve.ui.LanguageInputWidget.js index 47893d3..e1059d0 100644 --- a/src/ui/widgets/ve.ui.LanguageInputWidget.js +++ b/src/ui/widgets/ve.ui.LanguageInputWidget.js @@ -151,7 +151,7 @@ return; } - selectedItem = this.directionSelect.getSelectedItem(); + selectedItem = this.directionSelect.findSelectedItem(); this.setLangAndDir( this.languageCodeTextInput.getValue(), selectedItem ? selectedItem.getData() : null diff --git a/src/ui/widgets/ve.ui.MediaSizeWidget.js b/src/ui/widgets/ve.ui.MediaSizeWidget.js index 3c80a62..2a7e9c1 100644 --- a/src/ui/widgets/ve.ui.MediaSizeWidget.js +++ b/src/ui/widgets/ve.ui.MediaSizeWidget.js @@ -320,7 +320,7 @@ * @return {string} The size type */ ve.ui.MediaSizeWidget.prototype.getSizeType = function () { - return this.sizeTypeSelectWidget.getSelectedItem() ? this.sizeTypeSelectWidget.getSelectedItem().getData() : ''; + return this.sizeTypeSelectWidget.findSelectedItem() ? this.sizeTypeSelectWidget.findSelectedItem().getData() : ''; }; /** @@ -593,8 +593,8 @@ * @return {boolean} Valid or invalid dimension values */ ve.ui.MediaSizeWidget.prototype.isValid = function () { - var itemType = this.sizeTypeSelectWidget.getSelectedItem() ? - this.sizeTypeSelectWidget.getSelectedItem().getData() : 'custom'; + var itemType = this.sizeTypeSelectWidget.findSelectedItem() ? + this.sizeTypeSelectWidget.findSelectedItem().getData() : 'custom'; // TODO: when upright is supported by Parsoid add validation for scale -- To view, visit https://gerrit.wikimedia.org/r/404667 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idf55594aa0bdf57083cf60e4ecfc2c67f93d35b8 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: getSelectedItem() -> findSelectedItem()
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404666 ) Change subject: getSelectedItem() -> findSelectedItem() .. getSelectedItem() -> findSelectedItem() Change-Id: Idf90335d06800b690063c7b2a781e822f0ee7ba9 --- M modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js M modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js M modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js M modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js M modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js 5 files changed, 11 insertions(+), 11 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/66/404666/1 diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js index 2c4fd10..b1a9db4 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js @@ -617,7 +617,7 @@ * Handle change event for this.modeDropdown */ ve.ui.MWGalleryDialog.prototype.onModeDropdownChange = function () { - var mode = this.modeDropdown.getMenu().getSelectedItem().getData(), + var mode = this.modeDropdown.getMenu().findSelectedItem().getData(), disabled = ( mode === 'packed' || mode === 'packed-overlay' || @@ -737,8 +737,8 @@ data.showFilename = this.showFilenameCheckbox.isSelected() ? 'yes' : undefined; data.classes = this.classesInput.getValue() || undefined; data.styles = this.stylesInput.getValue() || undefined; - if ( this.modeDropdown.getMenu().getSelectedItem() ) { - data.mode = this.modeDropdown.getMenu().getSelectedItem().getData(); + if ( this.modeDropdown.getMenu().findSelectedItem() ) { + data.mode = this.modeDropdown.getMenu().findSelectedItem().getData(); } // Unset mode attribute if it is the same as the default diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js index d9b770e..c61fdb9 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js @@ -81,7 +81,7 @@ ve.ui.MWTransclusionDialog.prototype.onOutlineControlsMove = function ( places ) { var part, promise, parts = this.transclusionModel.getParts(), - item = this.bookletLayout.getOutline().getSelectedItem(); + item = this.bookletLayout.getOutline().findSelectedItem(); if ( item ) { part = this.transclusionModel.getPartFromId( item.getData() ); @@ -98,7 +98,7 @@ */ ve.ui.MWTransclusionDialog.prototype.onOutlineControlsRemove = function () { var id, part, param, - item = this.bookletLayout.getOutline().getSelectedItem(); + item = this.bookletLayout.getOutline().findSelectedItem(); if ( item ) { id = item.getData(); @@ -134,7 +134,7 @@ */ ve.ui.MWTransclusionDialog.prototype.onAddParameterButtonClick = function () { var part, param, - item = this.bookletLayout.getOutline().getSelectedItem(); + item = this.bookletLayout.getOutline().findSelectedItem(); if ( item ) { part = this.transclusionModel.getPartFromId( item.getData() ); @@ -307,7 +307,7 @@ ve.ui.MWTransclusionDialog.prototype.addPart = function ( part ) { var index, promise, parts = this.transclusionModel.getParts(), - item = this.bookletLayout.getOutline().getSelectedItem(); + item = this.bookletLayout.getOutline().findSelectedItem(); if ( part ) { // Insert after selected part, or at the end if nothing is selected diff --git a/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js b/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js index b3edcd7..bfe069f 100644 --- a/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js +++ b/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js @@ -253,7 +253,7 @@ // Indexing items currentIndexingItem = this.getMetaItem( 'mwIndex' ); - newIndexingData = this.indexing.getField().getSelectedItem(); + newIndexingData = this.indexing.getField().findSelectedItem(); // Alter the indexing option flag iff it's been touched & is actually different if ( this.indexingOptionTouched ) { @@ -276,7 +276,7 @@ // New section edit link items currentNewSectionEditLinkItem = this.getMetaItem( 'mwNewSectionEdit' ); - newNewSectionEditLinkData = this.newEditSectionLink.getField().getSelectedItem(); + newNewSectionEditLinkData = this.newEditSectionLink.getField().findSelectedItem(); // Alter the new section edit option flag iff it's been touched & is actually
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Remember preferred diff viewer
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404659 ) Change subject: Remember preferred diff viewer .. Remember preferred diff viewer Separate the preference by surface mode, so you can use a different preference for NWE. Bug: T178691 Change-Id: Ib8494a4562ce766a7c8ef7ec1447d06f5d0f17c5 --- M VisualEditor.hooks.php M modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js 2 files changed, 25 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/59/404659/1 diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php index ebd7463..cfd8ce6 100644 --- a/VisualEditor.hooks.php +++ b/VisualEditor.hooks.php @@ -669,6 +669,10 @@ $api = [ 'type' => 'api' ]; $preferences['visualeditor-autodisable'] = $api; + // The diff mode is persisted for each editor mode separately, + // e.g. use visual diffs for visual mode only. + $preferences['visualeditor-diffmode-source'] = $api; + $preferences['visualeditor-diffmode-visual'] = $api; $preferences['visualeditor-editor'] = $api; $preferences['visualeditor-hidebetawelcome'] = $api; $preferences['visualeditor-hidetabdialog'] = $api; diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js index f2649c4..96829ac 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js @@ -593,8 +593,6 @@ ], classes: [ 've-ui-mwSaveDialog-reviewMode' ] } ); - // TODO: Make 'visual' the default - this.reviewModeButtonSelect.selectItemByData( 'source' ); this.reviewModeButtonSelect.connect( this, { select: 'updateReviewMode' } ); this.$reviewEditSummary = $( '' ).addClass( 've-ui-mwSaveDialog-summaryPreview' ).addClass( 'comment' ); @@ -649,7 +647,18 @@ ve.ui.MWSaveDialog.prototype.updateReviewMode = function () { var dialog = this, - isVisual = this.reviewModeButtonSelect.getSelectedItem().getData() === 'visual'; + diffMode = this.reviewModeButtonSelect.getSelectedItem().getData(), + surfaceMode = ve.init.target.getSurface().getMode(), + isVisual = diffMode === 'visual'; + + if ( !this.hasDiff ) { + return; + } + + // Config values used here: + // * visualeditor-diffmode-visual + // * visualeditor-diffmode-source + ve.userConfig( 'visualeditor-diffmode-' + surfaceMode, diffMode ); // Hack: cache report action so it is getable even when hidden (see T174497) if ( !this.report ) { @@ -721,6 +730,7 @@ ve.ui.MWSaveDialog.prototype.getSetupProcess = function ( data ) { return ve.ui.MWSaveDialog.super.prototype.getSetupProcess.call( this, data ) .next( function () { + var surfaceMode = ve.init.target.getSurface().getMode(); this.canReview = !!data.canReview; this.canPreview = !!data.canPreview; this.setupCheckboxes( data.checkboxFields || [] ); @@ -736,6 +746,14 @@ } } + // Config values used here: + // * visualeditor-diffmode-visual + // * visualeditor-diffmode-source + // TODO: Make 'visual' the default for visual mode (T178248) + this.reviewModeButtonSelect.selectItemByData( + ve.userConfig( 'visualeditor-diffmode-' + surfaceMode ) || 'source' + ); + // Old messages should not persist this.clearAllMessages(); // Don't focus during setup to prevent scroll jumping (T153010) -- To view, visit https://gerrit.wikimedia.org/r/404659 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib8494a4562ce766a7c8ef7ec1447d06f5d0f17c5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Make visual diffs the default in visual mode
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404660 ) Change subject: Make visual diffs the default in visual mode .. Make visual diffs the default in visual mode Bug: T178248 Change-Id: I9fe22862d4415df034a0054f934c9ebd1d731a5d --- M modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/60/404660/1 diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js index 96829ac..ab247e9 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js @@ -749,9 +749,8 @@ // Config values used here: // * visualeditor-diffmode-visual // * visualeditor-diffmode-source - // TODO: Make 'visual' the default for visual mode (T178248) this.reviewModeButtonSelect.selectItemByData( - ve.userConfig( 'visualeditor-diffmode-' + surfaceMode ) || 'source' + ve.userConfig( 'visualeditor-diffmode-' + surfaceMode ) || surfaceMode ); // Old messages should not persist -- To view, visit https://gerrit.wikimedia.org/r/404660 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9fe22862d4415df034a0054f934c9ebd1d731a5d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Don't pass wikitext to requestPageData if unmodified
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404164 ) Change subject: Don't pass wikitext to requestPageData if unmodified .. Don't pass wikitext to requestPageData if unmodified Bug: T184875 Change-Id: I41a72a9c7546fafc834bf837e507d9359872ff11 --- M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/64/404164/1 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 36ad052..f0bce73 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 @@ -281,8 +281,8 @@ modified: modified, preload: uri.query.preload, preloadparams: uri.query[ 'preloadparams[]' ], - // If switching to visual, check if we have wikitext to convert - wikitext: mode === 'visual' ? $( '#wpTextbox1' ).textSelection( 'getContents' ) : undefined + // If switching to visual with modifications, check if we have wikitext to convert + wikitext: mode === 'visual' && modified ? $( '#wpTextbox1' ).textSelection( 'getContents' ) : undefined } ); } ) .done( incrementLoadingProgress ); -- To view, visit https://gerrit.wikimedia.org/r/404164 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I41a72a9c7546fafc834bf837e507d9359872ff11 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Use MultilineTextInputWidget in PHP demos
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/403935 ) Change subject: Use MultilineTextInputWidget in PHP demos .. Use MultilineTextInputWidget in PHP demos Change-Id: I3e1704e4f1f3d89beecac4a7a82de49dbc8aa397 --- M demos/pages/widgets.php 1 file changed, 2 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/35/403935/1 diff --git a/demos/pages/widgets.php b/demos/pages/widgets.php index fa48e7d..ac2d261 100644 --- a/demos/pages/widgets.php +++ b/demos/pages/widgets.php @@ -417,18 +417,7 @@ ] ), new OOUI\FieldLayout( - new OOUI\TextInputWidget( [ - 'multiline' => true, - 'value' => "Multiline\nMultiline" - ] ), - [ - 'label' => "TextInputWidget (multiline; deprecated)\xE2\x80\x8E", - 'align' => 'top' - ] - ), - new OOUI\FieldLayout( - new OOUI\TextInputWidget( [ - 'multiline' => true, + new OOUI\MultilineTextInputWidget( [ 'rows' => 15, 'value' => "Multiline\nMultiline" ] ), @@ -438,8 +427,7 @@ ] ), new OOUI\FieldLayout( - new OOUI\TextInputWidget( [ - 'multiline' => true, + new OOUI\MultilineTextInputWidget( [ 'value' => "Multiline\nMultiline", 'icon' => 'tag', 'indicator' => 'required' -- To view, visit https://gerrit.wikimedia.org/r/403935 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3e1704e4f1f3d89beecac4a7a82de49dbc8aa397 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Follow-Up I0f1d9c1f: Update usages of getSelectedItem -> fin...
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/403934 ) Change subject: Follow-Up I0f1d9c1f: Update usages of getSelectedItem -> findSelectedItem .. Follow-Up I0f1d9c1f: Update usages of getSelectedItem -> findSelectedItem Change-Id: I421a4730cfd4a260b75d94c8dd0ad3b63de1a15b --- M demos/demo.js M src/layouts/BookletLayout.js M src/layouts/IndexLayout.js M src/mixins/LookupElement.js M src/widgets/CheckboxMultiselectInputWidget.js M src/widgets/DropdownWidget.js M src/widgets/MenuSelectWidget.js M src/widgets/OutlineControlsWidget.js M src/widgets/SearchWidget.js M src/widgets/SelectWidget.js 10 files changed, 20 insertions(+), 20 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/34/403934/1 diff --git a/demos/demo.js b/demos/demo.js index 9ee3e12..a4f89f1 100644 --- a/demos/demo.js +++ b/demos/demo.js @@ -297,10 +297,10 @@ * Will load a new page. */ Demo.prototype.onModeChange = function () { - var page = this.pageMenu.getSelectedItem().getData(), - theme = this.themeSelect.getSelectedItem().getData(), - direction = this.directionSelect.getSelectedItem().getData(), - platform = this.platformSelect.getSelectedItem().getData(); + var page = this.pageMenu.findSelectedItem().getData(), + theme = this.themeSelect.findSelectedItem().getData(), + direction = this.directionSelect.findSelectedItem().getData(), + platform = this.platformSelect.findSelectedItem().getData(); history.pushState( null, document.title, this.getUrlQuery( [ page, theme, direction, platform ] ) ); $( window ).triggerHandler( 'popstate' ); diff --git a/src/layouts/BookletLayout.js b/src/layouts/BookletLayout.js index c53017a..cb97338 100644 --- a/src/layouts/BookletLayout.js +++ b/src/layouts/BookletLayout.js @@ -522,7 +522,7 @@ if ( name !== this.currentPageName ) { if ( this.outlined ) { - selectedItem = this.outlineSelectWidget.getSelectedItem(); + selectedItem = this.outlineSelectWidget.findSelectedItem(); if ( selectedItem && selectedItem.getData() !== name ) { this.outlineSelectWidget.selectItemByData( name ); } @@ -568,7 +568,7 @@ * @chainable */ OO.ui.BookletLayout.prototype.selectFirstSelectablePage = function () { - if ( !this.outlineSelectWidget.getSelectedItem() ) { + if ( !this.outlineSelectWidget.findSelectedItem() ) { this.outlineSelectWidget.selectItem( this.outlineSelectWidget.findFirstSelectableItem() ); } diff --git a/src/layouts/IndexLayout.js b/src/layouts/IndexLayout.js index 12fb1b5..4cc5aaf 100644 --- a/src/layouts/IndexLayout.js +++ b/src/layouts/IndexLayout.js @@ -391,7 +391,7 @@ previousTabPanel = this.currentTabPanelName && this.tabPanels[ this.currentTabPanelName ]; if ( name !== this.currentTabPanelName ) { - selectedItem = this.tabSelectWidget.getSelectedItem(); + selectedItem = this.tabSelectWidget.findSelectedItem(); if ( selectedItem && selectedItem.getData() !== name ) { this.tabSelectWidget.selectItemByData( name ); } @@ -436,7 +436,7 @@ * @chainable */ OO.ui.IndexLayout.prototype.selectFirstSelectableTabPanel = function () { - if ( !this.tabSelectWidget.getSelectedItem() ) { + if ( !this.tabSelectWidget.findSelectedItem() ) { this.tabSelectWidget.selectItem( this.tabSelectWidget.findFirstSelectableItem() ); } diff --git a/src/mixins/LookupElement.js b/src/mixins/LookupElement.js index 1041911..3c9be7e 100644 --- a/src/mixins/LookupElement.js +++ b/src/mixins/LookupElement.js @@ -248,7 +248,7 @@ * @chainable */ OO.ui.mixin.LookupElement.prototype.initializeLookupMenuSelection = function () { - if ( this.lookupHighlightFirstItem && !this.lookupMenu.getSelectedItem() ) { + if ( this.lookupHighlightFirstItem && !this.lookupMenu.findSelectedItem() ) { this.lookupMenu.highlightItem( this.lookupMenu.findFirstSelectableItem() ); } }; diff --git a/src/widgets/CheckboxMultiselectInputWidget.js b/src/widgets/CheckboxMultiselectInputWidget.js index 9efe27d..01fc9cd 100644 --- a/src/widgets/CheckboxMultiselectInputWidget.js +++ b/src/widgets/CheckboxMultiselectInputWidget.js @@ -50,7 +50,7 @@ // setValue when checkboxMultiselectWidget changes this.checkboxMultiselectWidget.on( 'change', function () { - this.setValue( this.checkboxMultiselectWidget.getSelectedItemsData() ); + this.setValue( this.checkboxMultiselectWidget.findSelectedItemsData() ); }.bind( this ) ); }; diff --git a/src/widgets/DropdownWidget.js
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Catch timeout errors in screenshot scripts
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/403710 ) Change subject: Catch timeout errors in screenshot scripts .. Catch timeout errors in screenshot scripts Bug: T184724 Change-Id: Ifbc03b1291c291dcfc862487766e3786f9bd437c --- M Gruntfile.js M build/screenshots.js 2 files changed, 23 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/10/403710/1 diff --git a/Gruntfile.js b/Gruntfile.js index f25fad1..6497523 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -11,7 +11,7 @@ var modules = grunt.file.readJSON( 'lib/ve/build/modules.json' ), screenshotOptions = { reporter: 'spec', - timeout: 4, + timeout: Infinity, require: [ function () { // eslint-disable-next-line no-undef, no-implicit-globals @@ -21,7 +21,7 @@ }, screenshotOptionsAll = { reporter: 'spec', - timeout: 4, + timeout: Infinity, require: [ function () { // eslint-disable-next-line no-undef, no-implicit-globals diff --git a/build/screenshots.js b/build/screenshots.js index d163a43..b461792 100644 --- a/build/screenshots.js +++ b/build/screenshots.js @@ -7,7 +7,8 @@ fs = require( 'fs' ), Jimp = require( 'jimp' ), username = process.env.SAUCE_ONDEMAND_USERNAME, - webdriver = require( 'selenium-webdriver' ); + webdriver = require( 'selenium-webdriver' ), + TIMEOUT = 40 * 1000; function createScreenshotEnvironment( test, beforeEach ) { var clientSize, driver; @@ -29,7 +30,7 @@ driver = new chrome.Driver(); } - driver.manage().timeouts().setScriptTimeout( 4 ); + driver.manage().timeouts().setScriptTimeout( TIMEOUT ); driver.manage().window().setSize( 1200, 1000 ); driver.get( 'https://en.wikipedia.org/wiki/Help:Sample_page?veaction=edit=' + lang ); @@ -132,10 +133,22 @@ } ).then( function ( cs ) { clientSize = cs; + }, function ( e ) { + // Log error (timeout) + console.error( e.message ); } ) ); if ( beforeEach ) { - driver.wait( driver.executeAsyncScript( beforeEach ) ); + driver.manage().timeouts().setScriptTimeout( TIMEOUT ); + driver.wait( + driver.executeAsyncScript( beforeEach ).then( + function () {}, + function ( e ) { + // Log error (timeout) + console.error( e.message ); + } + ) + ); } } ); @@ -165,6 +178,7 @@ function runScreenshotTest( name, lang, clientScript, padding ) { var filename = './screenshots/' + name + '-' + lang + '.png'; + driver.manage().timeouts().setScriptTimeout( TIMEOUT ); driver.wait( driver.executeAsyncScript( clientScript ).then( function ( rect ) { return driver.takeScreenshot().then( function ( base64Image ) { @@ -176,8 +190,10 @@ fs.writeFile( filename, base64Image, 'base64' ); } } ); - } ), - 4 + }, function ( e ) { + // Log error (timeout) + console.error( e ); + } ) ); } -- To view, visit https://gerrit.wikimedia.org/r/403710 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id:
[MediaWiki-commits] [Gerrit] mediawiki...Math[master]: Fix auto-height when CodeMirror not available
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/403656 ) Change subject: Fix auto-height when CodeMirror not available .. Fix auto-height when CodeMirror not available Change-Id: I0e88b12b0e67f471bac8ab767cdeca8ac7bafeec --- M modules/ve-math/ve.ui.MWLatexDialog.js 1 file changed, 22 insertions(+), 20 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Math refs/changes/56/403656/1 diff --git a/modules/ve-math/ve.ui.MWLatexDialog.js b/modules/ve-math/ve.ui.MWLatexDialog.js index 102500e..6f2c407 100644 --- a/modules/ve-math/ve.ui.MWLatexDialog.js +++ b/modules/ve-math/ve.ui.MWLatexDialog.js @@ -273,29 +273,31 @@ * Handle the window resize event */ ve.ui.MWLatexDialog.prototype.onWindowManagerResize = function () { - var dialog = this; - this.input.loadingPromise.done( function () { - var availableSpace, maxInputHeight, singleLineHeight, minRows, - border = 1, - padding = 3, - borderAndPadding = 2 * ( border + padding ); + var availableSpace, maxInputHeight, singleLineHeight, minRows, + dialog = this, + border = 1, + padding = 3, + borderAndPadding = 2 * ( border + padding ); - // Toggle short mode as necessary - // NB a change of mode triggers a transition... - dialog.menuLayout.$element.toggleClass( - 've-ui-mwLatexDialog-menuLayout-short', dialog.menuLayout.$element.height() < 450 - ); + // Toggle short mode as necessary + // NB a change of mode triggers a transition... + dialog.menuLayout.$element.toggleClass( + 've-ui-mwLatexDialog-menuLayout-short', dialog.menuLayout.$element.height() < 450 + ); - // ...So wait for the possible menuLayout transition to finish - setTimeout( function () { - // Give the input the right number of rows to fit the space - availableSpace = dialog.menuLayout.$content.height() - dialog.input.$element.position().top; - singleLineHeight = 19; - maxInputHeight = availableSpace - borderAndPadding; - minRows = Math.floor( maxInputHeight / singleLineHeight ); + // ...So wait for the possible menuLayout transition to finish + setTimeout( function () { + // Give the input the right number of rows to fit the space + availableSpace = dialog.menuLayout.$content.height() - dialog.input.$element.position().top; + singleLineHeight = 19; + maxInputHeight = availableSpace - borderAndPadding; + minRows = Math.floor( maxInputHeight / singleLineHeight ); + dialog.input.loadingPromise.done( function () { dialog.input.setMinRows( minRows ); - }, OO.ui.theme.getDialogTransitionDuration() ); - } ); + } ).fail( function () { + dialog.input.$input.attr( 'rows', minRows ); + } ); + }, OO.ui.theme.getDialogTransitionDuration() ); }; /** -- To view, visit https://gerrit.wikimedia.org/r/403656 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0e88b12b0e67f471bac8ab767cdeca8ac7bafeec Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Math Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SyntaxHighlight_GeSHi[master]: Mark es6 file as such
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/403651 ) Change subject: Mark es6 file as such .. Mark es6 file as such Change-Id: I981ac80d93c81a2256c6bc5e519e653c8400d63b --- M Gruntfile.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SyntaxHighlight_GeSHi refs/changes/51/403651/1 diff --git a/Gruntfile.js b/Gruntfile.js index 7e4ab44..e176bc9 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -4,7 +4,7 @@ * @package SyntaxHighlight_GeSHi */ -/* eslint-env node */ +/* eslint-env node, es6 */ module.exports = function ( grunt ) { var conf = grunt.file.readJSON( 'extension.json' ); -- To view, visit https://gerrit.wikimedia.org/r/403651 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I981ac80d93c81a2256c6bc5e519e653c8400d63b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SyntaxHighlight_GeSHi[master]: Document monospace hack
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/403650 ) Change subject: Document monospace hack .. Document monospace hack Change-Id: Ia27dccdb9dc2de6ca66e08c54c62eb91302a381c --- M modules/ve-syntaxhighlight/ve.ui.MWSyntaxHighlightDialog.css M modules/ve-syntaxhighlight/ve.ui.MWSyntaxHighlightInspector.css 2 files changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SyntaxHighlight_GeSHi refs/changes/50/403650/1 diff --git a/modules/ve-syntaxhighlight/ve.ui.MWSyntaxHighlightDialog.css b/modules/ve-syntaxhighlight/ve.ui.MWSyntaxHighlightDialog.css index d4c4a2b..de51edd 100644 --- a/modules/ve-syntaxhighlight/ve.ui.MWSyntaxHighlightDialog.css +++ b/modules/ve-syntaxhighlight/ve.ui.MWSyntaxHighlightDialog.css @@ -10,7 +10,8 @@ } .ve-ui-mwSyntaxHighlightDialog-content .ve-ui-mwExtensionWindow-input textarea { - font-family: monospace, 'Courier'; + /* T176636 */ + font-family: monospace, monospace; } .ve-ui-mwSyntaxHighlightDialog-content .ve-ui-mwSyntaxHighlightWindow-languageField, diff --git a/modules/ve-syntaxhighlight/ve.ui.MWSyntaxHighlightInspector.css b/modules/ve-syntaxhighlight/ve.ui.MWSyntaxHighlightInspector.css index e03c48f..32ff1c0 100644 --- a/modules/ve-syntaxhighlight/ve.ui.MWSyntaxHighlightInspector.css +++ b/modules/ve-syntaxhighlight/ve.ui.MWSyntaxHighlightInspector.css @@ -6,7 +6,8 @@ */ .ve-ui-mwSyntaxHighlightInspector-content .ve-ui-mwExtensionWindow-input textarea { - font-family: monospace, 'Courier'; + /* T176636 */ + font-family: monospace, monospace; } .ve-ui-mwSyntaxHighlightInspector-content .oo-ui-numberInputWidget { -- To view, visit https://gerrit.wikimedia.org/r/403650 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia27dccdb9dc2de6ca66e08c54c62eb91302a381c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Score[master]: Document monospace hack
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/403645 ) Change subject: Document monospace hack .. Document monospace hack Change-Id: I236e6e59bf4c7f58d47b108bd483b3dca6c03cd2 --- M modules/ve-score/ve.ui.MWScoreInspector.css 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Score refs/changes/45/403645/1 diff --git a/modules/ve-score/ve.ui.MWScoreInspector.css b/modules/ve-score/ve.ui.MWScoreInspector.css index 5716e1f..0c6495f 100644 --- a/modules/ve-score/ve.ui.MWScoreInspector.css +++ b/modules/ve-score/ve.ui.MWScoreInspector.css @@ -6,5 +6,6 @@ */ .ve-ui-mwScoreInspector-content .ve-ui-mwExtensionWindow-input textarea { - font-family: monospace, 'Courier'; + /* See T176636 */ + font-family: monospace, monospace; } -- To view, visit https://gerrit.wikimedia.org/r/403645 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I236e6e59bf4c7f58d47b108bd483b3dca6c03cd2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Score Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Score[master]: Allow note-language to be unset in VE, and use as default
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/403644 ) Change subject: Allow note-language to be unset in VE, and use as default .. Allow note-language to be unset in VE, and use as default Change-Id: I0f3f7cde4a720adb2a2a3cae93d4af751603ca52 --- M modules/ve-score/ve.ui.MWScoreInspector.js 1 file changed, 13 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Score refs/changes/44/403644/1 diff --git a/modules/ve-score/ve.ui.MWScoreInspector.js b/modules/ve-score/ve.ui.MWScoreInspector.js index ba6ccce..1d16ef8 100644 --- a/modules/ve-score/ve.ui.MWScoreInspector.js +++ b/modules/ve-score/ve.ui.MWScoreInspector.js @@ -44,7 +44,9 @@ vorbisField, overrideOggField, rawField, notationTabPanel, audioTabPanel, advancedTabPanel, - language, languages = mw.config.get( 'wgScoreNoteLanguages' ); + language, + languageItems = [], + languages = mw.config.get( 'wgScoreNoteLanguages' ); // Parent method ve.ui.MWScoreInspector.super.prototype.initialize.call( this ); @@ -97,12 +99,19 @@ // Note Language this.noteLanguageDropdown = new OO.ui.DropdownWidget(); + languageItems.push( + new OO.ui.MenuOptionWidget( { + data: null, + label: '\u00a0' + } ) + ); for ( language in languages ) { - this.noteLanguageDropdown.getMenu().insertItem( new OO.ui.MenuOptionWidget( { + languageItems.push( new OO.ui.MenuOptionWidget( { data: language, label: languages[ language ] } ) ); } + this.noteLanguageDropdown.getMenu().addItems( languageItems ); // Checkboxes this.midiCheckbox = new OO.ui.CheckboxInputWidget(); @@ -177,7 +186,7 @@ .next( function () { var attributes = this.selectedNode.getAttribute( 'mw' ).attrs, lang = attributes.lang || 'lilypond', - noteLanguage = attributes[ 'note-language' ] || mw.config.get( 'wgScoreDefaultNoteLanguage' ), + noteLanguage = attributes[ 'note-language' ] || null, raw = attributes.raw !== undefined, vorbis = attributes.vorbis === '1', /* eslint-disable camelcase */ @@ -246,7 +255,7 @@ // Get data from inspector lang = this.langSelect.getSelectedItem().getData(); - noteLanguage = this.noteLanguageDropdown.getMenu().getSelectedItem().getData(); + noteLanguage = this.noteLanguageDropdown.getMenu().getSelectedItem().getData() || undefined; raw = !this.rawCheckbox.isDisabled() && this.rawCheckbox.isSelected(); // audioCheckbox is selected if an audio file is being included, whether that file // is being auto-generated or whether an existing file is being used; but the "vorbis" -- To view, visit https://gerrit.wikimedia.org/r/403644 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0f3f7cde4a720adb2a2a3cae93d4af751603ca52 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Score Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Score[master]: Unbreak widgets: 'findSelectedItem' -> 'getSelectedItem'
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/403643 ) Change subject: Unbreak widgets: 'findSelectedItem' -> 'getSelectedItem' .. Unbreak widgets: 'findSelectedItem' -> 'getSelectedItem' Change-Id: If621c2d8ee933e510f3011e6ae16077d54f11d03 --- M modules/ve-score/ve.ui.MWScoreInspector.js 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Score refs/changes/43/403643/1 diff --git a/modules/ve-score/ve.ui.MWScoreInspector.js b/modules/ve-score/ve.ui.MWScoreInspector.js index 3de0296..ba6ccce 100644 --- a/modules/ve-score/ve.ui.MWScoreInspector.js +++ b/modules/ve-score/ve.ui.MWScoreInspector.js @@ -245,8 +245,8 @@ ve.ui.MWScoreInspector.super.prototype.updateMwData.call( this, mwData ); // Get data from inspector - lang = this.langSelect.findSelectedItem().getData(); - noteLanguage = this.noteLanguageDropdown.getMenu().findSelectedItem().getData(); + lang = this.langSelect.getSelectedItem().getData(); + noteLanguage = this.noteLanguageDropdown.getMenu().getSelectedItem().getData(); raw = !this.rawCheckbox.isDisabled() && this.rawCheckbox.isSelected(); // audioCheckbox is selected if an audio file is being included, whether that file // is being auto-generated or whether an existing file is being used; but the "vorbis" @@ -272,7 +272,7 @@ */ ve.ui.MWScoreInspector.prototype.toggleDisableRawCheckbox = function () { // Disable the checkbox if the language is not LilyPond - this.rawCheckbox.setDisabled( this.langSelect.findSelectedItem().getData() !== 'lilypond' ); + this.rawCheckbox.setDisabled( this.langSelect.getSelectedItem().getData() !== 'lilypond' ); }; /** -- To view, visit https://gerrit.wikimedia.org/r/403643 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If621c2d8ee933e510f3011e6ae16077d54f11d03 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Score Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Score[master]: Fix capitalisation of 'LilyPond'
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/403636 ) Change subject: Fix capitalisation of 'LilyPond' .. Fix capitalisation of 'LilyPond' Change-Id: Ia91b65c0da9371f13417770e335fa8035125cede --- M i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Score refs/changes/36/403636/1 diff --git a/i18n/en.json b/i18n/en.json index 87a2363..033c678 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -13,7 +13,7 @@ "score-convertoverrideaudio": "You cannot request audio rendering and specify override_audio at the same time.", "score-desc": "Adds a tag for rendering musical scores with LilyPond", "score-download-midi-file": "Download MIDI file", - "score-download-source-file": "Download lilypond file", + "score-download-source-file": "Download LilyPond file", "score-error-category": "Pages with score rendering errors", "score-error-category-desc": "There was an error while rendering the score.", "score-fallbacknotexecutable": "TiMidity++ could not be executed as fallback: $1 is not an executable file. Make sure $wgScoreTimidity or $wgScoreFluidsynth is set correctly.", -- To view, visit https://gerrit.wikimedia.org/r/403636 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia91b65c0da9371f13417770e335fa8035125cede Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Score Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: WIP Create transactions for changes to tempWikitextEditor
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/403472 ) Change subject: WIP Create transactions for changes to tempWikitextEditor .. WIP Create transactions for changes to tempWikitextEditor Change-Id: Iebcfe2ed7edb7a097914a6775c43bcc96236009a --- M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 1 file changed, 40 insertions(+), 15 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/72/403472/1 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 5109a35..dcc3733 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 @@ -21,7 +21,7 @@ var conf, tabMessages, uri, pageExists, viewUri, veEditUri, veEditSourceUri, isViewPage, isEditPage, pageCanLoadEditor, init, targetPromise, enable, tempdisable, autodisable, tabPreference, enabledForUser, initialWikitext, oldId, - isLoading, tempWikitextEditor, $toolbarPlaceholder, + isLoading, tempWikitextEditor, $toolbarPlaceholder, originalContent, editModes = { edit: 'visual' }, @@ -107,18 +107,8 @@ } function setupTempWikitextEditor( data ) { - tempWikitextEditor = new mw.libs.ve.MWTempWikitextEditorWidget( { - value: data.content, - onChange: function () { - // Write changes back to response data object, - // which will be used to construct the surface. - data.content = tempWikitextEditor.getValue(); - // TODO: Consider writing changes using a - // transaction so they can be undone. - // For now, just mark surface as pre-modified - data.fromEditedState = true; - } - } ); + originalContent = data.content; + tempWikitextEditor = new mw.libs.ve.MWTempWikitextEditorWidget( { value: data.content } ); // Create an equal-height placeholder for the toolbar to avoid vertical jump // when the real toolbar is ready. @@ -144,9 +134,44 @@ } function teardownTempWikitextEditor() { - var range, + var range, offset, diff, nativeRange = tempWikitextEditor.getRange(), - surfaceModel = ve.init.target.getSurface().getModel(); + surfaceModel = ve.init.target.getSurface().getModel(), + newContent = tempWikitextEditor.getValue(); + + // If the textarea was modified, apply transactions based on the diff. + /* global diff_match_patch */ + if ( originalContent !== newContent ) { + offset = 1; + // eslint-disable-next-line new-cap + diff = new diff_match_patch().diff_main( originalContent, newContent ); + diff.forEach( function ( change ) { + var data, + lines = change[ 1 ].match( /\n/g ), + length = change[ 1 ].length + ( lines ? lines.length : 0 ); + switch ( change[ 0 ] ) { + case ve.DiffMatchPatch.static.DIFF_EQUAL: + offset += length; + break; + case ve.DiffMatchPatch.static.DIFF_INSERT: + data = change[ 1 ].split( '' ).reduce( function ( res, char ) { + if ( char === '\n' ) { + res.push( { type: '/paragraph' }, { type: 'paragraph' } ); + } else { + res.push( char ); + } + return res; + }, [] ); + surfaceModel.getLinearFragment( new ve.Range( offset ) ).insertContent( data ); + offset += length; + break; + case
[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Ubreak CSS selector for fallback input widget
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/403441 ) Change subject: Ubreak CSS selector for fallback input widget .. Ubreak CSS selector for fallback input widget Change-Id: I52bf0d5137e4c04fd71cb0058fad14aa70d2860d --- M modules/styles/flow/widgets/editor/mw.flow.ui.EditorWidget.less 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/41/403441/1 diff --git a/modules/styles/flow/widgets/editor/mw.flow.ui.EditorWidget.less b/modules/styles/flow/widgets/editor/mw.flow.ui.EditorWidget.less index 7e17b47..958e8d7 100644 --- a/modules/styles/flow/widgets/editor/mw.flow.ui.EditorWidget.less +++ b/modules/styles/flow/widgets/editor/mw.flow.ui.EditorWidget.less @@ -31,7 +31,7 @@ bottom: @editorToolbarHeight; } - > .oo-ui-textInputWidget { + &-editor > .oo-ui-textInputWidget { max-width: none; textarea { -- To view, visit https://gerrit.wikimedia.org/r/403441 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I52bf0d5137e4c04fd71cb0058fad14aa70d2860d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikiEditor[master]: Emit deprecation warnings when old modules are used
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/402851 ) Change subject: Emit deprecation warnings when old modules are used .. Emit deprecation warnings when old modules are used Bug: T184194 Change-Id: If5649ab48ebbf47e9981ec010bb1e5ce668c5487 --- M extension.json A modules/ext.wikiEditor.deprecatedModule.js 2 files changed, 24 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiEditor refs/changes/51/402851/1 diff --git a/extension.json b/extension.json index 7937823..7ada8e2 100644 --- a/extension.json +++ b/extension.json @@ -287,34 +287,44 @@ "styles": "ext.wikiEditor.toolbar.styles.less" }, "ext.wikiEditor.toolbar": { - "dependencies": [ "ext.wikiEditor" ] + "dependencies": "ext.wikiEditor", + "scripts": "ext.wikiEditor.deprecatedModule.js" }, "ext.wikiEditor.dialogs": { - "dependencies": [ "ext.wikiEditor" ] + "dependencies": "ext.wikiEditor", + "scripts": "ext.wikiEditor.deprecatedModule.js" }, "ext.wikiEditor.core": { - "dependencies": [ "ext.wikiEditor" ] + "dependencies": "ext.wikiEditor", + "scripts": "ext.wikiEditor.deprecatedModule.js" }, "jquery.wikiEditor": { - "dependencies": [ "ext.wikiEditor" ] + "dependencies": "ext.wikiEditor", + "scripts": "ext.wikiEditor.deprecatedModule.js" }, "jquery.wikiEditor.core": { - "dependencies": [ "ext.wikiEditor" ] + "dependencies": "ext.wikiEditor", + "scripts": "ext.wikiEditor.deprecatedModule.js" }, "jquery.wikiEditor.dialogs": { - "dependencies": [ "ext.wikiEditor" ] + "dependencies": "ext.wikiEditor", + "scripts": "ext.wikiEditor.deprecatedModule.js" }, "jquery.wikiEditor.dialogs.config": { - "dependencies": [ "ext.wikiEditor" ] + "dependencies": "ext.wikiEditor", + "scripts": "ext.wikiEditor.deprecatedModule.js" }, "jquery.wikiEditor.toolbar": { - "dependencies": [ "ext.wikiEditor" ] + "dependencies": "ext.wikiEditor", + "scripts": "ext.wikiEditor.deprecatedModule.js" }, "jquery.wikiEditor.toolbar.config": { - "dependencies": [ "ext.wikiEditor" ] + "dependencies": "ext.wikiEditor", + "scripts": "ext.wikiEditor.deprecatedModule.js" }, "jquery.wikiEditor.toolbar.i18n": { - "dependencies": [ "ext.wikiEditor" ] + "dependencies": "ext.wikiEditor", + "scripts": "ext.wikiEditor.deprecatedModule.js" } }, "ResourceFileModulePaths": { diff --git a/modules/ext.wikiEditor.deprecatedModule.js b/modules/ext.wikiEditor.deprecatedModule.js new file mode 100644 index 000..c1bedfd --- /dev/null +++ b/modules/ext.wikiEditor.deprecatedModule.js @@ -0,0 +1,4 @@ +/* global mw */ + +mw.track( 'mw.deprecate', 'wikieditor-modules' ); +mw.log.warn( 'WikiEditor should only be loaded via the \'ext.wikiEditor\' module.' ); -- To view, visit https://gerrit.wikimedia.org/r/402851 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If5649ab48ebbf47e9981ec010bb1e5ce668c5487 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikiEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: MWImageModel: Check selectedNode exists before asking for pr...
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/402842 ) Change subject: MWImageModel: Check selectedNode exists before asking for property .. MWImageModel: Check selectedNode exists before asking for property Bug: T180521 Change-Id: I1c10929abd6f5c4afa03a65904bc76fc82f8fcbb --- M modules/ve-mw/dm/models/ve.dm.MWImageModel.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/42/402842/1 diff --git a/modules/ve-mw/dm/models/ve.dm.MWImageModel.js b/modules/ve-mw/dm/models/ve.dm.MWImageModel.js index 600705a..8b727b9 100644 --- a/modules/ve-mw/dm/models/ve.dm.MWImageModel.js +++ b/modules/ve-mw/dm/models/ve.dm.MWImageModel.js @@ -458,7 +458,7 @@ switch ( nodeType ) { case 'mwInlineImage': - if ( selectedNode.type === 'mwBlockImage' ) { + if ( selectedNode && selectedNode.type === 'mwBlockImage' ) { // If converting from a block image, create a wrapper paragraph for the inline image to go in. fragment.insertContent( [ { type: 'paragraph', internal: { generated: 'wrapper' } }, { type: '/paragraph' } ] ); offset = fragment.getSelection().getRange().start + 1; -- To view, visit https://gerrit.wikimedia.org/r/402842 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1c10929abd6f5c4afa03a65904bc76fc82f8fcbb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Remove unused module alias "unicodejs.wordbreak"
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/402142 ) Change subject: Remove unused module alias "unicodejs.wordbreak" .. Remove unused module alias "unicodejs.wordbreak" Deprecated for several years, not used anywhere. Change-Id: Iaca725f7f249119c97f0ca2cc069003409b4155e --- M extension.json 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/42/402142/1 diff --git a/extension.json b/extension.json index 635ca0d..bbcfc17 100644 --- a/extension.json +++ b/extension.json @@ -226,9 +226,6 @@ "mobile" ] }, - "unicodejs.wordbreak": { - "dependencies": "unicodejs" - }, "papaparse": { "scripts": "lib/ve/lib/papaparse/papaparse.js", "targets": [ -- To view, visit https://gerrit.wikimedia.org/r/402142 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaca725f7f249119c97f0ca2cc069003409b4155e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CodeEditor[master]: build: Update stylelint
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/402066 ) Change subject: build: Update stylelint .. build: Update stylelint Change-Id: Id911ed1119d6b74c5fb61562505cf9aa3c33f82c --- M package.json 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeEditor refs/changes/66/402066/1 diff --git a/package.json b/package.json index 1f0d3cd..c1e4b8b 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "grunt-eslint": "20.1.0", "grunt-jsonlint": "1.1.0", "grunt-stylelint": "0.8.0", -"stylelint": "7.8.0", -"stylelint-config-wikimedia": "0.4.1" +"stylelint": "8.2.0", +"stylelint-config-wikimedia": "0.4.2" } } -- To view, visit https://gerrit.wikimedia.org/r/402066 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id911ed1119d6b74c5fb61562505cf9aa3c33f82c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CodeEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Use editfont in mobile.editor
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/402042 ) Change subject: Use editfont in mobile.editor .. Use editfont in mobile.editor Also preserve existing slightly larger font size of 16px instead of desktop standard 13px. Change-Id: I40572b7efb547d865cf1e831918a330f1d790bf7 --- M extension.json M resources/mobile.editor.common/editor.less M resources/mobile.editor.overlay/EditorOverlay.js 3 files changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/42/402042/1 diff --git a/extension.json b/extension.json index d650d4d..e241148 100644 --- a/extension.json +++ b/extension.json @@ -486,7 +486,9 @@ "mobile.editor.common", "oojs-ui.styles.icons-editing-core", "mediawiki.util", - "mediawiki.notification" + "mediawiki.notification", + "mediawiki.user", + "mediawiki.editfont.styles" ], "scripts": [ "resources/mobile.editor.overlay/EditorOverlay.js" diff --git a/resources/mobile.editor.common/editor.less b/resources/mobile.editor.common/editor.less index 79288c2..0ce3149 100644 --- a/resources/mobile.editor.common/editor.less +++ b/resources/mobile.editor.common/editor.less @@ -29,6 +29,7 @@ .box-sizing( border-box ); padding-top: 10px; padding-bottom: 10px; + font-size: inherit; } .summary-request { diff --git a/resources/mobile.editor.overlay/EditorOverlay.js b/resources/mobile.editor.overlay/EditorOverlay.js index 6e3954a..ba58b5f 100644 --- a/resources/mobile.editor.overlay/EditorOverlay.js +++ b/resources/mobile.editor.overlay/EditorOverlay.js @@ -184,6 +184,7 @@ this.$preview = this.$( '.preview' ); this.$content = this.$( '.wikitext-editor' ); + this.$content.addClass( 'mw-editfont-' + mw.user.options.get( 'editfont' ) ); if ( self.options.isAnon ) { this.$anonWarning = this.$( '.anonwarning' ); this.$content.hide(); -- To view, visit https://gerrit.wikimedia.org/r/402042 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I40572b7efb547d865cf1e831918a330f1d790bf7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Remove support for classic toolbar (mediawiki.toolbar)
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/402036 ) Change subject: Remove support for classic toolbar (mediawiki.toolbar) .. Remove support for classic toolbar (mediawiki.toolbar) The classic toolbar is deprecated. Bug: T177098 Change-Id: I22bebd63d69346cc6cdb22972c77f0639a3caa90 --- M resources/ext.CodeMirror.js M resources/ext.CodeMirror.less D resources/images/old-cm-off.svg D resources/images/old-cm-on.svg 4 files changed, 13 insertions(+), 169 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror refs/changes/36/402036/1 diff --git a/resources/ext.CodeMirror.js b/resources/ext.CodeMirror.js index bee0f23..8959391 100644 --- a/resources/ext.CodeMirror.js +++ b/resources/ext.CodeMirror.js @@ -1,19 +1,17 @@ ( function ( mw, $ ) { - var origTextSelection, useCodeMirror, codeMirror, api, originHooksTextarea, - wikiEditorToolbarEnabled, textBox, + var origTextSelection, useCodeMirror, codeMirror, api, originHooksTextarea, textBox, enableContentEditable = true; if ( mw.config.get( 'wgCodeEditorCurrentLanguage' ) ) { // If the CodeEditor is used then just exit; return; } - // The WikiEditor extension exists the WikiEditor beta toolbar is used by the user - wikiEditorToolbarEnabled = !!mw.loader.getState( 'ext.wikiEditor' ) && + // If WikiEditor is disabled or unavailable then exit. + if ( + !mw.loader.getState( 'ext.wikiEditor' ) || // This can be the string "0" if the user disabled the preference - Bug T54542#555387 - mw.user.options.get( 'usebetatoolbar' ) > 0; - - // If WikiEditor is disabled, and the deprecated classic toolbar is unavailable then exit. - if ( !wikiEditorToolbarEnabled && !mw.loader.getState( 'mediawiki.toolbar' ) ) { + mw.user.options.get( 'usebetatoolbar' ) <= 0 + ) { return; } @@ -357,10 +355,6 @@ lang: $textbox1.attr( 'lang' ) } ); - if ( !wikiEditorToolbarEnabled ) { - $codeMirror.addClass( 'mw-codeMirror-classicToolbar' ); - } - // set the height of the textarea codeMirror.setSize( null, $textbox1.height() ); // Overwrite default textselection of WikiEditor to work with CodeMirror, too @@ -450,32 +444,10 @@ * Adds CodeMirror button to the toolbar */ function addToolbarButton() { - // Check if the user is using the enhanced editing toolbar (supplied by the - // WikiEditor extension) or the default editing toolbar (supplied by core). - if ( wikiEditorToolbarEnabled ) { - // They are using the enhanced editing toolbar. - mw.loader.using( 'ext.wikiEditor.toolbar', function () { - // Add CodeMirror button to the enhanced editing toolbar. - $( addCodeMirrorToWikiEditor ); - } ); - } else { - // They are using the default editing toolbar. - mw.loader.using( 'mediawiki.toolbar', function () { - // Add CodeMirror button to the default editing toolbar. - mw.toolbar.addButton( { - speedTip: mw.msg( 'codemirror-toggle-label' ), - imageId: 'mw-editbutton-codemirror', - onClick: function () { - switchCodeMirror(); - return false; - } - } ); - // We don't know when button will be added, wait until the document is ready to update it - $( function () { - updateToolbarButton(); - } ); - } ); - } + mw.loader.using( 'ext.wikiEditor.toolbar', function () { + // Add CodeMirror button to the enhanced editing toolbar. + $( addCodeMirrorToWikiEditor ); + } ); } /** @@ -562,11 +534,7 @@ // enable CodeMirror if ( useCodeMirror ) { - if ( wikiEditorToolbarEnabled ) { - $( '#wpTextbox1' ).on( 'wikiEditor-toolbar-doneInitialSections', enableCodeMirror.bind( this ) ); - } else { - enableCodeMirror(); - } + $(
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Make NWE integration background transparent
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/402034 ) Change subject: Make NWE integration background transparent .. Make NWE integration background transparent Allows for VE's placeholder text feature to work. Change-Id: Ieee01baf3dc049f248a97408af70499dcea8f4c9 --- M resources/modules/ve-cm/ve.ui.CodeMirror.init.less 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror refs/changes/34/402034/1 diff --git a/resources/modules/ve-cm/ve.ui.CodeMirror.init.less b/resources/modules/ve-cm/ve.ui.CodeMirror.init.less index 4da2457..b7c42aa 100644 --- a/resources/modules/ve-cm/ve.ui.CodeMirror.init.less +++ b/resources/modules/ve-cm/ve.ui.CodeMirror.init.less @@ -11,6 +11,7 @@ -moz-box-sizing: border-box; box-sizing: border-box; pointer-events: none; + background: transparent; // Core VE default padding padding: 0.5em 1.5em; -- To view, visit https://gerrit.wikimedia.org/r/402034 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieee01baf3dc049f248a97408af70499dcea8f4c9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CodeMirror Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Fix WikiEditor dependencies
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/402033 ) Change subject: Fix WikiEditor dependencies .. Fix WikiEditor dependencies Change-Id: Ibaa17e581ada5fcb202217797e70f9fed2510ec4 --- M resources/ext.CodeMirror.js 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror refs/changes/33/402033/1 diff --git a/resources/ext.CodeMirror.js b/resources/ext.CodeMirror.js index 4ab2a72..069861f 100644 --- a/resources/ext.CodeMirror.js +++ b/resources/ext.CodeMirror.js @@ -447,8 +447,8 @@ // Check if the user is using the enhanced editing toolbar (supplied by the // WikiEditor extension) or the default editing toolbar (supplied by core). if ( wikiEditorToolbarEnabled ) { - // They are using the enhanced editing toolbar. - mw.loader.using( 'ext.wikiEditor.toolbar', function () { + // They are using WikiEditor + mw.loader.using( 'ext.wikiEditor', function () { // Add CodeMirror button to the enhanced editing toolbar. $( addCodeMirrorToWikiEditor ); } ); -- To view, visit https://gerrit.wikimedia.org/r/402033 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibaa17e581ada5fcb202217797e70f9fed2510ec4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CodeMirror Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Expect that deprecated mediawiki.toolbar may not be available
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/402032 ) Change subject: Expect that deprecated mediawiki.toolbar may not be available .. Expect that deprecated mediawiki.toolbar may not be available Bug: T177098 Change-Id: Icaf51c234981b4572362a0d76bf0b4b6653f3854 --- M resources/ext.CodeMirror.js 1 file changed, 12 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror refs/changes/32/402032/1 diff --git a/resources/ext.CodeMirror.js b/resources/ext.CodeMirror.js index 4ab2a72..bee0f23 100644 --- a/resources/ext.CodeMirror.js +++ b/resources/ext.CodeMirror.js @@ -1,8 +1,19 @@ ( function ( mw, $ ) { var origTextSelection, useCodeMirror, codeMirror, api, originHooksTextarea, - wikiEditorToolbarEnabled, enableContentEditable = true, textBox; + wikiEditorToolbarEnabled, textBox, + enableContentEditable = true; if ( mw.config.get( 'wgCodeEditorCurrentLanguage' ) ) { // If the CodeEditor is used then just exit; + return; + } + + // The WikiEditor extension exists the WikiEditor beta toolbar is used by the user + wikiEditorToolbarEnabled = !!mw.loader.getState( 'ext.wikiEditor' ) && + // This can be the string "0" if the user disabled the preference - Bug T54542#555387 + mw.user.options.get( 'usebetatoolbar' ) > 0; + + // If WikiEditor is disabled, and the deprecated classic toolbar is unavailable then exit. + if ( !wikiEditorToolbarEnabled && !mw.loader.getState( 'mediawiki.toolbar' ) ) { return; } @@ -33,11 +44,6 @@ elem.value = value; } }; - - // The WikiEditor extension exists the WikiEditor beta toolbar is used by the user - wikiEditorToolbarEnabled = !!mw.loader.getState( 'ext.wikiEditor' ) && - // This can be the string "0" if the user disabled the preference - Bug T54542#555387 - mw.user.options.get( 'usebetatoolbar' ) > 0; // Disable spellchecking for Firefox users on non-Mac systems (Bug T95104) if ( navigator.userAgent.indexOf( 'Firefox' ) > -1 && -- To view, visit https://gerrit.wikimedia.org/r/402032 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icaf51c234981b4572362a0d76bf0b4b6653f3854 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CodeMirror Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CodeEditor[master]: Match font and size to other source editors
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/402028 ) Change subject: Match font and size to other source editors .. Match font and size to other source editors All of our other source editors (2003/06/10/17) use the editfont classes. Change-Id: Ic9f31eadaefba1af0c1d75171a46218abbd8bc88 --- M modules/jquery.codeEditor.less 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeEditor refs/changes/28/402028/1 diff --git a/modules/jquery.codeEditor.less b/modules/jquery.codeEditor.less index 384a2b7..474db7d 100644 --- a/modules/jquery.codeEditor.less +++ b/modules/jquery.codeEditor.less @@ -75,6 +75,12 @@ .background-image-svg( '../images/find.svg', '../images/find.png' ); } +.wikiEditor-ui .ace_editor { + /* Same as mw-editfont-monospace */ + font-size: 13px; + font-family: monospace, monospace; +} + .wikiEditor-ui-toolbar .group-codeeditor-style { border-right: 0; } -- To view, visit https://gerrit.wikimedia.org/r/402028 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic9f31eadaefba1af0c1d75171a46218abbd8bc88 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CodeEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikiEditor[master]: Make all old modules aliases of 'ext.wikiEditor'
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/402025 ) Change subject: Make all old modules aliases of 'ext.wikiEditor' .. Make all old modules aliases of 'ext.wikiEditor' Many of these modules are depended on in the wild in user scripts etc. so make them deprecated aliases. Change-Id: I00b888fa55e1e16a490cda22d59692564714dd46 --- M extension.json 1 file changed, 30 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiEditor refs/changes/25/402025/1 diff --git a/extension.json b/extension.json index 865feb0..7937823 100644 --- a/extension.json +++ b/extension.json @@ -50,15 +50,6 @@ ] }, "ResourceModules": { - "ext.wikiEditor.toolbar": { - "dependencies": [ "ext.wikiEditor" ] - }, - "ext.wikiEditor.dialogs": { - "dependencies": [ "ext.wikiEditor" ] - }, - "ext.wikiEditor.core": { - "dependencies": [ "ext.wikiEditor" ] - }, "ext.wikiEditor": { "group": "ext.wikiEditor", "scripts": [ @@ -294,6 +285,36 @@ "ext.wikiEditor.styles": { "group": "ext.wikiEditor", "styles": "ext.wikiEditor.toolbar.styles.less" + }, + "ext.wikiEditor.toolbar": { + "dependencies": [ "ext.wikiEditor" ] + }, + "ext.wikiEditor.dialogs": { + "dependencies": [ "ext.wikiEditor" ] + }, + "ext.wikiEditor.core": { + "dependencies": [ "ext.wikiEditor" ] + }, + "jquery.wikiEditor": { + "dependencies": [ "ext.wikiEditor" ] + }, + "jquery.wikiEditor.core": { + "dependencies": [ "ext.wikiEditor" ] + }, + "jquery.wikiEditor.dialogs": { + "dependencies": [ "ext.wikiEditor" ] + }, + "jquery.wikiEditor.dialogs.config": { + "dependencies": [ "ext.wikiEditor" ] + }, + "jquery.wikiEditor.toolbar": { + "dependencies": [ "ext.wikiEditor" ] + }, + "jquery.wikiEditor.toolbar.config": { + "dependencies": [ "ext.wikiEditor" ] + }, + "jquery.wikiEditor.toolbar.i18n": { + "dependencies": [ "ext.wikiEditor" ] } }, "ResourceFileModulePaths": { -- To view, visit https://gerrit.wikimedia.org/r/402025 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I00b888fa55e1e16a490cda22d59692564714dd46 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikiEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...LiquidThreads[master]: Fix WikiEditor dependencies
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401807 ) Change subject: Fix WikiEditor dependencies .. Fix WikiEditor dependencies Change-Id: I5ac6f0cde0a1c321196c63b62b662d95f6bf616c --- M lqt.js 1 file changed, 1 insertion(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LiquidThreads refs/changes/07/401807/1 diff --git a/lqt.js b/lqt.js index a12e320..d0f3ff4 100644 --- a/lqt.js +++ b/lqt.js @@ -223,12 +223,7 @@ mw.loader.using( [ 'mediawiki.action.edit' ], function () { liquidThreads.loadInlineEditForm( params, $container, function () { - var dependencies = [ 'ext.wikiEditor', 'user.options', - 'jquery.wikiEditor.toolbar', 'jquery.wikiEditor.toolbar.config', - 'jquery.async', 'jquery.cookie' ]; - if ( mw.user.options.get( 'usebetatoolbar-cgd' ) ) { - dependencies.push( 'jquery.wikiEditor.dialogs', 'jquery.wikiEditor.dialogs.config' ); - } + var dependencies = [ 'ext.wikiEditor', 'user.options', 'jquery.async', 'jquery.cookie' ]; mw.loader.using( dependencies, finishSetup ); } ); } ); -- To view, visit https://gerrit.wikimedia.org/r/401807 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5ac6f0cde0a1c321196c63b62b662d95f6bf616c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/LiquidThreads Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CodeEditor[master]: Fix WikiEditor dependencies
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401792 ) Change subject: Fix WikiEditor dependencies .. Fix WikiEditor dependencies Change-Id: I81b90a8f1791f1664000637fb90e54f8741eac9a --- M CodeEditor.hooks.php M extension.json 2 files changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeEditor refs/changes/92/401792/1 diff --git a/CodeEditor.hooks.php b/CodeEditor.hooks.php index 990c3cc..80215c4 100644 --- a/CodeEditor.hooks.php +++ b/CodeEditor.hooks.php @@ -47,8 +47,6 @@ * @return bool */ public static function editPageShowEditFormInitial( $editpage, $output ) { - $output->addModuleStyles( 'ext.wikiEditor.toolbar.styles' ); - $title = $editpage->getContextTitle(); $model = $editpage->contentModel; $format = $editpage->contentFormat; diff --git a/extension.json b/extension.json index 10d0e14..7288852 100644 --- a/extension.json +++ b/extension.json @@ -41,7 +41,6 @@ "ext.codeEditor": { "scripts": "ext.codeEditor.js", "dependencies": [ - "ext.wikiEditor.toolbar", "jquery.codeEditor" ], "group": "ext.wikiEditor" @@ -50,7 +49,7 @@ "scripts": "jquery.codeEditor.js", "styles": "jquery.codeEditor.less", "dependencies": [ - "jquery.wikiEditor", + "ext.wikiEditor", "ext.codeEditor.ace", "jquery.ui.resizable", "mediawiki.api", -- To view, visit https://gerrit.wikimedia.org/r/401792 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I81b90a8f1791f1664000637fb90e54f8741eac9a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CodeEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add useEditFont param to TextAreaField
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401760 ) Change subject: Add useEditFont param to TextAreaField .. Add useEditFont param to TextAreaField Change-Id: I7c76e911b4d71842b49272186e880051eee8de2b --- M includes/htmlform/fields/HTMLTextAreaField.php M includes/specials/SpecialExpandTemplates.php 2 files changed, 22 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/60/401760/1 diff --git a/includes/htmlform/fields/HTMLTextAreaField.php b/includes/htmlform/fields/HTMLTextAreaField.php index 466a251..503da1b 100644 --- a/includes/htmlform/fields/HTMLTextAreaField.php +++ b/includes/htmlform/fields/HTMLTextAreaField.php @@ -5,6 +5,7 @@ const DEFAULT_ROWS = 25; protected $mPlaceholder = ''; + protected $mUseEditFont = false; /** * @param array $params @@ -19,6 +20,10 @@ $this->mPlaceholder = $this->getMessage( $params['placeholder-message'] )->text(); } elseif ( isset( $params['placeholder'] ) ) { $this->mPlaceholder = $params['placeholder']; + } + + if ( isset( $params['useeditfont'] ) ) { + $this->mUseEditFont = $params['useeditfont']; } } @@ -40,6 +45,8 @@ } public function getInputHTML( $value ) { + global $wgUser; + $attribs = [ 'id' => $this->mID, 'cols' => $this->getCols(), @@ -49,6 +56,12 @@ if ( $this->mClass !== '' ) { $attribs['class'] = $this->mClass; + } + if ( $this->mUseEditFont ) { + if ( !isset( $attribs['classes'] ) ) { + $attribs['classes'] = []; + } + array_push( $attribs['classes'], 'mw-editfont-' . $wgUser->getOption( 'editfont' ) ); } if ( $this->mPlaceholder !== '' ) { $attribs['placeholder'] = $this->mPlaceholder; @@ -67,6 +80,8 @@ } function getInputOOUI( $value ) { + global $wgUser; + if ( isset( $this->mParams['cols'] ) ) { throw new Exception( "OOUIHTMLForm does not support the 'cols' parameter for textareas" ); } @@ -76,6 +91,12 @@ if ( $this->mClass !== '' ) { $attribs['classes'] = [ $this->mClass ]; } + if ( $this->mUseEditFont ) { + if ( !isset( $attribs['classes'] ) ) { + $attribs['classes'] = []; + } + array_push( $attribs['classes'], 'mw-editfont-' . $wgUser->getOption( 'editfont' ) ); + } if ( $this->mPlaceholder !== '' ) { $attribs['placeholder'] = $this->mPlaceholder; } diff --git a/includes/specials/SpecialExpandTemplates.php b/includes/specials/SpecialExpandTemplates.php index 35344aa..cb318d1 100644 --- a/includes/specials/SpecialExpandTemplates.php +++ b/includes/specials/SpecialExpandTemplates.php @@ -172,11 +172,7 @@ 'rows' => 10, 'default' => $input, 'id' => 'input', - // The following classes can be used here: - // * mw-editfont-monospace - // * mw-editfont-sans-serif - // * mw-editfont-serif - 'cssclass' => 'mw-editfont-' . $this->getUser()->getOption( 'editfont' ), + 'useeditfont' => true, ], 'removecomments' => [ 'type' => 'check', -- To view, visit https://gerrit.wikimedia.org/r/401760 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7c76e911b4d71842b49272186e880051eee8de2b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Convert single nbsp's to plain spaces on paste
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401751 ) Change subject: Convert single nbsp's to plain spaces on paste .. Convert single nbsp's to plain spaces on paste Change-Id: I88f015c14cde4ac5ae2b26424e64d2074bb350db --- M src/dm/lineardata/ve.dm.ElementLinearData.js M tests/dm/lineardata/ve.dm.ElementLinearData.test.js 2 files changed, 26 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/51/401751/1 diff --git a/src/dm/lineardata/ve.dm.ElementLinearData.js b/src/dm/lineardata/ve.dm.ElementLinearData.js index 73ae828..f1f6c99 100644 --- a/src/dm/lineardata/ve.dm.ElementLinearData.js +++ b/src/dm/lineardata/ve.dm.ElementLinearData.js @@ -1324,6 +1324,23 @@ } } } + // Support: Chrome, Safari + // Sometimes all spaces are replaced with NBSP by the browser, so replace those + // which aren't adjacent to plain spaces. T183647 + if ( + this.getCharacterData( i ) === '\u00a0' && + // Get last open type from the stack + !ve.dm.nodeFactory.doesNodeHaveSignificantWhitespace( elementStack[ elementStack.length - 1 ].type ) + ) { + if ( !( this.getCharacterData( i + 1 ) === ' ' || this.getCharacterData( i - 1 ) === ' ' ) ) { + // Replace with a space + if ( typeof this.getData( i ) === 'string' ) { + this.data[ i ] = ' '; + } else { + this.data[ i ][ 0 ] = ' '; + } + } + } } annotations = this.getAnnotationsFromOffset( i, true ); if ( !annotations.isEmpty() ) { diff --git a/tests/dm/lineardata/ve.dm.ElementLinearData.test.js b/tests/dm/lineardata/ve.dm.ElementLinearData.test.js index 82289dc..0a96436 100644 --- a/tests/dm/lineardata/ve.dm.ElementLinearData.test.js +++ b/tests/dm/lineardata/ve.dm.ElementLinearData.test.js @@ -1694,7 +1694,7 @@ msg: 'Breaks split content branch nodes' }, { - html: 'Foo\nBar\n Baz \nQuux', + html: 'Foo\nBar\n Baz \nQuux', data: [ { type: 'paragraph' }, 'F', 'o', 'o', ' ', 'B', 'a', 'r', ' ', @@ -1704,30 +1704,34 @@ [ ' ', [ ve.dm.example.annIndex( 'b' ) ] ], [ 'Q', [ ve.dm.example.annIndex( 'b' ) ] ], [ 'u', [ ve.dm.example.annIndex( 'b' ) ] ], + [ ' ', [ ve.dm.example.annIndex( 'b' ) ] ], [ 'u', [ ve.dm.example.annIndex( 'b' ) ] ], [ 'x', [ ve.dm.example.annIndex( 'b' ) ] ], { type: '/paragraph' }, { type: 'internalList' }, { type: '/internalList' } ], - msg: 'Newline characters are stripped and replaced with spaces where necessary' + msg: 'Newline characters and NBSPs are replaced with spaces and/or stripped where necessary' }, { - html: 'Foo\nBar\n Baz \nQuux\nWhee', + html: 'Foo\nBar\n Baz \nQuux\nWheeABC', data: [ { type: 'paragraph' }, 'F', 'o', 'o', ' ', 'B', 'a', 'r', { type: '/paragraph' }, { type: 'preformatted' }, - 'B', 'a', 'z', ' ', '\n', 'Q', 'u', 'u', 'x', + 'B', 'a', 'z', ' ', '\n', 'Q', 'u', '\u00a0', 'u', 'x', { type: 'comment', attributes: { text: 'comment' } }, { type: '/comment' }, '\n', 'W', 'h', 'e', 'e', { type: '/preformatted' }, + { type: 'paragraph' }, +
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Fix editfont size in source mode
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401587 ) Change subject: Fix editfont size in source mode .. Fix editfont size in source mode Bug: T182320 Change-Id: I777a1a80cb9887bc473aecb5d7b25fd6454a3d60 --- M modules/ve-mw/ui/styles/ve.ui.MWWikitextSurface.css 1 file changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/87/401587/1 diff --git a/modules/ve-mw/ui/styles/ve.ui.MWWikitextSurface.css b/modules/ve-mw/ui/styles/ve.ui.MWWikitextSurface.css index 8054b2b..e47cc9f 100644 --- a/modules/ve-mw/ui/styles/ve.ui.MWWikitextSurface.css +++ b/modules/ve-mw/ui/styles/ve.ui.MWWikitextSurface.css @@ -5,11 +5,6 @@ * @license The MIT License (MIT); see LICENSE.txt */ -.ve-ui-mwWikitextSurface .ve-ce-documentNode, -.ve-ui-mwWikitextSurface .ve-ui-surface-placeholder { - font-size: 1.17216em; /*(13./11.375)*/ -} - .ve-ui-mwWikitextSurface .ve-ce-documentNode { /* Inherit mw-editfont setting instead of default source mode setting */ font-family: inherit; -- To view, visit https://gerrit.wikimedia.org/r/401587 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I777a1a80cb9887bc473aecb5d7b25fd6454a3d60 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Cite[master]: MWReferenceNode: Generate 'sup' tags by default
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401503 ) Change subject: MWReferenceNode: Generate 'sup' tags by default .. MWReferenceNode: Generate 'sup' tags by default Bug: T45094 Change-Id: I8973328095f36cce2cebbf335ee7421187eedfad --- M modules/ve-cite/ve.dm.MWReferenceNode.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cite refs/changes/03/401503/1 diff --git a/modules/ve-cite/ve.dm.MWReferenceNode.js b/modules/ve-cite/ve.dm.MWReferenceNode.js index fa0d6cb..67137b4 100644 --- a/modules/ve-cite/ve.dm.MWReferenceNode.js +++ b/modules/ve-cite/ve.dm.MWReferenceNode.js @@ -104,7 +104,7 @@ var itemNodeHtml, originalHtml, mwData, i, iLen, keyedNodes, setContents, contentsAlreadySet, originalMw, listKeyParts, name, group, $link, isForClipboard = converter.isForClipboard(), - el = doc.createElement( 'span' ), + el = doc.createElement( 'sup' ), itemNodeWrapper = doc.createElement( 'div' ), originalHtmlWrapper = doc.createElement( 'div' ), itemNode = converter.internalList.getItemNode( dataElement.attributes.listIndex ), -- To view, visit https://gerrit.wikimedia.org/r/401503 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8973328095f36cce2cebbf335ee7421187eedfad Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Cite Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Cite[master]: Allow mw-ref rules apply to any element
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401501 ) Change subject: Allow mw-ref rules apply to any element .. Allow mw-ref rules apply to any element i.e. span or sub. Bug: T45094 Change-Id: Ib3fae04300c379727aad81b2c0c2a882d8657fe0 --- M modules/ext.cite.style.css M modules/ext.cite.style.fa.css 2 files changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cite refs/changes/01/401501/1 diff --git a/modules/ext.cite.style.css b/modules/ext.cite.style.css index 0fc4f1b..6e7e4f0 100644 --- a/modules/ext.cite.style.css +++ b/modules/ext.cite.style.css @@ -1,7 +1,7 @@ /* CSS for Parsoid Cite extension */ /* Style for s */ -span.mw-ref { +.mw-ref { vertical-align: super; line-height: 1; font-size: smaller; @@ -13,35 +13,35 @@ /* stylelint-disable value-keyword-case */ /* With a group set */ -span.mw-ref a[data-mw-group]:after { +.mw-ref a[data-mw-group]:after { content: '[' attr( data-mw-group ) ' ' counter( mw-Ref, decimal ) ']'; } /* Groups with special appearance */ -span.mw-ref a[data-mw-group='decimal']:after { +.mw-ref a[data-mw-group='decimal']:after { content: '[' counter( mw-Ref, decimal ) ']'; } -span.mw-ref a[data-mw-group='lower-alpha']:after { +.mw-ref a[data-mw-group='lower-alpha']:after { content: '[' counter( mw-Ref, lower-alpha ) ']'; } -span.mw-ref a[data-mw-group='upper-alpha']:after { +.mw-ref a[data-mw-group='upper-alpha']:after { content: '[' counter( mw-Ref, upper-alpha ) ']'; } -span.mw-ref a[data-mw-group='lower-greek']:after { +.mw-ref a[data-mw-group='lower-greek']:after { content: '[' counter( mw-Ref, lower-greek ) ']'; } -span.mw-ref a[data-mw-group='lower-roman']:after { +.mw-ref a[data-mw-group='lower-roman']:after { content: '[' counter( mw-Ref, lower-roman ) ']'; } -span.mw-ref a[data-mw-group='upper-roman']:after { +.mw-ref a[data-mw-group='upper-roman']:after { content: '[' counter( mw-Ref, upper-roman ) ']'; } -span.mw-ref a[data-mw-group='error-test']:after { +.mw-ref a[data-mw-group='error-test']:after { content: '[' counter( mw-Ref, symbols( cyclic 'first' 'second' 'last!' ) ) ']'; } /* Without a group */ -span.mw-ref a:after { +.mw-ref a:after { content: '[' counter( mw-Ref, decimal ) ']'; } diff --git a/modules/ext.cite.style.fa.css b/modules/ext.cite.style.fa.css index 0ce01a0..3cec460 100644 --- a/modules/ext.cite.style.fa.css +++ b/modules/ext.cite.style.fa.css @@ -4,12 +4,12 @@ /* stylelint-disable value-keyword-case */ /* s with a group */ -span.mw-ref a[data-mw-group]:after { +.mw-ref a[data-mw-group]:after { content: '[' attr( data-mw-group ) ' ' counter( mw-Ref, persian ) ']'; } /* s without a group */ -span.mw-ref a:after { +.mw-ref a:after { content: '[' counter( mw-Ref, persian ) ']'; } -- To view, visit https://gerrit.wikimedia.org/r/401501 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib3fae04300c379727aad81b2c0c2a882d8657fe0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Cite Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Balance padding around logo
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401500 ) Change subject: Balance padding around logo .. Balance padding around logo Change-Id: I09a9a0533249f7987298c8efde0dc9ad09bec421 --- M modules/ui/styles/mw.cx.ui.Header.less 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/00/401500/1 diff --git a/modules/ui/styles/mw.cx.ui.Header.less b/modules/ui/styles/mw.cx.ui.Header.less index 25a021e..794b152 100644 --- a/modules/ui/styles/mw.cx.ui.Header.less +++ b/modules/ui/styles/mw.cx.ui.Header.less @@ -12,6 +12,9 @@ width: 42px; height: 38px; border-right: 1px solid #c8ccd1; + &.oo-ui-buttonElement-frameless.oo-ui-iconElement:first-child { + margin-left: 0; + } } .cx-header__title { -- To view, visit https://gerrit.wikimedia.org/r/401500 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I09a9a0533249f7987298c8efde0dc9ad09bec421 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix border colour used for textarea
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401498 ) Change subject: Fix border colour used for textarea .. Fix border colour used for textarea Prevents FOUC when WikiEditor finishes loading. Change-Id: Ib3610939cdb4b6a65f702688de9852a203ad6bab --- M resources/src/mediawiki.skinning/interface.css 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/98/401498/1 diff --git a/resources/src/mediawiki.skinning/interface.css b/resources/src/mediawiki.skinning/interface.css index 8cd25d8..e2aeffd 100644 --- a/resources/src/mediawiki.skinning/interface.css +++ b/resources/src/mediawiki.skinning/interface.css @@ -16,8 +16,9 @@ } textarea { - /* Support Firefox: Border rule required to override system appearance on Linux */ - border: 1px solid #a2a9b1; + /* Support: Firefox */ + /* Border rule required to override system appearance on Linux (T136415) */ + border: 1px solid #c8ccd1; } .editOptions { -- To view, visit https://gerrit.wikimedia.org/r/401498 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib3610939cdb4b6a65f702688de9852a203ad6bab Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Expand templates: Change 'text' to 'wikitext'
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401395 ) Change subject: Expand templates: Change 'text' to 'wikitext' .. Expand templates: Change 'text' to 'wikitext' Change-Id: Idbddadc7187bbfe6214f313ac0205184bceb2d23 --- M languages/i18n/en.json 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/95/401395/1 diff --git a/languages/i18n/en.json b/languages/i18n/en.json index 301408f..18c546d 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -4186,9 +4186,9 @@ "limitreport-expensivefunctioncount": "Expensive parser function count", "limitreport-expensivefunctioncount-value": "$1/$2", "expandtemplates": "Expand templates", - "expand_templates_intro": "This special page takes text and expands all templates in it recursively.\nIt also expands supported parser functions like\n{{#language:…}} and variables like\n{{CURRENTDAY}}.\nIn fact, it expands pretty much everything in double-braces.", + "expand_templates_intro": "This special page takes wikitext and expands all templates in it recursively.\nIt also expands supported parser functions like\n{{#language:…}} and variables like\n{{CURRENTDAY}}.\nIn fact, it expands pretty much everything in double-braces.", "expand_templates_title": "Context title, for {{FULLPAGENAME}}, etc.:", - "expand_templates_input": "Input text:", + "expand_templates_input": "Input wikitext:", "expand_templates_output": "Result", "expand_templates_xml_output": "XML output", "expand_templates_html_output": "Raw HTML output", @@ -4200,7 +4200,7 @@ "expand_templates_preview": "Preview", "expand_templates_preview_fail_html": "Because {{SITENAME}} has raw HTML enabled and there was a loss of session data, the preview is hidden as a precaution against JavaScript attacks.\n\nIf this is a legitimate preview attempt, please try again.\nIf it still does not work, try [[Special:UserLogout|logging out]] and logging back in, and check that your browser allows cookies from this site.", "expand_templates_preview_fail_html_anon": "Because {{SITENAME}} has raw HTML enabled and you are not logged in, the preview is hidden as a precaution against JavaScript attacks.\n\nIf this is a legitimate preview attempt, please [[Special:UserLogin|log in]] and try again.", - "expand_templates_input_missing": "You need to provide at least some input text.", + "expand_templates_input_missing": "You need to provide at least some input wikitext.", "pagelanguage": "Change page language", "pagelang-name": "Page", "pagelang-language": "Language", -- To view, visit https://gerrit.wikimedia.org/r/401395 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idbddadc7187bbfe6214f313ac0205184bceb2d23 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Expand templates: Use editfont on wikitext inputs
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401394 ) Change subject: Expand templates: Use editfont on wikitext inputs .. Expand templates: Use editfont on wikitext inputs Change-Id: Ie8919b4d5caf13749d81b419aff276f7c57d7049 --- M includes/specials/SpecialExpandTemplates.php 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/94/401394/1 diff --git a/includes/specials/SpecialExpandTemplates.php b/includes/specials/SpecialExpandTemplates.php index 560d75a..354acb7 100644 --- a/includes/specials/SpecialExpandTemplates.php +++ b/includes/specials/SpecialExpandTemplates.php @@ -172,6 +172,11 @@ 'rows' => 10, 'default' => $input, 'id' => 'input', + // The following classes can be used here: + // * mw-editfont-monospace + // * mw-editfont-sans-serif + // * mw-editfont-serif + 'cssclass' => 'mw-editfont-' . $this->getUser()->getOption( 'editfont' ), ], 'removecomments' => [ 'type' => 'check', @@ -203,6 +208,8 @@ ], ]; + $this->getOutput()->addModuleStyles( 'mediawiki.editfont.styles' ); + $form = HTMLForm::factory( 'ooui', $fields, $this->getContext() ); $form ->setSubmitTextMsg( 'expand_templates_ok' ) @@ -226,7 +233,7 @@ $output, 10, 10, - [ 'id' => 'output', 'readonly' => 'readonly' ] + [ 'id' => 'output', 'readonly' => 'readonly', 'class' => 'mw-editfont-' . $this->getUser()->getOption( 'editfont' ) ] ); return $out; -- To view, visit https://gerrit.wikimedia.org/r/401394 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie8919b4d5caf13749d81b419aff276f7c57d7049 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TemplateSandbox[master]: Use editfont on wikitext input
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401381 ) Change subject: Use editfont on wikitext input .. Use editfont on wikitext input Change-Id: I0afc58b75821bd7f61d8d5f488f845081b910293 --- M SpecialTemplateSandbox.php 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateSandbox refs/changes/81/401381/1 diff --git a/SpecialTemplateSandbox.php b/SpecialTemplateSandbox.php index 03fcb50..bd0e46d 100644 --- a/SpecialTemplateSandbox.php +++ b/SpecialTemplateSandbox.php @@ -62,9 +62,17 @@ 'type' => 'textarea', 'name' => 'text', 'label-message' => 'templatesandbox-text-label', + // The following classes can be used here: + // * mw-editfont-monospace + // * mw-editfont-sans-serif + // * mw-editfont-serif + 'cssclass' => 'mw-editfont-' . $this->getUser()->getOption( 'editfont' ), 'rows' => 5, ], ], $this->getContext() ); + + $this->getOutput()->addModuleStyles( 'mediawiki.editfont.styles' ); + $form->setMethod( $requirePost ? 'post' : 'get' ); $form->setSubmitCallback( [ $this, 'onSubmit' ] ); $form->setWrapperLegend( $this->msg( 'templatesandbox-legend' ) ); -- To view, visit https://gerrit.wikimedia.org/r/401381 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0afc58b75821bd7f61d8d5f488f845081b910293 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TemplateSandbox Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TemplateSandbox[master]: Use OOUI form on special page
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401380 ) Change subject: Use OOUI form on special page .. Use OOUI form on special page Change-Id: Ia3a8f4b2452ed823a79e62c050de53d7a3f832fb --- M SpecialTemplateSandbox.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateSandbox refs/changes/80/401380/1 diff --git a/SpecialTemplateSandbox.php b/SpecialTemplateSandbox.php index 43f8e5e..03fcb50 100644 --- a/SpecialTemplateSandbox.php +++ b/SpecialTemplateSandbox.php @@ -35,7 +35,7 @@ $this->getUser()->getName() . '/' . $this->msg( 'templatesandbox-suffix' )->plain() )->getPrefixedText(); - $form = new HTMLForm( [ + $form = HTMLForm::factory( 'ooui', [ 'prefix' => [ 'type' => 'text', 'name' => 'prefix', -- To view, visit https://gerrit.wikimedia.org/r/401380 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia3a8f4b2452ed823a79e62c050de53d7a3f832fb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TemplateSandbox Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikiEditor[master]: Save/restore selection in all browsers
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/400705 ) Change subject: Save/restore selection in all browsers .. Save/restore selection in all browsers Previously this wasn't required due to an iFrame mode. Change-Id: Ib89af27d5ab6b9b1b05046b32b05ce368ff47a5f --- M extension.json M modules/jquery.wikiEditor.js 2 files changed, 10 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiEditor refs/changes/05/400705/1 diff --git a/extension.json b/extension.json index 2c7747b..865feb0 100644 --- a/extension.json +++ b/extension.json @@ -272,7 +272,6 @@ ], "dependencies": [ "jquery.async", - "jquery.client", "jquery.cookie", "jquery.suggestions", "jquery.tabIndex", diff --git a/modules/jquery.wikiEditor.js b/modules/jquery.wikiEditor.js index dd50e05..be6c905 100644 --- a/modules/jquery.wikiEditor.js +++ b/modules/jquery.wikiEditor.js @@ -191,11 +191,9 @@ * @return {jQuery} */ $.fn.wikiEditor = function () { - var context, profile, hasFocus, cursorPos, + var context, hasFocus, cursorPos, args, modules, module, e, call; - // Save browser profile for detailed tests. - profile = $.client.profile(); /* Initialization */ @@ -404,22 +402,23 @@ }, /** -* Save text selection for old IE (<=10) +* Save text selection */ saveSelection: function () { - if ( profile.name === 'msie' && document.selection && document.selection.createRange ) { - context.$textarea.focus(); - context.savedSelection = document.selection.createRange(); - } + context.$textarea.focus(); + context.savedSelection = { + selectionStart: context.$textarea[ 0 ].selectionStart, + selectionEnd: context.$textarea[ 0 ].selectionEnd + }; }, /** -* Restore text selection for old IE (<=10) +* Restore text selection */ restoreSelection: function () { - if ( profile.name === 'msie' && context.savedSelection !== null ) { + if ( context.savedSelection ) { context.$textarea.focus(); - context.savedSelection.select(); + context.$textarea[ 0 ].setSelectionRange( context.savedSelection.selectionStart, context.savedSelection.selectionEnd ); context.savedSelection = null; } } -- To view, visit https://gerrit.wikimedia.org/r/400705 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib89af27d5ab6b9b1b05046b32b05ce368ff47a5f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikiEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikiEditor[master]: Remove browser compatibility checks
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/400697 ) Change subject: Remove browser compatibility checks .. Remove browser compatibility checks WikiEditor works in all browsers that MW supports, and should do going forward. Change-Id: I189516917d805dff3819e742a9fd8ad96a161159 --- M WikiEditorHooks.php M modules/ext.wikiEditor.dialogs.js M modules/ext.wikiEditor.toolbar.js M modules/ext.wikiEditor.toolbar.styles.less M modules/jquery.wikiEditor.dialogs.js M modules/jquery.wikiEditor.js 6 files changed, 8 insertions(+), 87 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiEditor refs/changes/97/400697/1 diff --git a/WikiEditorHooks.php b/WikiEditorHooks.php index 149a75d..591096a 100644 --- a/WikiEditorHooks.php +++ b/WikiEditorHooks.php @@ -154,12 +154,7 @@ public static function EditPageBeforeEditToolbar( &$toolbar ) { global $wgUser; if ( $wgUser->getOption( 'usebetatoolbar' ) ) { - $toolbar = Html::rawElement( - 'div', [ - 'class' => 'wikiEditor-oldToolbar' - ], - $toolbar - ); + $toolbar = ''; // Return false to signify that the toolbar has been over-written, so // the old toolbar code shouldn't be added to the page. return false; diff --git a/modules/ext.wikiEditor.dialogs.js b/modules/ext.wikiEditor.dialogs.js index 271c170..13972dd 100644 --- a/modules/ext.wikiEditor.dialogs.js +++ b/modules/ext.wikiEditor.dialogs.js @@ -2,10 +2,6 @@ * JavaScript for WikiEditor Dialogs */ jQuery( function ( $ ) { - if ( !$.wikiEditor.isSupported( $.wikiEditor.modules.dialogs ) ) { - return; - } - // Replace icons $.wikiEditor.modules.dialogs.config.replaceIcons( $( '#wpTextbox1' ) ); diff --git a/modules/ext.wikiEditor.toolbar.js b/modules/ext.wikiEditor.toolbar.js index df0400d..0c38d40 100644 --- a/modules/ext.wikiEditor.toolbar.js +++ b/modules/ext.wikiEditor.toolbar.js @@ -2,10 +2,6 @@ * JavaScript for WikiEditor Toolbar */ jQuery( function ( $ ) { - if ( !$.wikiEditor.isSupported( $.wikiEditor.modules.toolbar ) ) { - $( '.wikiEditor-oldToolbar' ).show(); - return; - } // The old toolbar is still in place and needs to be removed so there aren't two toolbars $( '#toolbar' ).remove(); // Add toolbar module diff --git a/modules/ext.wikiEditor.toolbar.styles.less b/modules/ext.wikiEditor.toolbar.styles.less index 1e77c82..016a56c 100644 --- a/modules/ext.wikiEditor.toolbar.styles.less +++ b/modules/ext.wikiEditor.toolbar.styles.less @@ -22,9 +22,7 @@ resize: vertical; } -/* Hide the old toolbar until the wikiEditor toolbar is deemed not supported, - * hide the WikiEditor toolbar until it's css has loaded */ -.wikiEditor-oldToolbar, +/* Hide the WikiEditor toolbar until its css has loaded */ .wikiEditor-ui-toolbar { display: none; } @@ -38,7 +36,7 @@ /* Set a margin on the textarea while we load, matching the height, * of the wikieditor toolbar to prevent reflow. After the wikieditor ui is loaded, * the textarea is wrapped inside wikieditor-ui div and no longer matches */ -.client-js .wikiEditor-oldToolbar + #wpTextbox1 { +.client-js .mw-editform > #wpTextbox1 { /* Toolbar height + padding + bottom border = 26 + 2*3 + 1 */ margin-top: 33px; } diff --git a/modules/jquery.wikiEditor.dialogs.js b/modules/jquery.wikiEditor.dialogs.js index 0a284bb..a5d44d4 100644 --- a/modules/jquery.wikiEditor.dialogs.js +++ b/modules/jquery.wikiEditor.dialogs.js @@ -75,7 +75,7 @@ // Defer building of modules, unless they require immediate creation for ( mod in config ) { module = config[ mod ]; - // Only create the dialog if it's supported, isn't filtered and doesn't exist yet + // Only create the dialog if it isn't filtered and doesn't exist yet filtered = false; if ( typeof module.filters !== 'undefined' ) { for ( i = 0; i < module.filters.length; i++ ) { @@ -92,7 +92,7 @@ } // Re-select from the DOM, we might have removed the dialog just now $existingDialog = $( '#' + module.id ); - if ( !filtered && $.wikiEditor.isSupported( module ) && $existingDialog.length
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Remove font-size now it is set by editfont
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/399616 ) Change subject: Remove font-size now it is set by editfont .. Remove font-size now it is set by editfont Bug: T180678 Change-Id: Ic9e8bdb3b34dbb2f2c5748d6bb57e9da90112118 --- M resources/modules/ve-cm/ve.ui.CodeMirror.init.less 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror refs/changes/16/399616/1 diff --git a/resources/modules/ve-cm/ve.ui.CodeMirror.init.less b/resources/modules/ve-cm/ve.ui.CodeMirror.init.less index 6db9a8d..4da2457 100644 --- a/resources/modules/ve-cm/ve.ui.CodeMirror.init.less +++ b/resources/modules/ve-cm/ve.ui.CodeMirror.init.less @@ -5,7 +5,6 @@ position: absolute; top: 0; left: 0; - font-size: 1.17216em; line-height: 1.5em; width: 100%; -webkit-box-sizing: border-box; -- To view, visit https://gerrit.wikimedia.org/r/399616 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic9e8bdb3b34dbb2f2c5748d6bb57e9da90112118 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CodeMirror Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Don't depend on ArticleTarget for source editor
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/399395 ) Change subject: Don't depend on ArticleTarget for source editor .. Don't depend on ArticleTarget for source editor Change-Id: Iaf1aefcbf94e4548b45e7c55f0af57d15235e8f5 --- M extension.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/95/399395/1 diff --git a/extension.json b/extension.json index d670bb1..7bcb6be 100644 --- a/extension.json +++ b/extension.json @@ -2055,7 +2055,7 @@ "mediawiki.editfont.styles", "ext.visualEditor.mwlink", "ext.visualEditor.mwcore", - "ext.visualEditor.articleTarget" + "ext.visualEditor.mediawiki" ], "messages": [ "visualeditor-generating-wikitext-progress" -- To view, visit https://gerrit.wikimedia.org/r/399395 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaf1aefcbf94e4548b45e7c55f0af57d15235e8f5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Fix editor switcher inheritance
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/399394 ) Change subject: Fix editor switcher inheritance .. Fix editor switcher inheritance Inherit from the non-ve.ui version of the tool as that one only comes from the ArticleTarget module. Change-Id: I550ebb717de417f99776b578656c1d9f05d59f1f --- M extension.json M modules/flow/ui/tools/mw.flow.ui.MWEditModeTool.js 2 files changed, 39 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/94/399394/1 diff --git a/extension.json b/extension.json index 870a062..1375a9c 100644 --- a/extension.json +++ b/extension.json @@ -691,6 +691,7 @@ "ext.visualEditor.desktopTarget", "ext.visualEditor.mwextensions.desktop", "ext.visualEditor.mwwikitext", + "ext.visualEditor.switching", "mediawiki.editfont.styles", "oojs-ui.styles.icons-editing-advanced", "site", diff --git a/modules/flow/ui/tools/mw.flow.ui.MWEditModeTool.js b/modules/flow/ui/tools/mw.flow.ui.MWEditModeTool.js index b3b028b..0bfeb1f 100644 --- a/modules/flow/ui/tools/mw.flow.ui.MWEditModeTool.js +++ b/modules/flow/ui/tools/mw.flow.ui.MWEditModeTool.js @@ -6,20 +6,52 @@ */ /** + * MediaWiki UserInterface edit mode tool. + * + * @class + * @abstract + */ +mw.flow.ui.MWEditModeTool = function MwFlowUiMWEditModeTool() { +}; + +/* Inheritance */ + +OO.initClass( mw.flow.ui.MWEditModeTool ); + +/* Methods */ + +/** + * @inheritdoc mw.libs.ve.MWEditModeTool + */ +mw.flow.ui.MWEditModeTool.prototype.getMode = function () { + return this.toolbar.getSurface().getMode(); +}; + +/** + * @inheritdoc mw.libs.ve.MWEditModeTool + */ +mw.flow.ui.MWEditModeTool.prototype.isModeAvailable = function () { + // If we're showing the switcher, then both modes are available + return true; +}; + +/** * MediaWiki UserInterface edit mode source tool. * * @class * @extends mw.libs.ve.MWEditModeSourceTool + * @mixins mw.flow.ui.MWEditModeTool * @constructor * @param {OO.ui.ToolGroup} toolGroup * @param {Object} [config] Config options */ -mw.flow.ui.MWEditModeSourceTool = function VeUiMWEditModeSourceTool() { +mw.flow.ui.MWEditModeSourceTool = function MwFlowUiMWEditModeSourceTool() { // Parent constructor mw.flow.ui.MWEditModeSourceTool.parent.apply( this, arguments ); }; -OO.inheritClass( mw.flow.ui.MWEditModeSourceTool, ve.ui.MWEditModeSourceTool ); +OO.inheritClass( mw.flow.ui.MWEditModeSourceTool, mw.libs.ve.MWEditModeSourceTool ); +OO.mixinClass( mw.flow.ui.MWEditModeSourceTool, mw.flow.ui.MWEditModeTool ); mw.flow.ui.MWEditModeSourceTool.prototype.switch = function () { var $editor = this.toolbar.getSurface().$element.closest( '.flow-editor' ); @@ -41,16 +73,18 @@ * * @class * @extends mw.libs.ve.MWEditModeVisualTool + * @mixins mw.flow.ui.MWEditModeTool * @constructor * @param {OO.ui.ToolGroup} toolGroup * @param {Object} [config] Config options */ -mw.flow.ui.MWEditModeVisualTool = function VeUiMWEditModeVisualTool() { +mw.flow.ui.MWEditModeVisualTool = function MwFlowUiMWEditModeVisualTool() { // Parent constructor mw.flow.ui.MWEditModeVisualTool.parent.apply( this, arguments ); }; -OO.inheritClass( mw.flow.ui.MWEditModeVisualTool, ve.ui.MWEditModeVisualTool ); +OO.inheritClass( mw.flow.ui.MWEditModeVisualTool, mw.libs.ve.MWEditModeVisualTool ); +OO.mixinClass( mw.flow.ui.MWEditModeVisualTool, mw.flow.ui.MWEditModeTool ); mw.flow.ui.MWEditModeVisualTool.prototype.switch = function () { this.toolbar.getTarget().switchMode(); -- To view, visit https://gerrit.wikimedia.org/r/399394 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I550ebb717de417f99776b578656c1d9f05d59f1f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: ve.ce.DocumentNode: Documentation fix
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/399177 ) Change subject: ve.ce.DocumentNode: Documentation fix .. ve.ce.DocumentNode: Documentation fix Change-Id: I0142f11c43b20ae24ba1c6b518b5fb1875005e39 --- M src/ce/nodes/ve.ce.DocumentNode.js 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/77/399177/1 diff --git a/src/ce/nodes/ve.ce.DocumentNode.js b/src/ce/nodes/ve.ce.DocumentNode.js index 1a10215..73e2a97 100644 --- a/src/ce/nodes/ve.ce.DocumentNode.js +++ b/src/ce/nodes/ve.ce.DocumentNode.js @@ -9,6 +9,7 @@ * * @class * @extends ve.ce.BranchNode + * @mixins ve.ce.ContentEditableNode * @constructor * @param {ve.dm.DocumentNode} model Model to observe * @param {ve.ce.Surface} surface Surface document is part of -- To view, visit https://gerrit.wikimedia.org/r/399177 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0142f11c43b20ae24ba1c6b518b5fb1875005e39 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Remove mw-ui-item from page-selector
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/398601 ) Change subject: Remove mw-ui-item from page-selector .. Remove mw-ui-item from page-selector Not required, and causes height issues with float. Change-Id: I9f317225c13279e380a366f79de9177c9c88436e --- M modules/source/styles/ext.cx.SourcePageSelector.less 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/01/398601/1 diff --git a/modules/source/styles/ext.cx.SourcePageSelector.less b/modules/source/styles/ext.cx.SourcePageSelector.less index e928045..d8a4a4c 100644 --- a/modules/source/styles/ext.cx.SourcePageSelector.less +++ b/modules/source/styles/ext.cx.SourcePageSelector.less @@ -2,8 +2,6 @@ @import 'mediawiki.mixins'; .cx-source-page-selector { - .mw-ui-item; - background-color: @white; color: @gray-darker; position: relative; -- To view, visit https://gerrit.wikimedia.org/r/398601 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9f317225c13279e380a366f79de9177c9c88436e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Use .then(success, fail) when using .then
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/398600 ) Change subject: Use .then(success,fail) when using .then .. Use .then(success,fail) when using .then Change-Id: Ib2e995a71a83ef8902b96b9df77965cd7d8ed270 --- M modules/dashboard/ext.cx.dashboard.js 1 file changed, 14 insertions(+), 11 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/00/398600/1 diff --git a/modules/dashboard/ext.cx.dashboard.js b/modules/dashboard/ext.cx.dashboard.js index da455b3..f42bda0 100644 --- a/modules/dashboard/ext.cx.dashboard.js +++ b/modules/dashboard/ext.cx.dashboard.js @@ -80,20 +80,23 @@ this.render(); // Get acceptable source/target language pairs - this.siteMapper.getLanguagePairs().then( function ( data ) { - // We store valid source and target languages as "static" variables of LanguageFilter - mw.cx.ui.LanguageFilter.sourceLanguages = data.sourceLanguages; - mw.cx.ui.LanguageFilter.targetLanguages = data.targetLanguages; + this.siteMapper.getLanguagePairs().then( + function ( data ) { + // We store valid source and target languages as "static" variables of LanguageFilter + mw.cx.ui.LanguageFilter.sourceLanguages = data.sourceLanguages; + mw.cx.ui.LanguageFilter.targetLanguages = data.targetLanguages; - self.setDefaultLanguages(); + self.setDefaultLanguages(); - self.initLists(); - self.listen(); + self.initLists(); + self.listen(); - mw.hook( 'mw.cx.dashboard.ready' ).fire(); - } ).fail( function () { - mw.hook( 'mw.cx.error' ).fire( mw.msg( 'cx-error-server-connection' ) ); - } ); + mw.hook( 'mw.cx.dashboard.ready' ).fire(); + }, + function () { + mw.hook( 'mw.cx.error' ).fire( mw.msg( 'cx-error-server-connection' ) ); + } + ); }; // Find valid source and target language pair and store them in local storage -- To view, visit https://gerrit.wikimedia.org/r/398600 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib2e995a71a83ef8902b96b9df77965cd7d8ed270 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: SourcePageSelector: Remove $sourcInputs wrapper
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/398449 ) Change subject: SourcePageSelector: Remove $sourcInputs wrapper .. SourcePageSelector: Remove $sourcInputs wrapper No longer necessary as everything is contained within the title widget. Change-Id: I688eebaad036cc589c3be2587819b1927a7efaf7 --- M modules/source/ext.cx.SourcePageSelector.js M modules/source/styles/ext.cx.SourcePageSelector.less 2 files changed, 24 insertions(+), 35 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/49/398449/1 diff --git a/modules/source/ext.cx.SourcePageSelector.js b/modules/source/ext.cx.SourcePageSelector.js index 9a13c4f..973eacd 100644 --- a/modules/source/ext.cx.SourcePageSelector.js +++ b/modules/source/ext.cx.SourcePageSelector.js @@ -28,7 +28,6 @@ this.selectedSourcePage = null; this.languageFilter = null; this.discardButton = null; - this.$sourceInputs = null; this.$searchResults = null; this.$searchResultsMessage = null; this.overlay = null; @@ -295,16 +294,12 @@ label: this.languageFilter.$element.add( this.discardButton.$element ) } ); - this.$sourceInputs = $( '' ) - .addClass( 'cx-source-page-selector__source-inputs' ) - .append( this.pageSelector.$element ); - this.selectedSourcePage = new mw.cx.SelectedSourcePage( this.siteMapper, { onDiscard: this.discardDialog.bind( this ) } ); this.$container.append( - this.$sourceInputs, + this.pageSelector.$element, this.$searchResults, this.selectedSourcePage.$element ); diff --git a/modules/source/styles/ext.cx.SourcePageSelector.less b/modules/source/styles/ext.cx.SourcePageSelector.less index c793723..5764464 100644 --- a/modules/source/styles/ext.cx.SourcePageSelector.less +++ b/modules/source/styles/ext.cx.SourcePageSelector.less @@ -28,7 +28,7 @@ } .cx-source-page-selector__search-results, - .cx-source-page-selector__source-inputs { + .cx-source-page-selector__page-title { display: none; } @@ -41,37 +41,31 @@ } } - .cx-source-page-selector__source-inputs { - .flex-center; + .cx-source-page-selector__page-title { + max-width: none; + input { + padding-top: 1em; + padding-bottom: 1em; + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; + } - border-bottom: 1px solid @colorGray14; + > .oo-ui-iconElement-icon { + /* Fix Apex theme */ + max-height: none; + } - .cx-source-page-selector__page-title { + > .oo-ui-labelElement-label { + color: inherit; + padding: 0.3em 0.5em; + white-space: nowrap; + } + + .cx-language-filter { + margin: 0; max-width: none; - input { - padding-top: 1em; - padding-bottom: 1em; - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; - } - - > .oo-ui-iconElement-icon { - /* Fix Apex theme */ - max-height: none; - } - - > .oo-ui-labelElement-label { - color: inherit; - padding: 0.3em 0.5em; - white-space: nowrap; - } - - .cx-language-filter { - margin: 0; - max-width: none; - display: inline-block; - vertical-align: middle; - } + display: inline-block; + vertical-align: middle; } } -- To view, visit https://gerrit.wikimedia.org/r/398449 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I688eebaad036cc589c3be2587819b1927a7efaf7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner:
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Revert "Revert "Special:Preferences: Use OOjs UI" and follow...
Hello Bartosz Dziewoński, Florianschmidtwelzow, jenkins-bot, Siebrand, Jforrester, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/398071 to review the following change. Change subject: Revert "Revert "Special:Preferences: Use OOjs UI" and follow-ups" .. Revert "Revert "Special:Preferences: Use OOjs UI" and follow-ups" This reverts commit 808e45d13d400256d36cfcd95e79a567197d9a8b. Change-Id: I152b82bcd647d97062eb82cd2d1064609124f9bc --- M includes/Preferences.php M includes/specials/SpecialPasswordReset.php M includes/specials/SpecialPreferences.php M includes/specials/SpecialResetTokens.php M includes/specials/forms/PreferencesForm.php M languages/i18n/en.json M languages/i18n/qqq.json M resources/Resources.php M resources/src/mediawiki.legacy/oldshared.css M resources/src/mediawiki.special/mediawiki.special.preferences.confirmClose.js A resources/src/mediawiki.special/mediawiki.special.preferences.editfont.js M resources/src/mediawiki.special/mediawiki.special.preferences.styles.css M resources/src/mediawiki.special/mediawiki.special.preferences.tabs.js M resources/src/mediawiki.special/mediawiki.special.preferences.timezone.js M tests/selenium/pageobjects/preferences.page.js 15 files changed, 294 insertions(+), 215 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/71/398071/1 diff --git a/includes/Preferences.php b/includes/Preferences.php index 2dd3e2d..924e3ad 100644 --- a/includes/Preferences.php +++ b/includes/Preferences.php @@ -75,6 +75,11 @@ * @return array|null */ static function getPreferences( $user, IContextSource $context ) { + OutputPage::setupOOUI( + strtolower( $context->getSkin()->getSkinName() ), + $context->getLanguage()->getDir() + ); + $defaultPreferences = []; self::profilePreferences( $user, $context, $defaultPreferences ); @@ -312,14 +317,17 @@ if ( $canEditPrivateInfo && $authManager->allowsAuthenticationDataChange( new PasswordAuthenticationRequest(), false )->isGood() ) { - $link = $linkRenderer->makeLink( SpecialPage::getTitleFor( 'ChangePassword' ), - $context->msg( 'prefs-resetpass' )->text(), [], - [ 'returnto' => SpecialPage::getTitleFor( 'Preferences' )->getPrefixedText() ] ); + $link = new OOUI\ButtonWidget( [ + 'href' => SpecialPage::getTitleFor( 'ChangePassword' )->getLinkURL( [ + 'returnto' => SpecialPage::getTitleFor( 'Preferences' )->getPrefixedText() + ] ), + 'label' => $context->msg( 'prefs-resetpass' )->text(), + ] ); $defaultPreferences['password'] = [ 'type' => 'info', 'raw' => true, - 'default' => $link, + 'default' => (string)$link, 'label-message' => 'yourpassword', 'section' => 'personal/info', ]; @@ -463,16 +471,15 @@ $emailAddress = $user->getEmail() ? htmlspecialchars( $user->getEmail() ) : ''; if ( $canEditPrivateInfo && $authManager->allowsPropertyChange( 'emailaddress' ) ) { - $link = $linkRenderer->makeLink( - SpecialPage::getTitleFor( 'ChangeEmail' ), - $context->msg( $user->getEmail() ? 'prefs-changeemail' : 'prefs-setemail' )->text(), - [], - [ 'returnto' => SpecialPage::getTitleFor( 'Preferences' )->getPrefixedText() ] ); + $link = new OOUI\ButtonWidget( [ + 'href' => SpecialPage::getTitleFor( 'ChangeEmail' )->getLinkURL( [ + 'returnto' => SpecialPage::getTitleFor( 'Preferences' )->getPrefixedText() + ] ), + 'label' => + $context->msg( $user->getEmail() ? 'prefs-changeemail' : 'prefs-setemail' )->text(), + ] ); - $emailAddress .= $emailAddress == '' ? $link : ( - $context->msg( 'word-separator' )->escaped() -
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Enable spellchecking on media caption inputs
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/397866 ) Change subject: Enable spellchecking on media caption inputs .. Enable spellchecking on media caption inputs Bug: T182393 Change-Id: I23d3f1b37225f9e5a9a9651b6e7b590d38dc99b3 --- M modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js M modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js 2 files changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/66/397866/1 diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js index c627dad..d4fabcb 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js @@ -129,7 +129,8 @@ // TODO: make into a ve.ui.MWTargetWidget once Parsoid handles galleries this.highlightedCaptionInput = new OO.ui.MultilineTextInputWidget( { placeholder: ve.msg( 'visualeditor-mwgallerydialog-image-caption-placeholder' ), - autosize: true + autosize: true, + spellcheck: true } ); this.highlightedCaptionFieldset = new OO.ui.FieldsetLayout( { label: ve.msg( 'visualeditor-dialog-media-content-section' ), @@ -181,7 +182,8 @@ } } ); this.captionInput = new OO.ui.TextInputWidget( { - placeholder: ve.msg( 'visualeditor-mwgallerydialog-caption-input-placeholder' ) + placeholder: ve.msg( 'visualeditor-mwgallerydialog-caption-input-placeholder' ), + spellcheck: true } ); this.widthsInput = new OO.ui.NumberInputWidget( { min: 0, diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js index 4465cb7..76857fe 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js @@ -261,7 +261,7 @@ icon: 'parameter' } ); - this.altTextInput = new OO.ui.TextInputWidget(); + this.altTextInput = new OO.ui.TextInputWidget( { spellcheck: true } ); this.altTextInput.$element.addClass( 've-ui-mwMediaDialog-altText' ); -- To view, visit https://gerrit.wikimedia.org/r/397866 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I23d3f1b37225f9e5a9a9651b6e7b590d38dc99b3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Only resolve wikitext promise when progress dialog has closed
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/397862 ) Change subject: Only resolve wikitext promise when progress dialog has closed .. Only resolve wikitext promise when progress dialog has closed Logically depends on I0cdb004011 to fix the bug. Bug: T182402 Change-Id: I8ecd695c052a6c759b8261e81fb25c771bdf3d56 --- M modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js 1 file changed, 10 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/62/397862/1 diff --git a/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js b/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js index f102637..898eb81 100644 --- a/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js +++ b/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js @@ -128,7 +128,7 @@ * @inheritdoc */ ve.dm.MWWikitextSurfaceFragment.prototype.convertToSource = function ( doc ) { - var wikitextPromise; + var wikitextPromise, progressPromise; if ( !doc.data.hasContent() ) { return $.Deferred().resolve( '' ).promise(); @@ -137,15 +137,21 @@ wikitextPromise = ve.init.target.getWikitextFragment( doc, false ); // TODO: Emit an event to trigger the progress bar - ve.init.target.getSurface().createProgress( + progressPromise = ve.init.target.getSurface().createProgress( wikitextPromise, ve.msg( 'visualeditor-generating-wikitext-progress' ) - ).done( function ( progressBar, cancelPromise ) { + ).then( function ( progressBar, cancelPromise ) { cancelPromise.fail( function () { wikitextPromise.abort(); } ); } ); - return wikitextPromise; + return $.when( wikitextPromise, progressPromise ).then( function ( wikitext ) { + var deferred = $.Deferred(); + setTimeout( function () { + deferred.resolve( wikitext ); + }, ve.init.target.getSurface().dialogs.getTeardownDelay() ); + return deferred.promise(); + } ); }; /** -- To view, visit https://gerrit.wikimedia.org/r/397862 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8ecd695c052a6c759b8261e81fb25c771bdf3d56 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Allow access to a fragment's async state
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/397861 ) Change subject: Allow access to a fragment's async state .. Allow access to a fragment's async state Change-Id: I0cdb004011bc932e90d67db76bbc810255edc3a3 --- M src/ce/ve.ce.Surface.js M src/dm/ve.dm.SourceSurfaceFragment.js M src/dm/ve.dm.SurfaceFragment.js M src/ui/ve.ui.Surface.js 4 files changed, 44 insertions(+), 22 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/61/397861/1 diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js index ae35351..356a7d3 100644 --- a/src/ce/ve.ce.Surface.js +++ b/src/ce/ve.ce.Surface.js @@ -2347,22 +2347,24 @@ } } - if ( this.getSelection().isNativeCursor() ) { - // Restore focus and scroll position - this.$documentNode[ 0 ].focus(); - this.$window.scrollTop( beforePasteData.scrollTop ); - // setTimeout: Firefox sometimes doesn't change scrollTop immediately when pasting - // line breaks at the end of a line so do it again later. - setTimeout( function () { + targetFragment.getPending().then( function () { + if ( view.getSelection().isNativeCursor() ) { + // Restore focus and scroll position + view.$documentNode[ 0 ].focus(); view.$window.scrollTop( beforePasteData.scrollTop ); - } ); - } + // setTimeout: Firefox sometimes doesn't change scrollTop immediately when pasting + // line breaks at the end of a line so do it again later. + setTimeout( function () { + view.$window.scrollTop( beforePasteData.scrollTop ); + } ); + } - // If orignal selection was linear, switch to end of pasted text - if ( fragment.getSelection() instanceof ve.dm.LinearSelection ) { - targetFragment.collapseToEnd().select(); - this.checkSequences( /* isPaste */ true ); - } + // If orignal selection was linear, switch to end of pasted text + if ( fragment.getSelection() instanceof ve.dm.LinearSelection ) { + targetFragment.collapseToEnd().select(); + view.checkSequences( /* isPaste */ true ); + } + } ); }; /** diff --git a/src/dm/ve.dm.SourceSurfaceFragment.js b/src/dm/ve.dm.SourceSurfaceFragment.js index bcb9ddf..ca67bf9 100644 --- a/src/dm/ve.dm.SourceSurfaceFragment.js +++ b/src/dm/ve.dm.SourceSurfaceFragment.js @@ -111,6 +111,7 @@ fragment = this; if ( !range ) { + this.pushPending( $.Deferred().resolve().promise() ); return this; } @@ -146,18 +147,19 @@ return ve.dm.SourceSurfaceFragment.super.prototype.insertContent.call( this, data ); } - this.convertToSource( doc ) - .done( function ( source ) { + this.pushPending( this.convertToSource( doc ).then( + function ( source ) { if ( source ) { // Parent method ve.dm.SourceSurfaceFragment.super.prototype.insertContent.call( fragment, source.trim() ); } else { fragment.removeContent(); } - } ) - .fail( function () { + }, + function () { ve.error( 'Failed to convert document', arguments ); - } ); + } ) + ); return this; }; diff --git a/src/dm/ve.dm.SurfaceFragment.js b/src/dm/ve.dm.SurfaceFragment.js index 7d2c97b..79de5a7 100644 --- a/src/dm/ve.dm.SurfaceFragment.js +++ b/src/dm/ve.dm.SurfaceFragment.js @@ -31,6 +31,7 @@ this.surface = surface; this.selection = selection || surface.getSelection(); this.leafNodes = null; + this.pending = []; // Initialization this.historyPointer = this.document.getCompleteHistoryLength(); @@ -645,6 +646,24 @@ }; /** + * Push a promise to the fragment's pending list + * + * @param {jQuery.Promise} promise Promise + */ +ve.dm.SurfaceFragment.prototype.pushPending = function ( promise ) { + this.pending.push( promise ); +}; + +/** + * Get a promise that resolves when the pending list is complete + * + * @return {jQuery.Promise} Promise + */ +ve.dm.SurfaceFragment.prototype.getPending = function () { + return $.when.apply( $, this.pending ); +}; + +/** * Apply the fragment's range to the surface as a selection. * * @method diff --git a/src/ui/ve.ui.Surface.js b/src/ui/ve.ui.Surface.js index 257e442..8e041a4 100644 ---
[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Remove duplicate editfont size definition
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/397570 ) Change subject: Remove duplicate editfont size definition .. Remove duplicate editfont size definition Change-Id: I459156778a008c8a0231b0ee4c5484325c4bd6de Depends-On: I836a05674723ae0864372f8d0e32c7b430906a92 --- M modules/styles/flow/widgets/editor/editors/mw.flow.ui.WikitextEditorWidget.less 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/70/397570/1 diff --git a/modules/styles/flow/widgets/editor/editors/mw.flow.ui.WikitextEditorWidget.less b/modules/styles/flow/widgets/editor/editors/mw.flow.ui.WikitextEditorWidget.less index 86b0dec..d64e275 100644 --- a/modules/styles/flow/widgets/editor/editors/mw.flow.ui.WikitextEditorWidget.less +++ b/modules/styles/flow/widgets/editor/editors/mw.flow.ui.WikitextEditorWidget.less @@ -12,8 +12,6 @@ line-height: 0; textarea { - /* Re-apply system default after override by OOUI */ - font-size: 13.px; min-height: @editorMinHeight; -webkit-appearance: none; background: transparent; -- To view, visit https://gerrit.wikimedia.org/r/397570 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I459156778a008c8a0231b0ee4c5484325c4bd6de Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Standardize editfont size across browsers/OSes
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/396005 ) Change subject: Standardize editfont size across browsers/OSes .. Standardize editfont size across browsers/OSes Bug: T176636 Change-Id: I836a05674723ae0864372f8d0e32c7b430906a92 --- M resources/src/mediawiki/mediawiki.editfont.css 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/05/396005/1 diff --git a/resources/src/mediawiki/mediawiki.editfont.css b/resources/src/mediawiki/mediawiki.editfont.css index 6228030..12d80a3 100644 --- a/resources/src/mediawiki/mediawiki.editfont.css +++ b/resources/src/mediawiki/mediawiki.editfont.css @@ -1,6 +1,6 @@ /* Edit font preference */ .mw-editfont-monospace { - font-family: monospace; + font-family: monospace, monospace; } .mw-editfont-sans-serif { @@ -10,3 +10,10 @@ .mw-editfont-serif { font-family: serif; } + +/* Standardize font size for edit areas using edit-fonts T176636 */ +.mw-editfont-monospace, +.mw-editfont-sans-serif, +.mw-editfont-serif { + font-size: 13.px; +} -- To view, visit https://gerrit.wikimedia.org/r/396005 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I836a05674723ae0864372f8d0e32c7b430906a92 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Pass editor mode (visual/source) to tracking code
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/395975 ) Change subject: Pass editor mode (visual/source) to tracking code .. Pass editor mode (visual/source) to tracking code Change-Id: Iba5d3c66ecbd2872d76ea12f795ef3bebaae9d81 --- M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js M modules/ve-mw/init/ve.init.mw.ArticleTarget.js M modules/ve-mw/init/ve.init.mw.ArticleTargetEvents.js M modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js M modules/ve-mw/init/ve.init.mw.trackSubscriber.js 6 files changed, 46 insertions(+), 30 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/75/395975/1 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 28c078d..1d5e97b 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 @@ -159,7 +159,7 @@ .concat( plugins ) .forEach( mw.libs.ve.targetLoader.addPlugin ); plugins = []; - return mw.libs.ve.targetLoader.loadModules(); + return mw.libs.ve.targetLoader.loadModules( mode ); } ) .then( function () { var target, @@ -207,7 +207,7 @@ } function trackActivateStart( initData ) { - ve.track( 'trace.activate.enter' ); + ve.track( 'trace.activate.enter', { mode: initData.mode } ); ve.track( 'mwedit.init', initData ); mw.libs.ve.activationStart = ve.now(); } @@ -310,14 +310,14 @@ return activatePromise; } ) .then( function () { - ve.track( 'mwedit.ready' ); - ve.track( 'mwedit.loaded' ); + ve.track( 'mwedit.ready', { mode: mode } ); + ve.track( 'mwedit.loaded', { mode: mode } ); } ) .always( clearLoading ); } function activatePageTarget( mode, modified ) { - trackActivateStart( { type: 'page', mechanism: 'click' } ); + trackActivateStart( { type: 'page', mechanism: 'click', mode: mode } ); if ( !active ) { if ( uri.query.action !== 'edit' && !( uri.query.veaction in editModes ) ) { @@ -785,7 +785,7 @@ return; } - trackActivateStart( { type: 'section', mechanism: 'click' } ); + trackActivateStart( { type: 'section', mechanism: 'click', mode: mode } ); if ( history.pushState && !( uri.query.veaction in editModes ) ) { // Replace the current state with one that is tagged as ours, to prevent the @@ -987,7 +987,8 @@ showWikitextWelcome = false; trackActivateStart( { type: section === null ? 'page' : 'section', - mechanism: 'url' + mechanism: 'url', + mode: mode } ); activateTarget( mode, section ); } else if ( diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js index e0c0135..108127e 100644 --- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js +++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js @@ -234,17 +234,18 @@ */ ve.init.mw.DesktopArticleTarget.prototype.setupToolbar = function ( surface ) { var toolbar, + mode = surface.getMode(), wasSetup = !!this.toolbar, target = this; - ve.track( 'trace.setupToolbar.enter' ); + ve.track( 'trace.setupToolbar.enter', { mode: mode } ); // Parent method ve.init.mw.DesktopArticleTarget.super.prototype.setupToolbar.call( this, surface ); toolbar = this.getToolbar(); - ve.track( 'trace.setupToolbar.exit' ); + ve.track( 'trace.setupToolbar.exit', { mode: mode } ); if ( !wasSetup ) { setTimeout( function () { toolbar.$element @@ -263,12 +264,12 @@
[MediaWiki-commits] [Gerrit] mediawiki...WikiEditor[master]: Track action=loaded when the editor is *fully* ready
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/395777 ) Change subject: Track action=loaded when the editor is *fully* ready .. Track action=loaded when the editor is *fully* ready Change-Id: I29ee776bdfe5d89ddffb97175588ed037ef0beee --- M modules/ext.wikiEditor.js 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiEditor refs/changes/77/395777/1 diff --git a/modules/ext.wikiEditor.js b/modules/ext.wikiEditor.js index 33278e0..a9368f1 100644 --- a/modules/ext.wikiEditor.js +++ b/modules/ext.wikiEditor.js @@ -61,6 +61,11 @@ logEditEvent( 'ready', { editingSessionId: editingSessionId } ); + $textarea.on( 'wikiEditor-toolbar-doneInitialSections', function () { + logEditEvent( 'loaded', { + editingSessionId: editingSessionId + } ); + } ); $textarea.closest( 'form' ).submit( function () { submitting = true; } ); -- To view, visit https://gerrit.wikimedia.org/r/395777 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I29ee776bdfe5d89ddffb97175588ed037ef0beee Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikiEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Remove .mw-ui-item from SourcePageSelector
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/395739 ) Change subject: Remove .mw-ui-item from SourcePageSelector .. Remove .mw-ui-item from SourcePageSelector Not required, and float:left removes height causing box shadow issues further down the page. Bug: T182193 Change-Id: Idee6714287c60c0916829f20eaa89c5aebe653c9 --- M modules/source/styles/ext.cx.SourcePageSelector.less 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/39/395739/1 diff --git a/modules/source/styles/ext.cx.SourcePageSelector.less b/modules/source/styles/ext.cx.SourcePageSelector.less index e928045..d8a4a4c 100644 --- a/modules/source/styles/ext.cx.SourcePageSelector.less +++ b/modules/source/styles/ext.cx.SourcePageSelector.less @@ -2,8 +2,6 @@ @import 'mediawiki.mixins'; .cx-source-page-selector { - .mw-ui-item; - background-color: @white; color: @gray-darker; position: relative; -- To view, visit https://gerrit.wikimedia.org/r/395739 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idee6714287c60c0916829f20eaa89c5aebe653c9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: MWTable: Cleanup events and prevent fire after teardown
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/394745 ) Change subject: MWTable: Cleanup events and prevent fire after teardown .. MWTable: Cleanup events and prevent fire after teardown Bug: T181767 Change-Id: I9b86d810269f3e3e15ba4736d264dbf48c9a0fe3 --- M modules/ve-mw/ce/nodes/ve.ce.MWTableNode.js 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/45/394745/1 diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWTableNode.js b/modules/ve-mw/ce/nodes/ve.ce.MWTableNode.js index db0e814..14f09c8 100644 --- a/modules/ve-mw/ce/nodes/ve.ce.MWTableNode.js +++ b/modules/ve-mw/ce/nodes/ve.ce.MWTableNode.js @@ -54,6 +54,18 @@ ve.ce.MWTableNode.static.name = 'mwTable'; +/* Methods */ + +/** + * @inheritdoc + */ +ve.ce.MWTableNode.prototype.destroy = function () { + this.model.getMatrix().disconnect( this ); + + // Parent method + ve.ce.MWTableNode.super.prototype.destroy.apply( this, arguments ); +}; + /** * Update sortable headers (if the table is sortable). * @@ -64,6 +76,11 @@ view = this, cellModels, cellViews; + if ( !this.model ) { + // Fired after teardown due to debounce + return; + } + this.$element.toggleClass( 'jquery-tablesorter', this.model.getAttribute( 'sortable' ) ); this.$sortableHeaders.removeClass( 'headerSort' ); -- To view, visit https://gerrit.wikimedia.org/r/394745 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9b86d810269f3e3e15ba4736d264dbf48c9a0fe3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Graph[master]: build: Update linters
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/394398 ) Change subject: build: Update linters .. build: Update linters Change-Id: I14e5e99d3fb9bbeeb9a12f8ad35207b7e89f98b6 --- M modules/ve-graph/widgets/ve.dm.RowWidgetModel.js M package.json M styles/common.less M styles/sandbox.css 4 files changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Graph refs/changes/98/394398/1 diff --git a/modules/ve-graph/widgets/ve.dm.RowWidgetModel.js b/modules/ve-graph/widgets/ve.dm.RowWidgetModel.js index 979dd76..3435328 100644 --- a/modules/ve-graph/widgets/ve.dm.RowWidgetModel.js +++ b/modules/ve-graph/widgets/ve.dm.RowWidgetModel.js @@ -4,7 +4,7 @@ * @license The MIT License (MIT); see LICENSE.txt */ - /** +/** * RowWidget model. * * @class @@ -75,7 +75,7 @@ * @param {boolean} Clear cell properties */ - /** +/** * @event labelUpdate * * Fired when the row label might need to be updated diff --git a/package.json b/package.json index f39028a..1874196 100644 --- a/package.json +++ b/package.json @@ -12,16 +12,16 @@ }, "devDependencies": { "browserify": "^13.0.0", -"eslint-config-wikimedia": "0.4.0", +"eslint-config-wikimedia": "0.5.0", "grunt": "1.0.1", -"grunt-banana-checker": "0.5.0", +"grunt-banana-checker": "0.6.0", "grunt-contrib-watch": "1.0.0", -"grunt-eslint": "19.0.0", -"grunt-jsonlint": "1.0.7", -"grunt-stylelint": "0.7.0", +"grunt-eslint": "20.0.0", +"grunt-jsonlint": "1.1.0", +"grunt-stylelint": "0.8.0", "jquery.splitter": "^0.20.1", "mw-graph-shared": "^0.3.6", -"stylelint": "7.8.0", -"stylelint-config-wikimedia": "0.4.1" +"stylelint": "8.2.0", +"stylelint-config-wikimedia": "0.4.2" } } diff --git a/styles/common.less b/styles/common.less index e4c7677..467c384 100644 --- a/styles/common.less +++ b/styles/common.less @@ -157,10 +157,10 @@ } } - /* stylelint-disable selector-no-id */ + /* stylelint-disable selector-max-id */ /* Set graph width */ #mw-graph-json { width: 100%; } - /* stylelint-enable selector-no-id */ + /* stylelint-enable selector-max-id */ } diff --git a/styles/sandbox.css b/styles/sandbox.css index a629594..d815c43 100644 --- a/styles/sandbox.css +++ b/styles/sandbox.css @@ -1,4 +1,4 @@ -/* stylelint-disable selector-no-id */ +/* stylelint-disable selector-max-id */ #mw-graph-right .top_panel { overflow: hidden; -- To view, visit https://gerrit.wikimedia.org/r/394398 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I14e5e99d3fb9bbeeb9a12f8ad35207b7e89f98b6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Graph Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Score[master]: build: Update linters
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/394397 ) Change subject: build: Update linters .. build: Update linters Change-Id: I461330305e8c66e82decb9ffcd9859f94c17e298 --- M package.json 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Score refs/changes/97/394397/1 diff --git a/package.json b/package.json index e4133b4..16a10d7 100644 --- a/package.json +++ b/package.json @@ -4,14 +4,14 @@ "test": "grunt test" }, "devDependencies": { -"eslint-config-wikimedia": "0.4.0", +"eslint-config-wikimedia": "0.5.0", "grunt": "1.0.1", -"grunt-banana-checker": "0.5.0", +"grunt-banana-checker": "0.6.0", "grunt-contrib-watch": "1.0.0", -"grunt-eslint": "19.0.0", -"grunt-jsonlint": "1.0.7", -"grunt-stylelint": "0.7.0", -"stylelint": "7.8.0", -"stylelint-config-wikimedia": "0.4.1" +"grunt-eslint": "20.0.0", +"grunt-jsonlint": "1.1.0", +"grunt-stylelint": "0.8.0", +"stylelint": "8.2.0", +"stylelint-config-wikimedia": "0.4.2" } } -- To view, visit https://gerrit.wikimedia.org/r/394397 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I461330305e8c66e82decb9ffcd9859f94c17e298 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Score Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...wikihiero[master]: build: Update linters
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/394395 ) Change subject: build: Update linters .. build: Update linters Change-Id: If7da945e8790a1f1223c7455b329855386456785 --- M package.json 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/wikihiero refs/changes/95/394395/1 diff --git a/package.json b/package.json index 6983820..163cfa1 100644 --- a/package.json +++ b/package.json @@ -7,14 +7,14 @@ "test": "grunt test" }, "devDependencies": { - "eslint-config-wikimedia": "0.4.0", + "eslint-config-wikimedia": "0.5.0", "grunt": "1.0.1", "grunt-banana-checker": "0.6.0", "grunt-contrib-watch": "1.0.0", - "grunt-eslint": "19.0.0", + "grunt-eslint": "20.0.0", "grunt-jsonlint": "1.1.0", - "grunt-stylelint": "0.7.0", - "stylelint": "7.8.0", - "stylelint-config-wikimedia": "0.4.1" + "grunt-stylelint": "0.8.0", + "stylelint": "8.2.0", + "stylelint-config-wikimedia": "0.4.2" } } -- To view, visit https://gerrit.wikimedia.org/r/394395 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If7da945e8790a1f1223c7455b329855386456785 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/wikihiero Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SyntaxHighlight_GeSHi[master]: build: Update linters
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/394393 ) Change subject: build: Update linters .. build: Update linters Change-Id: I92f658cdb4806e7b1000c9306114072477fc9651 --- M package.json 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SyntaxHighlight_GeSHi refs/changes/93/394393/1 diff --git a/package.json b/package.json index befe9bd..dace520 100644 --- a/package.json +++ b/package.json @@ -4,14 +4,14 @@ "test": "grunt test" }, "devDependencies": { -"eslint-config-wikimedia": "0.4.0", +"eslint-config-wikimedia": "0.5.0", "grunt": "1.0.1", "grunt-banana-checker": "0.5.0", "grunt-contrib-watch": "1.0.0", -"grunt-eslint": "19.0.0", -"grunt-jsonlint": "1.0.8", -"grunt-stylelint": "0.7.0", -"stylelint": "7.8.0", -"stylelint-config-wikimedia": "0.4.1" +"grunt-eslint": "20.0.0", +"grunt-jsonlint": "1.1.0", +"grunt-stylelint": "0.8.0", +"stylelint": "8.2.0", +"stylelint-config-wikimedia": "0.4.2" } } -- To view, visit https://gerrit.wikimedia.org/r/394393 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I92f658cdb4806e7b1000c9306114072477fc9651 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: build: Update linters
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/394392 ) Change subject: build: Update linters .. build: Update linters Change-Id: I6d5da6c02c598f1ad0f360e551e9a3ebbf7f3085 --- M modules/page/ext.proofreadpage.page.css M modules/page/ext.proofreadpage.page.navigation.vector.css M package.json 3 files changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage refs/changes/92/394392/1 diff --git a/modules/page/ext.proofreadpage.page.css b/modules/page/ext.proofreadpage.page.css index 09bf526..aced37c 100644 --- a/modules/page/ext.proofreadpage.page.css +++ b/modules/page/ext.proofreadpage.page.css @@ -22,16 +22,16 @@ } /* TODO: Don't use IDs */ -#prp-page-qualityheader { /* stylelint-disable-line selector-no-id */ +#prp-page-qualityheader { /* stylelint-disable-line selector-max-id */ width: 100%; } /* CSS only editing interface */ -#editform .prp-page-content { /* stylelint-disable-line selector-no-id */ +#editform .prp-page-content { /* stylelint-disable-line selector-max-id */ line-height: 1.5em; } -#editform .prp-page-content label { /* stylelint-disable-line selector-no-id */ +#editform .prp-page-content label { /* stylelint-disable-line selector-max-id */ color: #808080; font-size: 80%; } diff --git a/modules/page/ext.proofreadpage.page.navigation.vector.css b/modules/page/ext.proofreadpage.page.navigation.vector.css index 3c3172d..3512c8b 100644 --- a/modules/page/ext.proofreadpage.page.navigation.vector.css +++ b/modules/page/ext.proofreadpage.page.navigation.vector.css @@ -1,4 +1,4 @@ -/* stylelint-disable selector-no-id */ +/* stylelint-disable selector-max-id */ .prp-tabs #ca-proofreadPagePrevLink.icon a, .prp-tabs #ca-proofreadPageNextLink.icon a, .prp-tabs #ca-proofreadPageIndexLink.icon a { diff --git a/package.json b/package.json index eb10f3d..9d9d122 100644 --- a/package.json +++ b/package.json @@ -4,13 +4,13 @@ "test": "grunt test" }, "devDependencies": { -"eslint-config-wikimedia": "0.4.0", +"eslint-config-wikimedia": "0.5.0", "grunt": "1.0.1", "grunt-banana-checker": "0.6.0", -"grunt-eslint": "19.0.0", +"grunt-eslint": "20.0.0", "grunt-jsonlint": "1.1.0", -"grunt-stylelint": "0.7.0", -"stylelint": "7.8.0", -"stylelint-config-wikimedia": "0.4.1" +"grunt-stylelint": "0.8.0", +"stylelint": "8.2.0", +"stylelint-config-wikimedia": "0.4.2" } } -- To view, visit https://gerrit.wikimedia.org/r/394392 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6d5da6c02c598f1ad0f360e551e9a3ebbf7f3085 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ProofreadPage Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Remove unwrapping code from ve.ce.MWTransclusionNode
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/394345 ) Change subject: Remove unwrapping code from ve.ce.MWTransclusionNode .. Remove unwrapping code from ve.ce.MWTransclusionNode Has been fixed upstream in Parsoid. Bug: T181226 Change-Id: I7dfe228e6d1008c4e66377d501f2e4af72c1813d --- M modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js 1 file changed, 1 insertion(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/45/394345/1 diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js b/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js index cd5028b..8b04715 100644 --- a/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js +++ b/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js @@ -89,19 +89,13 @@ * @return {HTMLElement[]} Filtered rendered nodes */ ve.ce.MWTransclusionNode.static.filterRendering = function ( contentNodes ) { - var whitespaceRegex, wrapper; + var whitespaceRegex; if ( !contentNodes.length ) { return; } whitespaceRegex = new RegExp( '^[' + ve.dm.Converter.static.whitespaceList + ']+$' ); - wrapper = contentNodes[ 0 ].ownerDocument.createElement( 'div' ); - - // Unwrap Parsoid sections (which probably shouldn't exist: T181226) - contentNodes.forEach( function ( node ) { wrapper.appendChild( node ); } ); - ve.unwrapParsoidSections( wrapper ); - contentNodes = Array.prototype.slice.call( wrapper.childNodes ); function isAutoGenerated( node ) { var dataMw = node && -- To view, visit https://gerrit.wikimedia.org/r/394345 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7dfe228e6d1008c4e66377d501f2e4af72c1813d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Disable WebkitTextFillColor in Firefox+OSX
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/394337 ) Change subject: Disable WebkitTextFillColor in Firefox+OSX .. Disable WebkitTextFillColor in Firefox+OSX Avoids opaque selection covering text. Bug: T175223 Change-Id: Iede96501d4a03ccd80488b4661c18647eb9118e1 --- M resources/modules/ve-cm/ve.ui.CodeMirrorAction.js 1 file changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror refs/changes/37/394337/1 diff --git a/resources/modules/ve-cm/ve.ui.CodeMirrorAction.js b/resources/modules/ve-cm/ve.ui.CodeMirrorAction.js index 0078482..cadcc72 100644 --- a/resources/modules/ve-cm/ve.ui.CodeMirrorAction.js +++ b/resources/modules/ve-cm/ve.ui.CodeMirrorAction.js @@ -38,7 +38,8 @@ * @return {boolean} Action was executed */ ve.ui.CodeMirrorAction.prototype.toggle = function ( enable ) { - var surface = this.surface, + var profile, supportsTransparentText, + surface = this.surface, surfaceView = surface.getView(), doc = surface.getModel().getDocument(); @@ -63,8 +64,13 @@ // so revert any editfont user preference surfaceView.$element.removeClass( 'mw-editfont-sans-serif mw-editfont-serif' ).addClass( 'mw-editfont-monospace' ); + profile = $.client.profile(); + supportsTransparentText = 'WebkitTextFillColor' in document.body.style && + // Disable on Firefox+OSX (T175223) + !( profile.layout === 'gecko' && profile.platform === 'mac' ); + surfaceView.$documentNode.addClass( - 'WebkitTextFillColor' in document.body.style ? + supportsTransparentText ? 've-ce-documentNode-codeEditor-webkit-hide' : 've-ce-documentNode-codeEditor-hide' ); -- To view, visit https://gerrit.wikimedia.org/r/394337 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iede96501d4a03ccd80488b4661c18647eb9118e1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CodeMirror Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Fix typo in name of non-webkit hide class
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/394336 ) Change subject: Fix typo in name of non-webkit hide class .. Fix typo in name of non-webkit hide class Also increase opacity to 40% so selection & cursor are more visible. Change-Id: Ia957f816de9003eb8b709de3d7993bbfef99e3bc --- M resources/modules/ve-cm/ve.ui.CodeMirror.init.less M resources/modules/ve-cm/ve.ui.CodeMirrorAction.js 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror refs/changes/36/394336/1 diff --git a/resources/modules/ve-cm/ve.ui.CodeMirror.init.less b/resources/modules/ve-cm/ve.ui.CodeMirror.init.less index 0d2cdce..6db9a8d 100644 --- a/resources/modules/ve-cm/ve.ui.CodeMirror.init.less +++ b/resources/modules/ve-cm/ve.ui.CodeMirror.init.less @@ -57,7 +57,7 @@ } .ve-ce-documentNode-codeEditor-hide { - opacity: 0.3; + opacity: 0.4; } .ve-ce-documentNode-codeEditor-webkit-hide { diff --git a/resources/modules/ve-cm/ve.ui.CodeMirrorAction.js b/resources/modules/ve-cm/ve.ui.CodeMirrorAction.js index ca75b2d..0078482 100644 --- a/resources/modules/ve-cm/ve.ui.CodeMirrorAction.js +++ b/resources/modules/ve-cm/ve.ui.CodeMirrorAction.js @@ -66,7 +66,7 @@ surfaceView.$documentNode.addClass( 'WebkitTextFillColor' in document.body.style ? 've-ce-documentNode-codeEditor-webkit-hide' : - 've-ce-documentNode-codeEditor-webkit' + 've-ce-documentNode-codeEditor-hide' ); /* Events */ @@ -89,7 +89,7 @@ surfaceView.$element.removeClass( 'mw-editfont-monospace' ).addClass( 'mw-editfont-' + mw.user.options.get( 'editfont' ) ); surfaceView.$documentNode.removeClass( - 've-ce-documentNode-codeEditor-webkit-hide ve-ce-documentNode-codeEditor-webkit' + 've-ce-documentNode-codeEditor-webkit-hide ve-ce-documentNode-codeEditor-hide' ); surface.mirror.getWrapperElement().remove(); -- To view, visit https://gerrit.wikimedia.org/r/394336 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia957f816de9003eb8b709de3d7993bbfef99e3bc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CodeMirror Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: mw.postEdit: Use mw.notify to display message
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/394076 ) Change subject: mw.postEdit: Use mw.notify to display message .. mw.postEdit: Use mw.notify to display message Further unifies our message displaying system. Technically a breaking change as it removes the 'postEdit.afterRemoval' hook, but I could find no uses of it in our codebase or the wild. Bug: T58313 Change-Id: Iec031de7aa8c09091b811530a45758b53638372f --- M resources/Resources.php D resources/src/mediawiki.action/images/close.png D resources/src/mediawiki.action/images/close.svg D resources/src/mediawiki.action/images/green-checkmark.png M resources/src/mediawiki.action/mediawiki.action.view.postEdit.js D resources/src/mediawiki.action/mediawiki.action.view.postEdit.less D resources/src/mediawiki.action/mediawiki.action.view.postEdit.monobook.css 7 files changed, 1 insertion(+), 108 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/76/394076/1 diff --git a/resources/Resources.php b/resources/Resources.php index a5bfbc5..54ad94a 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1494,10 +1494,6 @@ ], 'mediawiki.action.view.postEdit' => [ 'scripts' => 'resources/src/mediawiki.action/mediawiki.action.view.postEdit.js', - 'styles' => 'resources/src/mediawiki.action/mediawiki.action.view.postEdit.less', - 'skinStyles' => [ - 'monobook' => 'resources/src/mediawiki.action/mediawiki.action.view.postEdit.monobook.css', - ], 'dependencies' => [ 'mediawiki.jqueryMsg', 'mediawiki.notification' diff --git a/resources/src/mediawiki.action/images/close.png b/resources/src/mediawiki.action/images/close.png deleted file mode 100644 index 80dde95..000 --- a/resources/src/mediawiki.action/images/close.png +++ /dev/null Binary files differ diff --git a/resources/src/mediawiki.action/images/close.svg b/resources/src/mediawiki.action/images/close.svg deleted file mode 100644 index 22619b9..000 --- a/resources/src/mediawiki.action/images/close.svg +++ /dev/null @@ -1,5 +0,0 @@ - -http://www.w3.org/2000/svg; width="20" height="20" viewBox="0 0 20 20"> - - - diff --git a/resources/src/mediawiki.action/images/green-checkmark.png b/resources/src/mediawiki.action/images/green-checkmark.png deleted file mode 100644 index 9fc5800..000 --- a/resources/src/mediawiki.action/images/green-checkmark.png +++ /dev/null Binary files differ diff --git a/resources/src/mediawiki.action/mediawiki.action.view.postEdit.js b/resources/src/mediawiki.action/mediawiki.action.view.postEdit.js index e0ab45a..bc26d1a 100644 --- a/resources/src/mediawiki.action/mediawiki.action.view.postEdit.js +++ b/resources/src/mediawiki.action/mediawiki.action.view.postEdit.js @@ -15,49 +15,15 @@ * @param {string|mw.user} [data.user=mw.user] User that made the edit. */ - /** -* After the listener for #postEdit removes the notification. -* -* @event postEdit_afterRemoval -* @member mw.hook -*/ - var postEdit = mw.config.get( 'wgPostEdit' ); function showConfirmation( data ) { - var $container, $popup, $content, timeoutId; - - function fadeOutConfirmation() { - $popup.addClass( 'postedit-faded' ); - setTimeout( function () { - $container.remove(); - mw.hook( 'postEdit.afterRemoval' ).fire(); - }, 250 ); - } - data = data || {}; + mw.notify( mw.msg( 'postedit-confirmation-saved', data.user || mw.user ) ); if ( data.message === undefined ) { data.message = $.parseHTML( mw.message( 'postedit-confirmation-saved', data.user || mw.user ).escaped() ); } - - $content = $( '' ).addClass( 'postedit-icon postedit-icon-checkmark postedit-content' ); - if ( typeof data.message === 'string' ) { - $content.text( data.message ); - } else if ( typeof data.message === 'object' ) { - $content.append( data.message ); - } - - $popup = $( '' ).addClass( 'postedit mw-notification' ).append( $content ) - .click( function () { - clearTimeout( timeoutId ); - fadeOutConfirmation(); - } ); - - $container = $( '' ).addClass( 'postedit-container' ).append( $popup ); - timeoutId = setTimeout( fadeOutConfirmation, 3000 ); - - $( 'body' ).prepend( $container ); } mw.hook(
[MediaWiki-commits] [Gerrit] mediawiki...Vector[master]: mw.notify: Remove rules duplicated from core
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/394077 ) Change subject: mw.notify: Remove rules duplicated from core .. mw.notify: Remove rules duplicated from core Change-Id: Ibaebea290b2a912fdc9914cfc12d7916a0fe1d18 Depends-On: I157e41631c4a09842b869215b0d6dbb99c1a4d36 --- M skinStyles/mediawiki.notification.less 1 file changed, 0 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector refs/changes/77/394077/1 diff --git a/skinStyles/mediawiki.notification.less b/skinStyles/mediawiki.notification.less index 98efcc6..6a31ad9 100644 --- a/skinStyles/mediawiki.notification.less +++ b/skinStyles/mediawiki.notification.less @@ -11,17 +11,7 @@ } .mw-notification { - background-color: #fff; - padding: 0.75em 1.5em; border: 1px solid @colorFieldBorder; border-radius: 2px; box-shadow: 0 2px 2px 0 rgba( 0, 0, 0, 0.25 ); -} - -.mw-notification-type-warn { - border-color: #f5be00; /* yellow */ -} - -.mw-notification-type-error { - border-color: #d33; /* red */ } -- To view, visit https://gerrit.wikimedia.org/r/394077 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibaebea290b2a912fdc9914cfc12d7916a0fe1d18 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Vector Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: mw.notifiction: Bring in some rules from Vector
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/394074 ) Change subject: mw.notifiction: Bring in some rules from Vector .. mw.notifiction: Bring in some rules from Vector The larger padding makes sense as a default. Also increase the specificity of the error/warn rules so they are overridden by changes to the default state. Change-Id: I157e41631c4a09842b869215b0d6dbb99c1a4d36 --- M resources/src/mediawiki/mediawiki.notification.css 1 file changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/74/394074/1 diff --git a/resources/src/mediawiki/mediawiki.notification.css b/resources/src/mediawiki/mediawiki.notification.css index 481980f..a56be76 100644 --- a/resources/src/mediawiki/mediawiki.notification.css +++ b/resources/src/mediawiki/mediawiki.notification.css @@ -11,11 +11,10 @@ } .mw-notification { - padding: 0.25em 1em; + padding: 0.75em 1.5em; margin-bottom: 0.5em; border: solid 1px #ddd; - background-color: #fcfcfc; - color: #252525; + background-color: #fff; /* Click handler in mediawiki.notification.js */ cursor: pointer; @@ -43,12 +42,12 @@ font-weight: bold; } -.mw-notification-type-warn { +.mw-notification.mw-notification-type-warn { border-color: #f5be00; /* yellow */ background-color: #e8; } -.mw-notification-type-error { +.mw-notification.mw-notification-type-error { border-color: #eb3941; /* red */ background-color: #fff8f8; } -- To view, visit https://gerrit.wikimedia.org/r/394074 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I157e41631c4a09842b869215b0d6dbb99c1a4d36 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: build: Update linters
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/394066 ) Change subject: build: Update linters .. build: Update linters Change-Id: I45540db95711b461ded3630894bd1f149c24ff19 --- M package.json M resources/css/ext.uls-monobook.css M resources/css/ext.uls.compactlinks.less M resources/css/ext.uls.displaysettings.less M resources/css/ext.uls.interface.less M resources/css/ext.uls.interlanguage.less M resources/css/ext.uls.languagesettings.less M resources/css/ext.uls.pt.less 8 files changed, 13 insertions(+), 11 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector refs/changes/66/394066/1 diff --git a/package.json b/package.json index e5a4f66..9d9d122 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "grunt-eslint": "20.0.0", "grunt-jsonlint": "1.1.0", "grunt-stylelint": "0.8.0", -"stylelint": "7.8.0", -"stylelint-config-wikimedia": "0.4.1" +"stylelint": "8.2.0", +"stylelint-config-wikimedia": "0.4.2" } } diff --git a/resources/css/ext.uls-monobook.css b/resources/css/ext.uls-monobook.css index 4f6eeb2..3864a03 100644 --- a/resources/css/ext.uls-monobook.css +++ b/resources/css/ext.uls-monobook.css @@ -1,3 +1,3 @@ -#pt-uls { /* stylelint-disable-line selector-no-id */ +#pt-uls { /* stylelint-disable-line selector-max-id */ text-transform: none; } diff --git a/resources/css/ext.uls.compactlinks.less b/resources/css/ext.uls.compactlinks.less index deeab1a..7266b90 100644 --- a/resources/css/ext.uls.compactlinks.less +++ b/resources/css/ext.uls.compactlinks.less @@ -1,13 +1,13 @@ @import 'mediawiki.mixins'; @import 'ext.uls.mixins.less'; -/* stylelint-disable selector-no-id */ +/* stylelint-disable selector-max-id */ #p-lang .body ul .uls-trigger, #p-lang .pBody ul .uls-trigger { background-image: none; padding: 0; } -/* stylelint-enable selector-no-id */ +/* stylelint-enable selector-max-id */ .mw-interlanguage-selector, .mw-interlanguage-selector:active { diff --git a/resources/css/ext.uls.displaysettings.less b/resources/css/ext.uls.displaysettings.less index 9e91e2d..a6ee563 100644 --- a/resources/css/ext.uls.displaysettings.less +++ b/resources/css/ext.uls.displaysettings.less @@ -43,11 +43,13 @@ } } +/* stylelint-disable selector-max-id */ .uls-font-label, .uls-font-select, -#uls-display-settings-anon-log-in-cta { /* stylelint-disable-line selector-no-id */ +#uls-display-settings-anon-log-in-cta { font-size: 10pt; } +/* stylelint-enable selector-max-id */ .uls-font-label { color: #54595d; diff --git a/resources/css/ext.uls.interface.less b/resources/css/ext.uls.interface.less index 615b979..899a762 100644 --- a/resources/css/ext.uls.interface.less +++ b/resources/css/ext.uls.interface.less @@ -1,4 +1,4 @@ -/* stylelint-disable selector-no-id */ +/* stylelint-disable selector-max-id */ @import 'mediawiki.mixins'; #uls-settings-block { diff --git a/resources/css/ext.uls.interlanguage.less b/resources/css/ext.uls.interlanguage.less index c21c485..43ce947 100644 --- a/resources/css/ext.uls.interlanguage.less +++ b/resources/css/ext.uls.interlanguage.less @@ -1,4 +1,4 @@ -/* stylelint-disable selector-no-id */ +/* stylelint-disable selector-max-id */ @import 'mediawiki.mixins'; #p-lang .uls-settings-trigger { diff --git a/resources/css/ext.uls.languagesettings.less b/resources/css/ext.uls.languagesettings.less index 15148c3..ed7a041 100644 --- a/resources/css/ext.uls.languagesettings.less +++ b/resources/css/ext.uls.languagesettings.less @@ -1,6 +1,6 @@ @import 'mediawiki.mixins'; -/* stylelint-disable selector-no-id */ +/* stylelint-disable selector-max-id */ #uls-settings-block { background-color: #f8f9fa; border-top: 1px solid #c8ccd1; @@ -134,7 +134,7 @@ color: #222; } -label.checkbox input[type='checkbox'] { +label.checkbox input[ type='checkbox' ] { float: left; } diff --git a/resources/css/ext.uls.pt.less b/resources/css/ext.uls.pt.less index f6734e0..f132c8b 100644 --- a/resources/css/ext.uls.pt.less +++ b/resources/css/ext.uls.pt.less @@ -1,6 +1,6 @@ @import 'mediawiki.mixins'; -/* stylelint-disable selector-no-id */ +/* stylelint-disable selector-max-id */ /* * The trigger can be placed in the personal toolbar near the username -- To view, visit https://gerrit.wikimedia.org/r/394066 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I45540db95711b461ded3630894bd1f149c24ff19 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Highlight table caption when table cells selected
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/393222 ) Change subject: Highlight table caption when table cells selected .. Highlight table caption when table cells selected Bug: T181173 Change-Id: Id4c1c7aa279dc25ed05a45aed156a694cb63e92e --- M src/ce/styles/nodes/ve.ce.TableNode.css 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/22/393222/1 diff --git a/src/ce/styles/nodes/ve.ce.TableNode.css b/src/ce/styles/nodes/ve.ce.TableNode.css index 1822fb2..96d5dbb 100644 --- a/src/ce/styles/nodes/ve.ce.TableNode.css +++ b/src/ce/styles/nodes/ve.ce.TableNode.css @@ -14,6 +14,7 @@ cursor: text; } +.ve-ce-tableNode-active .ve-ce-tableCaptionNode, .ve-ce-tableCaptionNode.ve-ce-activeNode-active { border: 1px dotted #c8ccd1; border-bottom: 0; -- To view, visit https://gerrit.wikimedia.org/r/393222 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id4c1c7aa279dc25ed05a45aed156a694cb63e92e Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Create MW tables with captions by default
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/393077 ) Change subject: Create MW tables with captions by default .. Create MW tables with captions by default Bug: T181173 Change-Id: Ib17331e0e8478ba67c1ecbbee4a284d9993cb552 Depends-On: Ieb668d282f7afa9332cead94c95f19f652102af1 --- M modules/ve-mw/ui/ve.ui.MWCommandRegistry.js 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/77/393077/1 diff --git a/modules/ve-mw/ui/ve.ui.MWCommandRegistry.js b/modules/ve-mw/ui/ve.ui.MWCommandRegistry.js index 5a613a8..73a8cdd 100644 --- a/modules/ve-mw/ui/ve.ui.MWCommandRegistry.js +++ b/modules/ve-mw/ui/ve.ui.MWCommandRegistry.js @@ -11,6 +11,7 @@ new ve.ui.Command( 'insertTable', 'table', 'create', { args: [ { + caption: true, header: true, rows: 3, cols: 4, -- To view, visit https://gerrit.wikimedia.org/r/393077 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib17331e0e8478ba67c1ecbbee4a284d9993cb552 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits