https://www.mediawiki.org/wiki/Special:Code/MediaWiki/103485

Revision: 103485
Author:   tparscal
Date:     2011-11-17 18:23:53 +0000 (Thu, 17 Nov 2011)
Log Message:
-----------
Added some new documentation for the new merging rules

Modified Paths:
--------------
    trunk/extensions/VisualEditor/modules/es/models/es.DocumentModel.js

Modified: trunk/extensions/VisualEditor/modules/es/models/es.DocumentModel.js
===================================================================
--- trunk/extensions/VisualEditor/modules/es/models/es.DocumentModel.js 
2011-11-17 18:16:02 UTC (rev 103484)
+++ trunk/extensions/VisualEditor/modules/es/models/es.DocumentModel.js 
2011-11-17 18:23:53 UTC (rev 103485)
@@ -815,7 +815,12 @@
  * 
  * To resolve these issues in a predictable way the following rules must be 
obeyed:
  *     1. Structural elements are retained unless the range being removed 
covers the entire element
- *     2. Elements can only be merged if they are of the same time and share a 
common parent
+ *     2. Elements can only be merged if they are
+ *        2a. of the same type
+ *        2b. of the same depth 
+ *        2c. share at least one ancestor fo the same type
+ *     3. Merge takes place at the highest ancestor that both nodes share when 
each ancestral step
+ *        has the same type and depth 
  * 
  * @method
  * @param {es.Range} range


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to