Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Show the source on preview for CSS and Javascript pages.

Browse source 
Add pages in MediaWiki namespace into that group (bug 10871).
Only normal <pre> formatting is being used since ShowRawCssJs 
hook directly sends things out to the output.
This commit is contained in:
Platonides 2010-12-07 14:53:36 +00:00
parent 20984575bb
commit 3c44865cca
4 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RELEASE-NOTES
View file

@ -467,6 +467,8 @@ LocalSettings.php. The specific bugs are listed below in the general notes.
* rebuildFileCache.php no longer creates inappropriate cache files for redirects
* (bug 23119) WikiError class and subclasses are now marked as deprecated
* (bug 18372) $wgFileExtensions will now override $wgFileBlacklist
* (bug 10871) Javascript and CSS pages in MediaWiki namespace are no longer treated
as wikitext on preview.
=== API changes in 1.17 ===
* (bug 22738) Allow filtering by action type on query=logevent.

23
includes/EditPage.php
View file

@ -1878,17 +1878,28 @@ HTML
}
# don't parse user css/js, show message about preview
# XXX: stupid php bug won't let us use $wgTitle->isCssJsSubpage() here
# XXX: stupid php bug won't let us use $wgTitle->isCssJsSubpage() here -- This note has been there since r3530. Sure the bug was fixed time ago?
if ( $this->isCssJsSubpage ) {
if (preg_match( "/\\.css$/", $this->mTitle->getText() ) ) {
$previewtext = "<div id='mw-usercsspreview'>\n" . wfMsg( 'usercsspreview' ) . "\n</div>";
} else if (preg_match( "/\\.js$/", $this->mTitle->getText() ) ) {
$previewtext = "<div id='mw-userjspreview'>\n" . wfMsg( 'userjspreview' ) . "\n</div>";
if ( $this->isCssJsSubpage || $this->mTitle->isCssOrJsPage() ) {
$level = 'user';
if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
$level = 'global';
}
if (preg_match( "/\\.css$/", $this->mTitle->getText() ) ) {
$previewtext = "<div id='mw-{$level}csspreview'>\n" . wfMsg( "{$level}csspreview" ) . "\n</div>";
$class = "mw-code mw-js";
} elseif (preg_match( "/\\.js$/", $this->mTitle->getText() ) ) {
$previewtext = "<div id='mw-{$level}jspreview'>\n" . wfMsg( "{$level}jspreview" ) . "\n</div>";
$class = "mw-code mw-js";
} else {
throw new MWException( 'A CSS/JS (sub)page but which is not css nor js!' );
}
$parserOptions->setTidy( true );
$parserOutput = $wgParser->parse( $previewtext, $this->mTitle, $parserOptions );
$previewHTML = $parserOutput->mText;
$previewHTML .= "<pre class=\"$class\" dir=\"ltr\">\n" . htmlspecialchars( $this->textbox1 ) . "\n</pre>\n";
} else {
$rt = Title::newFromRedirectArray( $this->textbox1 );
if ( $rt ) {

4
languages/messages/MessagesEn.php
View file

@ -1300,6 +1300,10 @@ The latest block log entry is provided below for reference:',
'''It has not yet been saved!'''",
'userjspreview' => "'''Remember that you are only testing/previewing your user JavaScript.'''
'''It has not yet been saved!'''",
'globalcsspreview' => "'''Remember that you are only previewing this global CSS.'''
'''It has not yet been saved!'''",
'globaljspreview' => "'''Remember that you are only previewing this global JavaScript code.'''
'''It has not yet been saved!'''",
'userinvalidcssjstitle' => "'''Warning:''' There is no skin \"\$1\".
Custom .css and .js pages use a lowercase title, e.g. {{ns:user}}:Foo/vector.css as opposed to {{ns:user}}:Foo/Vector.css.",
'updated' => '(Updated)',

4
languages/messages/MessagesQqq.php
View file

@ -838,6 +838,10 @@ See also {{msg-mw|Noarticletext-nopermission}}.',
'clearyourcache' => 'Text at the top of .js/.css pages',
'usercssyoucanpreview' => "Text displayed on every css page. The 'Show preview' part should be the same as {{msg-mw|showpreview}} (or you can use <nowiki>{{int:showpreview}}</nowiki>).",
'userjsyoucanpreview' => 'Text displayed on every js page.',
'usercsspreview' => 'Text displayed on preview of every user .css subpage',
'userjspreview' => 'Text displayed on preview of every user .js subpage',
'globalcsspreview' => 'Text displayed on preview of .css pages in MediaWiki namespace',
'globaljspreview' => 'Text displayed on preview of .js pages in MediaWiki namespace',
'updated' => '{{Identical|Updated}}',
'previewnote' => 'Note displayed when clicking on Show preview',
'editing' => "Shown as page title when editing a page. \$1 is the name of the page that is being edited. Example: \"''Editing Main Page''\".",