https://www.mediawiki.org/wiki/Special:Code/MediaWiki/102023
Revision: 102023
Author: tparscal
Date: 2011-11-04 18:33:06 +0000 (Fri, 04 Nov 2011)
Log Message:
-----------
Using getElementType instead of relying on .type property of
es.DocumentModeNode objects
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-04 18:31:30 UTC (rev 102022)
+++ trunk/extensions/VisualEditor/modules/es/models/es.DocumentModel.js
2011-11-04 18:33:06 UTC (rev 102023)
@@ -1033,14 +1033,10 @@
// casing merging a listitem into a paragraph.
// wait, some nodes don't have types? Is this the top document
node?
- return (
- (
- ( node1 && node2 ) &&
- ( node1.type !== undefined &&
node2.type !== undefined ) &&
- ( node1.type === node2.type )
- ) &&
- ( node1.getParent() ===
node2.getParent() )
- );
+ return (
+ ( ( node1 && node2 ) && ( node1.getElementType() ===
node2.getElementType() ) ) &&
+ ( node1.getParent() === node2.getParent() )
+ );
}
function mergeDelete( range, tx ) {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
