jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/369729 )
Change subject: Standardize on /^(\.\.?\/)*/ for interpreting Parsoid hrefs
......................................................................
Standardize on /^(\.\.?\/)*/ for interpreting Parsoid hrefs
We used (\.+\/)* instead of (\.\.?\/)* in some places,
but that doesn't make much sense since we won't and shouldn't
ever see stuff like '.../'
Change-Id: I9efcff2d2a34499ca57321dfbae29392ecb422d7
---
M modules/ve-mw/dm/models/ve.dm.MWImageModel.js
M modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
M modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
3 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/modules/ve-mw/dm/models/ve.dm.MWImageModel.js
b/modules/ve-mw/dm/models/ve.dm.MWImageModel.js
index fa5a3ec..e7c0e9f 100644
--- a/modules/ve-mw/dm/models/ve.dm.MWImageModel.js
+++ b/modules/ve-mw/dm/models/ve.dm.MWImageModel.js
@@ -179,7 +179,7 @@
imgModel.cacheOriginalImageAttributes( attrs );
imgModel.setImageSource( attrs.src );
- imgModel.setFilename( new mw.Title( attrs.resource.replace(
/^(\.+\/)*/, '' ) ).getMainText() );
+ imgModel.setFilename( new mw.Title( attrs.resource.replace(
/^(\.\.?\/)*/, '' ) ).getMainText() );
imgModel.setImageHref( attrs.href );
// Set bounding box
@@ -283,7 +283,7 @@
}
if ( attrs.resource ) {
this.setImageResourceName( attrs.resource );
- this.setFilename( new mw.Title( attrs.resource.replace(
/^(\.+\/)*/, '' ) ).getMainText() );
+ this.setFilename( new mw.Title( attrs.resource.replace(
/^(\.\.?\/)*/, '' ) ).getMainText() );
}
if ( attrs.src ) {
@@ -1118,7 +1118,7 @@
* @param {ve.dm.Scalable} scalable Scalable object
*/
ve.dm.MWImageModel.prototype.attachScalable = function ( scalable ) {
- var imageName = this.getResourceName().replace( /^(\.+\/)*/, '' ),
+ var imageName = this.getResourceName().replace( /^(\.\.?\/)*/, '' ),
imageModel = this;
if ( this.scalable instanceof ve.dm.Scalable ) {
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
index f2a5e6f..ecef276 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
@@ -296,7 +296,7 @@
ve.dm.MWImageNode.prototype.getFilename = function () {
// Strip ./ stuff and decode URI encoding
var resource = this.getAttribute( 'resource' ) || '',
- filename = resource.replace( /^(\.+\/)*/, '' );
+ filename = resource.replace( /^(\.\.?\/)*/, '' );
return ve.decodeURIComponentIntoArticleTitle( filename, true );
};
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
index 226d948..0d757c3 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
@@ -394,7 +394,7 @@
part = content.parts[ i ];
if ( part.template ) {
href = part.template.target.href;
- page = href ?
ve.decodeURIComponentIntoArticleTitle( href.replace( /^(\.+\/)*/, '' ) ) : null;
+ page = href ?
ve.decodeURIComponentIntoArticleTitle( href.replace( /^(\.\.?\/)*/, '' ) ) :
null;
this.partsList.push( {
template: part.template.target.wt,
templatePage: page
--
To view, visit https://gerrit.wikimedia.org/r/369729
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9efcff2d2a34499ca57321dfbae29392ecb422d7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
