[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: ve.init.mw.DesktopArticleTarget: Remove hack for reversed ta...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/381167 ) Change subject: ve.init.mw.DesktopArticleTarget: Remove hack for reversed tabs in RTL in Vector .. ve.init.mw.DesktopArticleTarget: Remove hack for reversed tabs in RTL in Vector Vector no longer does the silly thing where the tabs are reversed in the HTML in RTL languages, so we must remove our hack to do the same, since otherwise it reintroduces the issue it was intended to prevent. This essentially reverts 2efd4f00610bc322e493deac1446c4dc050b9347. Bug: T50017 Change-Id: Ibeaa55bc34899bffab849ea8ad8b127fb5184d43 --- M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 1 file changed, 2 insertions(+), 5 deletions(-) Approvals: Esanders: Looks good to me, approved jenkins-bot: Verified 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 811f8d2..89a8038 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 @@ -426,10 +426,8 @@ $caVeEdit = $( '#ca-ve-edit' ), $caEditLink = $caEdit.find( 'a' ), $caVeEditLink = $caVeEdit.find( 'a' ), - reverseTabOrder = $( 'body' ).hasClass( 'rtl' ) && pTabsId === 'p-views', caVeEditNextnode = - // eslint-disable-next-line no-bitwise - ( reverseTabOrder ^ conf.tabPosition === 'before' ) ? + ( conf.tabPosition === 'before' ) ? $caEdit.get( 0 ) : $caEdit.next().get( 0 ); @@ -468,8 +466,7 @@ } } else if ( $caEdit.length && $caVeEdit.length ) { // Make the state of the page consistent with the config if needed - // eslint-disable-next-line no-bitwise - if ( reverseTabOrder ^ conf.tabPosition === 'before' ) { + if ( conf.tabPosition === 'before' ) { if ( $caEdit[ 0 ].nextSibling === $caVeEdit[ 0 ] ) { $caVeEdit.after( $caEdit ); } -- To view, visit https://gerrit.wikimedia.org/r/381167 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibeaa55bc34899bffab849ea8ad8b127fb5184d43 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Bartosz DziewońskiGerrit-Reviewer: Catrope Gerrit-Reviewer: DLynch Gerrit-Reviewer: Esanders Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: ve.init.mw.DesktopArticleTarget: Remove hack for reversed ta...
Bartosz Dziewoński has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/381167 ) Change subject: ve.init.mw.DesktopArticleTarget: Remove hack for reversed tabs in RTL in Vector .. ve.init.mw.DesktopArticleTarget: Remove hack for reversed tabs in RTL in Vector Vector no longer does the silly thing where the tabs are reversed in the HTML in RTL languages, so we must remove our hack to do the same, since otherwise it reintroduces the issue it was intended to prevent. This essentially reverts 2efd4f00610bc322e493deac1446c4dc050b9347. Bug: T50017 Change-Id: Ibeaa55bc34899bffab849ea8ad8b127fb5184d43 --- M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 1 file changed, 2 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/67/381167/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 811f8d2..89a8038 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 @@ -426,10 +426,8 @@ $caVeEdit = $( '#ca-ve-edit' ), $caEditLink = $caEdit.find( 'a' ), $caVeEditLink = $caVeEdit.find( 'a' ), - reverseTabOrder = $( 'body' ).hasClass( 'rtl' ) && pTabsId === 'p-views', caVeEditNextnode = - // eslint-disable-next-line no-bitwise - ( reverseTabOrder ^ conf.tabPosition === 'before' ) ? + ( conf.tabPosition === 'before' ) ? $caEdit.get( 0 ) : $caEdit.next().get( 0 ); @@ -468,8 +466,7 @@ } } else if ( $caEdit.length && $caVeEdit.length ) { // Make the state of the page consistent with the config if needed - // eslint-disable-next-line no-bitwise - if ( reverseTabOrder ^ conf.tabPosition === 'before' ) { + if ( conf.tabPosition === 'before' ) { if ( $caEdit[ 0 ].nextSibling === $caVeEdit[ 0 ] ) { $caVeEdit.after( $caEdit ); } -- To view, visit https://gerrit.wikimedia.org/r/381167 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibeaa55bc34899bffab849ea8ad8b127fb5184d43 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits