Skip to content
This repository was archived by the owner on Jun 7, 2023. It is now read-only.

Redirect legacy Dev Wiki /code.ext imports to .ext #16235

Open
speeditor wants to merge 9 commits into
base: dev
Choose a base branch
from
Open

Redirect legacy Dev Wiki /code.ext imports to .ext #16235

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
db0ee2f
route Dev Wiki index.php & /code.js => .js
speeditor Oct 18, 2018
d65825b
spaces -> tabs
speeditor Oct 18, 2018
0d99148
Removed outdated skin code; wikibits.js unit test initial implementation
KockaAdmiralac Oct 18, 2018
e442386
Fix checking for Dev Wiki URLs; remove unused variables; redirect sty…
KockaAdmiralac Oct 18, 2018
4f2bafc
Added tests for stylesheet importing methods as well
KockaAdmiralac Oct 19, 2018
257bffd
Address CR: use wgWikiaBaseDomainRegex
KockaAdmiralac Oct 24, 2018
5a67186
use regexp test for code.ext matching
speeditor Oct 27, 2018
8d69414
Make sure on Dev Wiki URLs are affected when importing from Dev Wiki
KockaAdmiralac Oct 28, 2018
3ec2242
Merge branch 'devwiki-codejs-redirect' of https://github.com/WikiaUse…
KockaAdmiralac Oct 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion skins/common/wikibits.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,22 @@ function maybeMakeProtocolRelative(url) {
return url;
}

function maybeRedirectDevWikiCodeSubpage(url) {
if (
url.indexOf(mw.config.get('wgScript')) != -1 &&
(mw.config.get('wgCityId') == '7931' || url.indexOf('//dev.wikia.com') == 0) &&
url.indexOf('/code.js') != -1
) {
return url.replace(/\/code\.js/, '.js')
}
return url;
}

window.importScript = function( page ) {
var uri = mw.config.get( 'wgScript' ) + '?title=' +
mw.util.wikiUrlencode( page ) +
'&action=raw&ctype=text/javascript';
uri = maybeRedirectDevWikiCodeSubpage(uri);
return importScriptURI( uri );
};

Expand Down Expand Up @@ -726,11 +738,12 @@ if (skin != 'monaco' && skin != 'oasis') {
// RT#9031

window.importScriptPage = function( page, server ) {
var url = '/index.php?title=' + encodeURIComponent(page.replace(/ /g,'_')).replace('%2F','/').replace('%3A',':') + '&action=raw&ctype=text/javascript';
var url = mw.config.get('wgScript') + '?title=' + encodeURIComponent(page.replace(/ /g,'_')).replace('%2F','/').replace('%3A',':') + '&action=raw&ctype=text/javascript';
if( typeof server == "string" ) {
if( server.indexOf( '://' ) == -1 && server.substring( 0, 2 ) !== '//' ) url = 'http://' + server + '.' + mw.config.get('wgWikiaBaseDomain') + url;
else url = server + url;
}
url = maybeRedirectDevWikiCodeSubpage(url);
return importScriptURI(url);
}

Expand Down