Gerrit Patch Uploader has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/336443 )
Change subject: Fix ignored options when using "new mw.Uri()" with first
argument empty
......................................................................
Fix ignored options when using "new mw.Uri()" with first argument empty
Phabricator: T157035
Change-Id: Iae5edf996e4cd6d1dfbbffd6a915ee55d28409d3
---
M resources/src/mediawiki/mediawiki.Uri.js
1 file changed, 7 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/43/336443/1
diff --git a/resources/src/mediawiki/mediawiki.Uri.js
b/resources/src/mediawiki/mediawiki.Uri.js
index 0c47dbe..15d0172 100644
--- a/resources/src/mediawiki/mediawiki.Uri.js
+++ b/resources/src/mediawiki/mediawiki.Uri.js
@@ -179,7 +179,8 @@
* override each other (`true`) or automagically convert them
to an array (`false`).
*/
function Uri( uri, options ) {
- var prop,
+ var prop, hrefCur,
+ hasOptions = ( options !== undefined )
defaultUri = getDefaultUri();
options = typeof options === 'object' ? options : {
strictMode: !!options };
@@ -208,8 +209,12 @@
this.query = {};
}
}
+ } else if ( hasOptions ) {
+ // We didn't get a URI in the constructor, but
we got options.
+ hrefCur = typeof documentLocation === 'string'
? documentLocation : documentLocation();
+ this.parse( hrefCur, options );
} else {
- // If we didn't get a URI in the constructor,
use the default one.
+ // We didn't get a URI or options in the
constructor, use the default instance.
return defaultUri.clone();
}
--
To view, visit https://gerrit.wikimedia.org/r/336443
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae5edf996e4cd6d1dfbbffd6a915ee55d28409d3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader <gerritpatchuploa...@gmail.com>
Gerrit-Reviewer: Gerrit Patch Uploader <gerritpatchuploa...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
