Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/233213
Change subject: Give links a getDisplayTitle method for use by transfer handler
......................................................................
Give links a getDisplayTitle method for use by transfer handler
For regular links this will always just be the href, but for
advanced link types it can be overridden.
Bug: T109980
Change-Id: Ica48fea69cc345e86eb62516213ffcda8eb7b63b
---
M src/dm/annotations/ve.dm.LinkAnnotation.js
M src/ui/datatransferhandlers/ve.ui.UrlStringTransferHandler.js
2 files changed, 16 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/13/233213/1
diff --git a/src/dm/annotations/ve.dm.LinkAnnotation.js
b/src/dm/annotations/ve.dm.LinkAnnotation.js
index 9399231..5efd969 100644
--- a/src/dm/annotations/ve.dm.LinkAnnotation.js
+++ b/src/dm/annotations/ve.dm.LinkAnnotation.js
@@ -74,6 +74,17 @@
};
/**
+ * Get the display title for this link
+ *
+ * Can be overriden by special link types.
+ *
+ * @return {string} Display title
+ */
+ve.dm.LinkAnnotation.prototype.getDisplayTitle = function () {
+ return this.getHref();
+};
+
+/**
* @inheritdoc
*/
ve.dm.LinkAnnotation.prototype.getComparableObject = function () {
diff --git a/src/ui/datatransferhandlers/ve.ui.UrlStringTransferHandler.js
b/src/ui/datatransferhandlers/ve.ui.UrlStringTransferHandler.js
index 3e36303..e3a360c 100644
--- a/src/ui/datatransferhandlers/ve.ui.UrlStringTransferHandler.js
+++ b/src/ui/datatransferhandlers/ve.ui.UrlStringTransferHandler.js
@@ -97,7 +97,7 @@
// spec for how it should be done.
links = data.replace( /^#.*(\r\n?|\n|$)/mg, '' ).trim()
.split( /[\r\n]+/g ).map( function ( line ) {
- return { href: line, title: line };
+ return { href: line };
} );
// When Google Chrome uses this mime type the link
titles can
// be extracted from the 'text/html' version of the
item.
@@ -122,7 +122,7 @@
default:
// A single URL
- links = [ { href: data.trim(), title: data } ];
+ links = [ { href: data.trim() } ];
break;
}
@@ -135,7 +135,9 @@
annotationSet = new ve.dm.AnnotationSet( store,
store.indexes( [
annotation
] ) ),
- content = link.title.split( '' );
+ title = link.title || annotation.getDisplayTitle(),
+ content = title.split( '' );
+
ve.dm.Document.static.addAnnotationsToData( content,
annotationSet );
for ( i = 0; i < content.length; i++ ) {
result.push( content[ i ] );
--
To view, visit https://gerrit.wikimedia.org/r/233213
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica48fea69cc345e86eb62516213ffcda8eb7b63b
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
