HomePhabricator

[WIP] Add conflict screen to preview and diff

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

Description

[WIP] Add conflict screen to preview and diff

This patch adds the TwoColConflict merge view to the EditPage preview
and diff screens when they are access from the conflict.

Looking at the EditPage workflow changing the internal conflict state
at the point where the form is build seems to be fairly easy way to
trigger the drawing of the conflict solving screen with all implications.

The input for the injected conflict will be filled with results from the
posted and composed form data that also builds preview and diff. The step
can then be repeated showing the preview or diff of the altered text.

Since neither the preview, diff or conflict mode touch anything that would
save content unquestioned it is assumed that the implementation wont mess
with content there.

Improvements welcome, this is at least a proof of concept.

TODO:

Bug: T195724
Change-Id: If4d484581dc8c6eb752145ddf47d3aaacac0a2e4

Details

Committed
WMDE-FischOct 16 2018, 11:43 AM
Parents
rESCCf863680f4f15: Move test for save to preview and diff tests
Branches
Unknown
Tags
Unknown
References
refs/changes/37/466937/2
ChangeId
If4d484581dc8c6eb752145ddf47d3aaacac0a2e4