wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-25 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Regression fix, clearing only link annotations when creating link.

Browse source 
Clearing only existing selected links when:
1) Creating a link
2) Pressing clear button

Change-Id: I4b1bcd9a3ac177b2f9b4af2d562d4c4fec09d5c5
This commit is contained in:
Rob Moen 2012-09-21 16:45:57 -07:00
parent 7b15b24496
commit d5d44df053
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
modules/ve/ui/inspectors/ve.ui.LinkInspector.js
View file

@ -41,13 +41,12 @@ ve.ui.LinkInspector = function VeUiLinkInspector( toolbar, context ) {
if ( $( this ).hasClass( 've-ui-inspector-button-disabled' ) ) {
return;
}
var i, arr,
var i,
surfaceModel = inspector.context.getSurfaceView().getModel(),
annotations = inspector.getAllLinkAnnotationsFromSelection();
// Clear all link annotations.
arr = annotations.get();
for ( i = 0; i < arr.length; i++ ) {
surfaceModel.annotate( 'clear', arr[i] );
for ( i = 0; i < annotations.length; i++ ) {
surfaceModel.annotate( 'clear', annotations[i] );
}
inspector.$locationInput.val( '' );
inspector.context.closeInspector();
@ -90,7 +89,8 @@ ve.ui.LinkInspector.prototype.getAllLinkAnnotationsFromSelection = function () {
documentModel = surfaceModel.getDocument();
return documentModel
.getAnnotationsFromRange( surfaceModel.getSelection() )
.getAnnotationsOfType( /^link\// );
.getAnnotationsOfType( /^link\// )
.get();
};
ve.ui.LinkInspector.prototype.getFirstLinkAnnotation = function ( annotations ) {
@ -181,17 +181,16 @@ ve.ui.LinkInspector.prototype.onOpen = function () {
ve.ui.LinkInspector.prototype.onClose = function ( accept ) {
var surfaceView = this.context.getSurfaceView(),
surfaceModel = surfaceView.getModel(),
annotations = this.getAllLinkAnnotationsFromSelection(),
linkAnnotations = this.getAllLinkAnnotationsFromSelection(),
target = this.$locationInput.val(),
i, arr;
i;
if ( accept ) {
if ( !target ) {
return;
}
// Clear link annotation if it exists
arr = annotations.get();
for ( i = 0; i < arr.length; i++ ) {
surfaceModel.annotate( 'clear', arr[i] );
for ( i = 0; i < linkAnnotations.length; i++ ) {
surfaceModel.annotate( 'clear', linkAnnotations[i] );
}
surfaceModel.annotate( 'set', ve.ui.LinkInspector.getAnnotationForTarget( target ) );