(bug 25717) Fix "Hide/show extended details" toggle in image metadata table

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 69f17d8..e1ffd87 100644 (file)
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -143,13 +143,9 @@ class ImagePage extends Article {
                        $wgOut->addHTML( $html );
 
                if ( $showmeta ) {
-                       $expand = htmlspecialchars( Xml::escapeJsString( wfMsg( 'metadata-expand' ) ) );
-                       $collapse = htmlspecialchars( Xml::escapeJsString( wfMsg( 'metadata-collapse' ) ) );
                        $wgOut->addHTML( Xml::element( 'h2', array( 'id' => 'metadata' ), wfMsg( 'metadata' ) ) . "\n" );
                        $wgOut->addWikiText( $this->makeMetadataTable( $formattedMetadata ) );
                        $wgOut->addModules( array( 'mediawiki.legacy.metadata' ) );
-                       $wgOut->addHTML(
-                               "<script type=\"text/javascript\">attachMetadataToggle('mw_metadata', '$expand', '$collapse');</script>\n" );
                }
                
                $css = $this->repo->getDescriptionStylesheetUrl();

diff --git a/resources/Resources.php b/resources/Resources.php
index 98430bc..8438ecc 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -444,6 +444,7 @@ return array(
        'mediawiki.legacy.metadata' => new ResourceLoaderFileModule( array(
                'scripts' => 'skins/common/metadata.js',
                'dependencies' => 'mediawiki.legacy.wikibits',
+               'messages' => array( 'metadata-expand', 'metadata-collapse' ),
        ) ),
        'mediawiki.legacy.mwsuggest' => new ResourceLoaderFileModule( array(
                'scripts' => 'skins/common/mwsuggest.js',

diff --git a/skins/common/metadata.js b/skins/common/metadata.js
index ed40cdb..78bf41d 100644 (file)
--- a/skins/common/metadata.js
+++ b/skins/common/metadata.js
@@ -47,3 +47,7 @@ window.attachMetadataToggle = function( tableId, showText, hideText ) {
        }
        return false;
 }
+
+$( document ).ready( function() { 
+       attachMetadataToggle( 'mw_metadata', mediaWiki.msg( 'metadata-expand' ), mediaWiki.msg( 'metadata-collapse' ) );
+} );