dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "mediawiki.Title: Add 'params' parameter to #getUrl"
[lhc/web/wiklou.git]
/
resources
/
mediawiki
/
mediawiki.Title.js
diff --git
a/resources/mediawiki/mediawiki.Title.js
b/resources/mediawiki/mediawiki.Title.js
index
dde5abf
..
e1031c6
100644
(file)
--- a/
resources/mediawiki/mediawiki.Title.js
+++ b/
resources/mediawiki/mediawiki.Title.js
@@
-314,10
+314,10
@@
thumbPhpRegex = /thumb\.php/,
regexes = [
// Thumbnails
thumbPhpRegex = /thumb\.php/,
regexes = [
// Thumbnails
- /\/[a-f0-9]\/[a-f0-9]{2}\/([^\s\/]+)\/[^\s\/]+-
\1
[^\s\/]*$/,
+ /\/[a-f0-9]\/[a-f0-9]{2}\/([^\s\/]+)\/[^\s\/]+-
(?:\1|thumbnail)
[^\s\/]*$/,
// Thumbnails in non-hashed upload directories
// Thumbnails in non-hashed upload directories
- /\/([^\s\/]+)\/[^\s\/]+-
\1
[^\s\/]*$/,
+ /\/([^\s\/]+)\/[^\s\/]+-
(?:\1|thumbnail)
[^\s\/]*$/,
// Full size images
/\/[a-f0-9]\/[a-f0-9]{2}\/([^\s\/]+)$/,
// Full size images
/\/[a-f0-9]\/[a-f0-9]{2}\/([^\s\/]+)$/,
@@
-550,10
+550,12
@@
* Get the URL to this title
*
* @see mw.util#getUrl
* Get the URL to this title
*
* @see mw.util#getUrl
+ * @param {Object} [params] A mapping of query parameter names to values,
+ * e.g. `{ action: 'edit' }`.
* @return {string}
*/
* @return {string}
*/
- getUrl: function () {
- return mw.util.getUrl( this.toString() );
+ getUrl: function (
params
) {
+ return mw.util.getUrl( this.toString()
, params
);
},
/**
},
/**