⚓ T165129 Help text of editor column covered by WikiEditor

	Subject	Repo	Branch	Lines +/-
	Fix issues with column alignment	mediawiki/extensions/TwoColConflict	wmf/1.30.0-wmf.1	+22 -22
	Fix issues with column alignment	mediawiki/extensions/TwoColConflict	master	+22 -22

Status	Assigned	Task
Open	None	T72163 Edit conflicts (tracking)
Resolved	None	T139601 Better solutions to edit conflicts (#1)
Resolved	Andrew-WMDE	T165129 Help text of editor column covered by WikiEditor

• Jan_Dittrich created this task.May 12 2017, 7:41 AM

• Lea_WMDE edited projects, added German-Community-Wishlist, Two-Column-Edit-Conflict-Merge, WMDE-TechWish; removed User-notice, TCB-Team (now WMDE-TechWish) (Oct2016-March2017), German-Community-Wishlist-Main-Wishes.May 12 2017, 8:05 AM

Restricted Application added a project: TCB-Team (now WMDE-TechWish). · View Herald TranscriptMay 12 2017, 8:05 AM

• Lea_WMDE triaged this task as Unbreak Now! priority.May 12 2017, 10:11 AM

Restricted Application added subscribers: Jay8g, TerraCodes. · View Herald TranscriptMay 12 2017, 10:11 AM

Change 353535 had a related patch set uploaded (by Andrew-WMDE; owner: Andrew-WMDE):
[mediawiki/extensions/TwoColConflict@master] After selecting a version and clicking OK the columns realign

https://gerrit.wikimedia.org/r/353535

gerritbot added a project: Patch-For-Review.May 12 2017, 1:12 PM

Andrew-WMDE mentioned this in rESCC35161f8d4576: After selecting a version and clicking OK the columns realign.May 12 2017, 1:15 PM

Actually, as @Andrew-WMDE found out, the help text is not missing but the wikieditor is for some reason covering it.

I was able to reproduce the issues under the following circumstances:

using WikiEditor
ResourceLoaderDebug needs to be disabled (as in production)
using Chrome

Andrew-WMDE mentioned this in rESCC2c9b877e06f8: After selecting a version and clicking OK the columns realign.May 12 2017, 1:22 PM

Andrew-WMDE mentioned this in rESCC23a01376130e: Fix issues with column alignment.May 12 2017, 3:28 PM

Andrew-WMDE mentioned this in rESCC173aa9daf3e7: Fix issues with column alignment.May 12 2017, 3:43 PM

The patch fixes 3 bugs which are responsible for the misalignment issues:

this.redraw() prevented the alignment script from being called after the user closed the version dialogue
On Chrome the WikiEditor was loaded before TwoColConflict meaning $( '#wpTextbox1' ).on( 'wikiEditor-toolbar-doneInitialSections', func ... was never called and therefore neither was adjustEditorColSpacing(), see https://www.mediawiki.org/wiki/Extension:WikiEditor/Toolbar_customization#Determining_when_toolbar_load_is_done
The ".mw-twocolconflict-base-selection-desc" was loaded after adjustEditorColSpacing() was called

Andrew-WMDE claimed this task.May 12 2017, 4:47 PM

Andrew-WMDE moved this task from Proposed to Currently in sprint on the WMDE-TechWish board.

Change 353535 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Fix issues with column alignment

https://gerrit.wikimedia.org/r/353535

ReleaseTaggerBot added a project: MW-1.30-release-notes (WMF-deploy-2017-05-23_(1.30.0-wmf.2)).May 16 2017, 10:00 AM

Change 354009 had a related patch set uploaded (by Addshore; owner: Andrew-WMDE):
[mediawiki/extensions/TwoColConflict@wmf/1.30.0-wmf.1] Fix issues with column alignment

https://gerrit.wikimedia.org/r/354009

Addshore mentioned this in rESCC849bec0dfddd: Fix issues with column alignment.May 16 2017, 3:32 PM

Change 354009 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@wmf/1.30.0-wmf.1] Fix issues with column alignment

https://gerrit.wikimedia.org/r/354009

Mentioned in SAL (#wikimedia-operations) [2017-05-17T13:47:01Z] <addshore@tin> Synchronized php-1.30.0-wmf.1/extensions/TwoColConflict/modules/: SWAT [[gerrit:354009|Fix issues with column alignment]] T165129 (duration: 00m 39s)