diff --git a/modules/ve2/dm/ve.dm.Transaction.js b/modules/ve2/dm/ve.dm.Transaction.js index a813efc272..5d1c6a4e00 100644 --- a/modules/ve2/dm/ve.dm.Transaction.js +++ b/modules/ve2/dm/ve.dm.Transaction.js @@ -46,13 +46,13 @@ ve.dm.Transaction.newFromInsertion = function( doc, offset, insertion ) { * 1. Remove content only * - Occurs when the range starts and ends on elements of different type, depth or ancestry * 2. Remove entire elements and their content - * - Occurs when the range spans accross an entire element + * - Occurs when the range spans across an entire element * 3. Merge two elements by removing the end of one and the beginning of another * - Occurs when the range starts and ends on elements of similar type, depth and ancestry * * This function uses the following logic to decide what to actually remove: * 1. Elements are only removed if range being removed covers the entire element - * 2. Elements can only be merged if {ve.dm.Node.canBeMergedWith} returns true + * 2. Elements can only be merged if ve.dm.Node.canBeMergedWith() returns true * 3. Merges take place at the highest common ancestor * * @method @@ -76,14 +76,14 @@ ve.dm.Transaction.newFromRemoval = function( doc, range ) { nodeRange; if ( selection.length === 0 ) { // Empty selection? Something is wrong! - throw 'Invalid range, can not remove from ' + range.start + ' to ' + range.end; + throw 'Invalid range, cannot remove from ' + range.start + ' to ' + range.end; } // Decide whether to merge or strip if ( selection[0].node.canBeMergedWith( selection[selection.length - 1].node ) ) { // If only one node was selected, ignore anything past this node if ( selection.length === 1 ) { // Include the parent's wrapping (if any - there should always be, but let's be safe) - wrapping = selection[0].node.getParent().isWrapped() ? 1 : 0; + var wrapping = selection[0].node.getParent().isWrapped() ? 1 : 0; // Only reduces the range to cover the selected node if it's shorter range.start = Math.max( range.start, selection[0].nodeRange.start - wrapping ); // Only reduces the range to cover the selected node if it's shorter