Divec has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371717 )
Change subject: MWLinkAction: Don't annotate close tags
......................................................................
MWLinkAction: Don't annotate close tags
Change-Id: I273838eba4cb259cf053ce88378da10b0e241155
---
M modules/ve-mw/tests/ui/actions/ve.ui.MWLinkAction.test.js
M modules/ve-mw/ui/actions/ve.ui.MWLinkAction.js
M modules/ve-mw/ui/inspectors/ve.ui.MWLinkAnnotationInspector.js
3 files changed, 3 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/17/371717/1
diff --git a/modules/ve-mw/tests/ui/actions/ve.ui.MWLinkAction.test.js
b/modules/ve-mw/tests/ui/actions/ve.ui.MWLinkAction.test.js
index 2843e8a..e074601 100644
--- a/modules/ve-mw/tests/ui/actions/ve.ui.MWLinkAction.test.js
+++ b/modules/ve-mw/tests/ui/actions/ve.ui.MWLinkAction.test.js
@@ -41,8 +41,7 @@
},
annotations: data[ 1 ][ 1 ]
}, {
- type: '/link/mwMagic',
- annotations: data[ 1 ][ 1 ]
+ type: '/link/mwMagic'
} );
},
undo: true
@@ -72,8 +71,7 @@
},
annotations: data[ 1 ][ 1 ]
}, {
- type: '/link/mwMagic',
- annotations: data[ 1 ][ 1 ]
+ type: '/link/mwMagic'
} );
},
undo: true
@@ -103,8 +101,7 @@
},
annotations: data[ 1 ][ 1 ]
}, {
- type: '/link/mwMagic',
- annotations: data[ 1 ][ 1 ]
+ type: '/link/mwMagic'
} );
},
undo: true
diff --git a/modules/ve-mw/ui/actions/ve.ui.MWLinkAction.js
b/modules/ve-mw/ui/actions/ve.ui.MWLinkAction.js
index 42afe67..f71bc45 100644
--- a/modules/ve-mw/ui/actions/ve.ui.MWLinkAction.js
+++ b/modules/ve-mw/ui/actions/ve.ui.MWLinkAction.js
@@ -132,7 +132,6 @@
// Before we get here #autolink has guaranteed that the
annotations
// do not contain any link annotations.
data.setAnnotationsAtOffset( 0, annotations );
- data.setAnnotationsAtOffset( 1, annotations );
return ve.dm.TransactionBuilder.static.newFromReplacement(
doc, range, data.getData()
);
diff --git a/modules/ve-mw/ui/inspectors/ve.ui.MWLinkAnnotationInspector.js
b/modules/ve-mw/ui/inspectors/ve.ui.MWLinkAnnotationInspector.js
index ba3c32b..1870e96 100644
--- a/modules/ve-mw/ui/inspectors/ve.ui.MWLinkAnnotationInspector.js
+++ b/modules/ve-mw/ui/inspectors/ve.ui.MWLinkAnnotationInspector.js
@@ -261,7 +261,6 @@
}
] );
data.setAnnotationsAtOffset( 0, annotations );
- data.setAnnotationsAtOffset( 1, annotations );
fragment.insertContent( data.getData(), true );
}
--
To view, visit https://gerrit.wikimedia.org/r/371717
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I273838eba4cb259cf053ce88378da10b0e241155
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Divec <da...@troi.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
