浏览代码

Code style: Removed blockers of "no-invalid-this" rule.

Kamil Piechaczek 8 年之前
父节点
当前提交
ef3bc8353b

+ 4 - 4
packages/ckeditor5-engine/src/model/delta/attributedelta.js

@@ -131,9 +131,9 @@ export class RootAttributeDelta extends Delta {
  * @param {*} value Attribute new value.
  */
 register( 'setAttribute', function( itemOrRange, key, value ) {
-	attribute( this, key, value, itemOrRange ); // eslint-disable-line no-invalid-this
+	attribute( this, key, value, itemOrRange );
 
-	return this; // eslint-disable-line no-invalid-this
+	return this;
 } );
 
 /**
@@ -147,9 +147,9 @@ register( 'setAttribute', function( itemOrRange, key, value ) {
  * @param {String} key Attribute key.
  */
 register( 'removeAttribute', function( itemOrRange, key ) {
-	attribute( this, key, null, itemOrRange ); // eslint-disable-line no-invalid-this
+	attribute( this, key, null, itemOrRange );
 
-	return this; // eslint-disable-line no-invalid-this
+	return this;
 } );
 
 function attribute( batch, key, value, itemOrRange ) {

+ 6 - 6
packages/ckeditor5-engine/src/model/delta/insertdelta.js

@@ -100,15 +100,15 @@ register( 'insert', function( position, nodes ) {
 
 	// If nothing is inserted do not create delta and operation.
 	if ( normalizedNodes.length === 0 ) {
-		return this; // eslint-disable-line no-invalid-this
+		return this;
 	}
 
 	const delta = new InsertDelta();
-	const insert = new InsertOperation( position, normalizedNodes, this.document.version ); // eslint-disable-line no-invalid-this
+	const insert = new InsertOperation( position, normalizedNodes, this.document.version );
 
-	this.addDelta( delta ); // eslint-disable-line no-invalid-this
+	this.addDelta( delta );
 	delta.addOperation( insert );
-	this.document.applyOperation( insert ); // eslint-disable-line no-invalid-this
+	this.document.applyOperation( insert );
 
 	// When element is a DocumentFragment we need to move its markers to Document#markers.
 	if ( nodes instanceof DocumentFragment ) {
@@ -120,11 +120,11 @@ register( 'insert', function( position, nodes ) {
 				markerRange.end._getCombined( rangeRootPosition, position )
 			);
 
-			this.setMarker( markerName, range ); // eslint-disable-line no-invalid-this
+			this.setMarker( markerName, range );
 		}
 	}
 
-	return this; // eslint-disable-line no-invalid-this
+	return this;
 } );
 
 DeltaFactory.register( InsertDelta );

+ 8 - 8
packages/ckeditor5-engine/src/model/delta/markerdelta.js

@@ -65,7 +65,7 @@ export default class MarkerDelta extends Delta {
  */
 register( 'setMarker', function( markerOrName, newRange ) {
 	const name = typeof markerOrName == 'string' ? markerOrName : markerOrName.name;
-	const currentMarker = this.document.markers.get( name ); // eslint-disable-line no-invalid-this
+	const currentMarker = this.document.markers.get( name );
 
 	if ( !newRange && !currentMarker ) {
 		/**
@@ -81,13 +81,13 @@ register( 'setMarker', function( markerOrName, newRange ) {
 	if ( !newRange ) {
 		// If `newRange` is not given, treat this as synchronizing existing marker.
 		// Create `MarkerOperation` with `oldRange` set to `null`, so reverse operation will remove the marker.
-		addOperation( this, name, null, currentRange ); // eslint-disable-line no-invalid-this
+		addOperation( this, name, null, currentRange );
 	} else {
 		// Just change marker range.
-		addOperation( this, name, currentRange, newRange ); // eslint-disable-line no-invalid-this
+		addOperation( this, name, currentRange, newRange );
 	}
 
-	return this; // eslint-disable-line no-invalid-this
+	return this;
 } );
 
 /**
@@ -100,7 +100,7 @@ register( 'setMarker', function( markerOrName, newRange ) {
 register( 'removeMarker', function( markerOrName ) {
 	const name = typeof markerOrName == 'string' ? markerOrName : markerOrName.name;
 
-	if ( !this.document.markers.has( name ) ) { // eslint-disable-line no-invalid-this
+	if ( !this.document.markers.has( name ) ) {
 		/**
 		 * Trying to remove marker that does not exist.
 		 *
@@ -109,11 +109,11 @@ register( 'removeMarker', function( markerOrName ) {
 		throw new CKEditorError( 'batch-removeMarker-no-marker: Trying to remove marker that does not exist.' );
 	}
 
-	const oldRange = this.document.markers.get( name ).getRange(); // eslint-disable-line no-invalid-this
+	const oldRange = this.document.markers.get( name ).getRange();
 
-	addOperation( this, name, oldRange, null ); // eslint-disable-line no-invalid-this
+	addOperation( this, name, oldRange, null );
 
-	return this; // eslint-disable-line no-invalid-this
+	return this;
 } );
 
 function addOperation( batch, name, oldRange, newRange ) {

+ 6 - 6
packages/ckeditor5-engine/src/model/delta/mergedelta.js

@@ -94,7 +94,7 @@ export default class MergeDelta extends Delta {
  */
 register( 'merge', function( position ) {
 	const delta = new MergeDelta();
-	this.addDelta( delta ); // eslint-disable-line no-invalid-this
+	this.addDelta( delta );
 
 	const nodeBefore = position.nodeBefore;
 	const nodeAfter = position.nodeAfter;
@@ -124,18 +124,18 @@ register( 'merge', function( position ) {
 		positionAfter,
 		nodeAfter.maxOffset,
 		positionBefore,
-		this.document.version // eslint-disable-line no-invalid-this
+		this.document.version
 	);
 
 	move.isSticky = true;
 	delta.addOperation( move );
-	this.document.applyOperation( move ); // eslint-disable-line no-invalid-this
+	this.document.applyOperation( move );
 
-	const remove = new RemoveOperation( position, 1, this.document.version ); // eslint-disable-line no-invalid-this
+	const remove = new RemoveOperation( position, 1, this.document.version );
 	delta.addOperation( remove );
-	this.document.applyOperation( remove ); // eslint-disable-line no-invalid-this
+	this.document.applyOperation( remove );
 
-	return this; // eslint-disable-line no-invalid-this
+	return this;
 } );
 
 DeltaFactory.register( MergeDelta );

+ 3 - 4
packages/ckeditor5-engine/src/model/delta/movedelta.js

@@ -108,7 +108,7 @@ function addMoveOperation( batch, delta, sourcePosition, howMany, targetPosition
  */
 register( 'move', function( itemOrRange, targetPosition ) {
 	const delta = new MoveDelta();
-	this.addDelta( delta ); // eslint-disable-line no-invalid-this
+	this.addDelta( delta );
 
 	if ( itemOrRange instanceof Range ) {
 		if ( !itemOrRange.isFlat ) {
@@ -120,13 +120,12 @@ register( 'move', function( itemOrRange, targetPosition ) {
 			throw new CKEditorError( 'batch-move-range-not-flat: Range to move is not flat.' );
 		}
 
-		// eslint-disable-next-line no-invalid-this
 		addMoveOperation( this, delta, itemOrRange.start, itemOrRange.end.offset - itemOrRange.start.offset, targetPosition );
 	} else {
-		addMoveOperation( this, delta, Position.createBefore( itemOrRange ), 1, targetPosition ); // eslint-disable-line no-invalid-this
+		addMoveOperation( this, delta, Position.createBefore( itemOrRange ), 1, targetPosition );
 	}
 
-	return this; // eslint-disable-line no-invalid-this
+	return this;
 } );
 
 DeltaFactory.register( MoveDelta );

+ 4 - 4
packages/ckeditor5-engine/src/model/delta/removedelta.js

@@ -43,20 +43,20 @@ function addRemoveOperation( batch, delta, position, howMany ) {
  */
 register( 'remove', function( itemOrRange ) {
 	const delta = new RemoveDelta();
-	this.addDelta( delta ); // eslint-disable-line no-invalid-this
+	this.addDelta( delta );
 
 	if ( itemOrRange instanceof Range ) {
 		// The array is reversed, so the ranges are correct and do not have to be updated.
 		const ranges = itemOrRange.getMinimalFlatRanges().reverse();
 
 		for ( const flat of ranges ) {
-			addRemoveOperation( this, delta, flat.start, flat.end.offset - flat.start.offset ); // eslint-disable-line no-invalid-this
+			addRemoveOperation( this, delta, flat.start, flat.end.offset - flat.start.offset );
 		}
 	} else {
-		addRemoveOperation( this, delta, Position.createBefore( itemOrRange ), 1 ); // eslint-disable-line no-invalid-this
+		addRemoveOperation( this, delta, Position.createBefore( itemOrRange ), 1 );
 	}
 
-	return this; // eslint-disable-line no-invalid-this
+	return this;
 } );
 
 DeltaFactory.register( RemoveDelta );

+ 3 - 4
packages/ckeditor5-engine/src/model/delta/renamedelta.js

@@ -66,13 +66,12 @@ register( 'rename', function( element, newName ) {
 	}
 
 	const delta = new RenameDelta();
-	this.addDelta( delta ); // eslint-disable-line no-invalid-this
+	this.addDelta( delta );
 
-	// eslint-disable-next-line no-invalid-this
 	const renameOperation = new RenameOperation( Position.createBefore( element ), element.name, newName, this.document.version );
-	apply( this, delta, renameOperation ); // eslint-disable-line no-invalid-this
+	apply( this, delta, renameOperation );
 
-	return this; // eslint-disable-line no-invalid-this
+	return this;
 } );
 
 DeltaFactory.register( RenameDelta );

+ 6 - 6
packages/ckeditor5-engine/src/model/delta/splitdelta.js

@@ -116,7 +116,7 @@ export default class SplitDelta extends Delta {
  */
 register( 'split', function( position ) {
 	const delta = new SplitDelta();
-	this.addDelta( delta ); // eslint-disable-line no-invalid-this
+	this.addDelta( delta );
 
 	const splitElement = position.parent;
 
@@ -134,24 +134,24 @@ register( 'split', function( position ) {
 	const insert = new InsertOperation(
 		Position.createAfter( splitElement ),
 		copy,
-		this.document.version // eslint-disable-line no-invalid-this
+		this.document.version
 	);
 
 	delta.addOperation( insert );
-	this.document.applyOperation( insert ); // eslint-disable-line no-invalid-this
+	this.document.applyOperation( insert );
 
 	const move = new MoveOperation(
 		position,
 		splitElement.maxOffset - position.offset,
 		Position.createFromParentAndOffset( copy, 0 ),
-		this.document.version // eslint-disable-line no-invalid-this
+		this.document.version
 	);
 	move.isSticky = true;
 
 	delta.addOperation( move );
-	this.document.applyOperation( move ); // eslint-disable-line no-invalid-this
+	this.document.applyOperation( move );
 
-	return this; // eslint-disable-line no-invalid-this
+	return this;
 } );
 
 DeltaFactory.register( SplitDelta );

+ 6 - 6
packages/ckeditor5-engine/src/model/delta/unwrapdelta.js

@@ -89,7 +89,7 @@ register( 'unwrap', function( element ) {
 	}
 
 	const delta = new UnwrapDelta();
-	this.addDelta( delta ); // eslint-disable-line no-invalid-this
+	this.addDelta( delta );
 
 	const sourcePosition = Position.createFromParentAndOffset( element, 0 );
 
@@ -97,20 +97,20 @@ register( 'unwrap', function( element ) {
 		sourcePosition,
 		element.maxOffset,
 		Position.createBefore( element ),
-		this.document.version // eslint-disable-line no-invalid-this
+		this.document.version
 	);
 
 	move.isSticky = true;
 	delta.addOperation( move );
-	this.document.applyOperation( move ); // eslint-disable-line no-invalid-this
+	this.document.applyOperation( move );
 
 	// Computing new position because we moved some nodes before `element`.
 	// If we would cache `Position.createBefore( element )` we remove wrong node.
-	const remove = new RemoveOperation( Position.createBefore( element ), 1, this.document.version ); // eslint-disable-line no-invalid-this
+	const remove = new RemoveOperation( Position.createBefore( element ), 1, this.document.version );
 	delta.addOperation( remove );
-	this.document.applyOperation( remove ); // eslint-disable-line no-invalid-this
+	this.document.applyOperation( remove );
 
-	return this; // eslint-disable-line no-invalid-this
+	return this;
 } );
 
 DeltaFactory.register( UnwrapDelta );

+ 5 - 5
packages/ckeditor5-engine/src/model/delta/weakinsertdelta.js

@@ -49,19 +49,19 @@ export default class WeakInsertDelta extends InsertDelta {
  */
 register( 'weakInsert', function( position, nodes ) {
 	const delta = new WeakInsertDelta();
-	this.addDelta( delta ); // eslint-disable-line no-invalid-this
+	this.addDelta( delta );
 
 	nodes = normalizeNodes( nodes );
 
 	for ( const node of nodes ) {
-		node.setAttributesTo( this.document.selection.getAttributes() ); // eslint-disable-line no-invalid-this
+		node.setAttributesTo( this.document.selection.getAttributes() );
 	}
 
-	const operation = new InsertOperation( position, nodes, this.document.version ); // eslint-disable-line no-invalid-this
+	const operation = new InsertOperation( position, nodes, this.document.version );
 	delta.addOperation( operation );
-	this.document.applyOperation( operation ); // eslint-disable-line no-invalid-this
+	this.document.applyOperation( operation );
 
-	return this; // eslint-disable-line no-invalid-this
+	return this;
 } );
 
 DeltaFactory.register( WeakInsertDelta );

+ 6 - 6
packages/ckeditor5-engine/src/model/delta/wrapdelta.js

@@ -137,23 +137,23 @@ register( 'wrap', function( range, elementOrString ) {
 	}
 
 	const delta = new WrapDelta();
-	this.addDelta( delta ); // eslint-disable-line no-invalid-this
+	this.addDelta( delta );
 
-	const insert = new InsertOperation( range.end, element, this.document.version ); // eslint-disable-line no-invalid-this
+	const insert = new InsertOperation( range.end, element, this.document.version );
 	delta.addOperation( insert );
-	this.document.applyOperation( insert ); // eslint-disable-line no-invalid-this
+	this.document.applyOperation( insert );
 
 	const targetPosition = Position.createFromParentAndOffset( element, 0 );
 	const move = new MoveOperation(
 		range.start,
 		range.end.offset - range.start.offset,
 		targetPosition,
-		this.document.version // eslint-disable-line no-invalid-this
+		this.document.version
 	);
 	delta.addOperation( move );
-	this.document.applyOperation( move ); // eslint-disable-line no-invalid-this
+	this.document.applyOperation( move );
 
-	return this; // eslint-disable-line no-invalid-this
+	return this;
 } );
 
 DeltaFactory.register( WrapDelta );

+ 5 - 5
packages/ckeditor5-engine/src/model/liveposition.js

@@ -138,12 +138,12 @@ function bindWithDocument() {
 	// Operation types handled by LivePosition (these are operations that change model tree structure).
 	const supportedTypes = new Set( [ 'insert', 'move', 'remove', 'reinsert' ] );
 
-	this.listenTo( // eslint-disable-line no-invalid-this
-		this.root.document, // eslint-disable-line no-invalid-this
+	this.listenTo(
+		this.root.document,
 		'change',
 		( event, type, changes ) => {
 			if ( supportedTypes.has( type ) ) {
-				transform.call( this, type, changes.range, changes.sourcePosition ); // eslint-disable-line no-invalid-this
+				transform.call( this, type, changes.range, changes.sourcePosition );
 			}
 		},
 		{ priority: 'high' }
@@ -161,7 +161,7 @@ function bindWithDocument() {
  * @param {module:engine/model/position~Position} [position] Additional position parameter provided by some change events.
  */
 function transform( type, range, position ) {
-	/* eslint-disable no-invalid-this, no-case-declarations */
+	/* eslint-disable no-case-declarations */
 	const howMany = range.end.offset - range.start.offset;
 	let transformed;
 
@@ -198,7 +198,7 @@ function transform( type, range, position ) {
 
 		this.fire( 'change', oldPosition );
 	}
-	/* eslint-enable no-invalid-this, no-case-declarations */
+	/* eslint-enable no-case-declarations */
 }
 
 mix( LivePosition, EmitterMixin );

+ 3 - 8
packages/ckeditor5-engine/src/model/liverange.js

@@ -94,16 +94,15 @@ export default class LiveRange extends Range {
  * @method module:engine/model/liverange~LiveRange#bindWithDocument
  */
 function bindWithDocument() {
-	/* jshint validthis: true */
 	// Operation types that a range can be transformed by.
 	const supportedTypes = new Set( [ 'insert', 'move', 'remove', 'reinsert' ] );
 
-	this.listenTo( // eslint-disable-line no-invalid-this
-		this.root.document, // eslint-disable-line no-invalid-this
+	this.listenTo(
+		this.root.document,
 		'change',
 		( event, type, changes, batch, deltaType ) => {
 			if ( supportedTypes.has( type ) ) {
-				transform.call( this, type, deltaType, changes.range, changes.sourcePosition ); // eslint-disable-line no-invalid-this
+				transform.call( this, type, deltaType, changes.range, changes.sourcePosition );
 			}
 		},
 		{ priority: 'high' }
@@ -122,7 +121,6 @@ function bindWithDocument() {
  * @param {module:engine/model/position~Position} [sourcePosition] Source position for move, remove and reinsert change types.
  */
 function transform( changeType, deltaType, targetRange, sourcePosition ) {
-	/* jshint validthis: true */
 	const howMany = targetRange.end.offset - targetRange.start.offset;
 	let targetPosition = targetRange.start;
 
@@ -133,7 +131,6 @@ function transform( changeType, deltaType, targetRange, sourcePosition ) {
 		targetPosition = targetPosition._getTransformedByInsertion( sourcePosition, howMany );
 	}
 
-	// eslint-disable-next-line no-invalid-this
 	const result = this._getTransformedByDocumentChange( changeType, deltaType, targetPosition, howMany, sourcePosition );
 
 	// Decide whether moved part should be included in the range.
@@ -148,7 +145,6 @@ function transform( changeType, deltaType, targetRange, sourcePosition ) {
 
 	const updated = Range.createFromRanges( result );
 
-	/* eslint-disable no-invalid-this */
 	// If anything changed, update the range and fire an event.
 	if ( !updated.isEqual( this ) ) {
 		const oldRange = Range.createFromRange( this );
@@ -158,7 +154,6 @@ function transform( changeType, deltaType, targetRange, sourcePosition ) {
 
 		this.fire( 'change', oldRange );
 	}
-	/* eslint-enable no-invalid-this */
 }
 
 mix( LiveRange, EmitterMixin );

+ 3 - 3
packages/ckeditor5-engine/src/model/writer.js

@@ -125,13 +125,13 @@ export function move( sourceRange, targetPosition ) {
 			'Trying to move a range that starts and ends in different element.' );
 	}
 
-	const nodes = this.remove( sourceRange ); // eslint-disable-line no-invalid-this
+	const nodes = this.remove( sourceRange );
 
 	// We have to fix `targetPosition` because model changed after nodes from `sourceRange` got removed and
 	// that change might have an impact on `targetPosition`.
 	targetPosition = targetPosition._getTransformedByDeletion( sourceRange.start, sourceRange.end.offset - sourceRange.start.offset );
 
-	return this.insert( targetPosition, nodes ); // eslint-disable-line no-invalid-this
+	return this.insert( targetPosition, nodes );
 }
 
 /**
@@ -174,7 +174,7 @@ export function setAttribute( range, key, value ) {
  * @param {String} key Key of attribute to remove.
  */
 export function removeAttribute( range, key ) {
-	this.setAttribute( range, key, null ); // eslint-disable-line no-invalid-this
+	this.setAttribute( range, key, null );
 }
 
 /**

+ 2 - 2
packages/ckeditor5-engine/src/view/attributeelement.js

@@ -101,11 +101,11 @@ AttributeElement.DEFAULT_PRIORITY = DEFAULT_PRIORITY;
 // @returns {Number|null} Block filler offset or `null` if block filler is not needed.
 function getFillerOffset() {
 	// <b>foo</b> does not need filler.
-	if ( this.childCount ) { // eslint-disable-line no-invalid-this
+	if ( this.childCount ) {
 		return null;
 	}
 
-	let element = this.parent; // eslint-disable-line no-invalid-this
+	let element = this.parent;
 
 	// <p><b></b></p> needs filler -> <p><b><br></b></p>
 	while ( element && element.is( 'attributeElement' ) ) {

+ 1 - 1
packages/ckeditor5-engine/src/view/containerelement.js

@@ -78,5 +78,5 @@ export default class ContainerElement extends Element {
 //
 // @returns {Number|null} Block filler offset or `null` if block filler is not needed.
 function getFillerOffset() {
-	return this.childCount === 0 ? 0 : null; // eslint-disable-line no-invalid-this
+	return this.childCount === 0 ? 0 : null;
 }