Diffusion extension-TwoColConflict 170f5a491920

Re-enable diff and preview buttons
170f5a491920
Actions

Authored by WMDE-Fisch on Oct 11 2018, 10:13 AM.

Description

Re-enable diff and preview buttons

This re-enables the diff and preview buttons for the conflict
new resolution interface. Since the resulting text is build in
onImportFormData these thing now work right way.

Adding the conflict view underneath diff and preview like described
in the ticket is done in a follow up.

Also adds basic browser tests to check that buttons are working.

Bug: T195724
Change-Id: Id79178be44b62a487366374688afc14af0139680

Details

Committed

WMDE-Fisch

Oct 16 2018, 11:43 AM

Parents

rESCC9f6de951eb23: Invert toggleHelpDialog( hide ) to …( show )

Branches

Unknown

Tags

Unknown

References

refs/changes/53/466853/2

ChangeId

Id79178be44b62a487366374688afc14af0139680

Event Timeline

WMDE-Fisch committed rESCC170f5a491920: Re-enable diff and preview buttons (authored by WMDE-Fisch).Oct 16 2018, 11:43 AM

Changes (6)

				Path
	M			extension.json
	M			includes/TwoColConflictHooks.php
	A			tests/selenium/pageobjects/diff.page.js
	M			tests/selenium/pageobjects/editconflict.page.js
	A			tests/selenium/pageobjects/preview.page.js
	A			tests/selenium/specs/previewdiff.js