Skip to content
This repository has been archived by the owner on Jun 26, 2020. It is now read-only.

Commit

Permalink
Merge branch 'master' into i/6091
Browse files Browse the repository at this point in the history
# Conflicts:
#	tests/input.js
  • Loading branch information
jodator committed Feb 26, 2020
2 parents 8b6b4be + b24e05e commit 12aab77
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion docs/_snippets/features/text-transformation-extended.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ ClassicEditor
from: /(\. )([a-z])$/,
to: matches => [ null, matches[ 1 ].toUpperCase() ]
}
],
]
}
}
} )
Expand Down
2 changes: 1 addition & 1 deletion tests/bogusbr-integration.js
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ describe( 'Typing – bogus BR integration', () => {
generateMutationMock( 'childList', paragraph, text, [ br ] ),
generateMutationMock( 'characterData', text ),
generateMutationMock( 'characterData', text ),
generateMutationMock( 'characterData', text ),
generateMutationMock( 'characterData', text )
] );
} );
} );
Expand Down
2 changes: 1 addition & 1 deletion tests/input.js
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ describe( 'Input feature', () => {
type: 'children',
oldChildren: Array.from( viewRoot.getChild( 0 ).getChild( 0 ).getChildren() ),
newChildren: [
new ViewElement( viewDocument, 'strong', null, new ViewText( viewDocument, 'Fx' ) ),
new ViewElement( viewDocument, 'strong', null, new ViewText( viewDocument, 'Fx' ) )
],
node: viewRoot.getChild( 0 ).getChild( 0 )
}
Expand Down

0 comments on commit 12aab77

Please sign in to comment.