r103485 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r103484‎ | r103485 | r103486 >
Date:18:23, 17 November 2011
Author:tparscal
Status:ok
Tags:
Comment:
Added some new documentation for the new merging rules
Modified paths:
  • /trunk/extensions/VisualEditor/modules/es/models/es.DocumentModel.js (modified) (history)

Diff [purge]

Index: trunk/extensions/VisualEditor/modules/es/models/es.DocumentModel.js
@@ -815,7 +815,12 @@
816816 *
817817 * To resolve these issues in a predictable way the following rules must be obeyed:
818818 * 1. Structural elements are retained unless the range being removed covers the entire element
819 - * 2. Elements can only be merged if they are of the same time and share a common parent
 819+ * 2. Elements can only be merged if they are
 820+ * 2a. of the same type
 821+ * 2b. of the same depth
 822+ * 2c. share at least one ancestor fo the same type
 823+ * 3. Merge takes place at the highest ancestor that both nodes share when each ancestral step
 824+ * has the same type and depth
820825 *
821826 * @method
822827 * @param {es.Range} range

Status & tagging log