http://www.mediawiki.org/wiki/Special:Code/MediaWiki/95140
Revision: 95140
Author: mkroetzsch
Date: 2011-08-21 14:11:06 +0000 (Sun, 21 Aug 2011)
Log Message:
-----------
use resoure loader modules everywhere for loading styles/code
Modified Paths:
--------------
trunk/extensions/SemanticMediaWiki/includes/SMW_Factbox.php
trunk/extensions/SemanticMediaWiki/includes/SMW_GlobalFunctions.php
trunk/extensions/SemanticMediaWiki/includes/SMW_Infolink.php
trunk/extensions/SemanticMediaWiki/includes/SMW_Outputs.php
trunk/extensions/SemanticMediaWiki/includes/datavalues/SMW_DV_Number.php
trunk/extensions/SemanticMediaWiki/includes/datavalues/SMW_DV_Property.php
trunk/extensions/SemanticMediaWiki/includes/datavalues/SMW_DV_String.php
trunk/extensions/SemanticMediaWiki/includes/parserhooks/SMW_Concept.php
Modified: trunk/extensions/SemanticMediaWiki/includes/SMW_Factbox.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/SMW_Factbox.php 2011-08-21
14:03:42 UTC (rev 95139)
+++ trunk/extensions/SemanticMediaWiki/includes/SMW_Factbox.php 2011-08-21
14:11:06 UTC (rev 95140)
@@ -44,7 +44,7 @@
if ( wfRunHooks( 'smwShowFactbox', array( &$text, $semdata ) )
) {
smwfLoadExtensionMessages( 'SemanticMediaWiki' );
$subjectDv = SMWDataValueFactory::newDataItemValue(
$semdata->getSubject(), null );
- SMWOutputs::requireHeadItem( SMW_HEADER_STYLE );
+ SMWOutputs::requireResource( 'ext.smw.style' );
$rdflink = SMWInfolink::newInternalLink(
wfMsgForContent( 'smw_viewasrdf' ),
$wgContLang->getNsText( NS_SPECIAL ) .
':ExportRDF/' .
Modified: trunk/extensions/SemanticMediaWiki/includes/SMW_GlobalFunctions.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/SMW_GlobalFunctions.php
2011-08-21 14:03:42 UTC (rev 95139)
+++ trunk/extensions/SemanticMediaWiki/includes/SMW_GlobalFunctions.php
2011-08-21 14:11:06 UTC (rev 95140)
@@ -231,12 +231,12 @@
*/
function smwfEncodeMessages( array $messages, $icon = 'warning', $seperator =
' <!--br-->', $escape = true ) {
if ( count( $messages ) > 0 ) {
- SMWOutputs::requireHeadItem( SMW_HEADER_TOOLTIP );
-
+ SMWOutputs::requireResource( 'ext.smw.tooltips' );
+
if ( $escape ) {
$messages = array_map( 'htmlspecialchars', $messages );
}
-
+
if ( count( $messages ) == 1 ) {
$errorList = $messages[0];
}
@@ -247,11 +247,11 @@
$errorList = '<ul>' . implode( $seperator, $messages )
. '</ul>';
}
-
+
return '<span class="smwttpersist">' .
- '<span class="smwtticon">' .
htmlspecialchars( $icon ) . '.png</span>' .
- '<span class="smwttcontent">' .
$errorList . '</span>' .
- '</span>';
+ '<span class="smwtticon">' . htmlspecialchars(
$icon ) . '.png</span>' .
+ '<span class="smwttcontent">' . $errorList .
'</span>' .
+ '</span>';
} else {
return '';
}
Modified: trunk/extensions/SemanticMediaWiki/includes/SMW_Infolink.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/SMW_Infolink.php
2011-08-21 14:03:42 UTC (rev 95139)
+++ trunk/extensions/SemanticMediaWiki/includes/SMW_Infolink.php
2011-08-21 14:11:06 UTC (rev 95140)
@@ -211,7 +211,7 @@
*/
public function getText( $outputformat, $linker = null ) {
if ( $this->mStyle !== false ) {
- SMWOutputs::requireHeadItem( SMW_HEADER_STYLE ); //
make SMW styles available
+ SMWOutputs::requireResource( 'ext.smw.style' );
$start = "<span class=\"$this->mStyle\">";
$end = '</span>';
} else {
Modified: trunk/extensions/SemanticMediaWiki/includes/SMW_Outputs.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/SMW_Outputs.php 2011-08-21
14:03:42 UTC (rev 95139)
+++ trunk/extensions/SemanticMediaWiki/includes/SMW_Outputs.php 2011-08-21
14:11:06 UTC (rev 95140)
@@ -86,6 +86,9 @@
*/
static public function requireFromParserOutput( ParserOutput
$parserOutput ) {
self::$mHeadItems = array_merge( (array)self::$mHeadItems,
(array)$parserOutput->mHeadItems );
+ if ( isset( $parserOutput->mModules ) ) {
+ self::$mHeadItems = array_merge(
(array)self::$resourceModules, (array)$parserOutput->mModules );
+ }
}
/**
Modified:
trunk/extensions/SemanticMediaWiki/includes/datavalues/SMW_DV_Number.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/datavalues/SMW_DV_Number.php
2011-08-21 14:03:42 UTC (rev 95139)
+++ trunk/extensions/SemanticMediaWiki/includes/datavalues/SMW_DV_Number.php
2011-08-21 14:11:06 UTC (rev 95140)
@@ -165,7 +165,7 @@
}
}
if ( $tooltip != '' ) {
- SMWOutputs::requireHeadItem( SMW_HEADER_TOOLTIP
);
+ SMWOutputs::requireResource( 'ext.smw.tooltips'
);
return '<span class="smwttinline">' .
$this->m_caption . '<span class="smwttcontent">' . $tooltip . '</span></span>';
} else {
return $this->m_caption;
Modified:
trunk/extensions/SemanticMediaWiki/includes/datavalues/SMW_DV_Property.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/datavalues/SMW_DV_Property.php
2011-08-21 14:03:42 UTC (rev 95139)
+++ trunk/extensions/SemanticMediaWiki/includes/datavalues/SMW_DV_Property.php
2011-08-21 14:11:06 UTC (rev 95140)
@@ -269,7 +269,7 @@
if ( $this->isUserDefined() ) {
return $text;
} else {
- SMWOutputs::requireHeadItem( SMW_HEADER_TOOLTIP );
+ SMWOutputs::requireResource( 'ext.smw.tooltips' );
smwfLoadExtensionMessages( 'SemanticMediaWiki' );
return '<span class="smwttinline"><span
class="smwbuiltin">' . $text .
'</span><span class="smwttcontent">' . wfMsgForContent(
'smw_isspecprop' ) . '</span></span>';
Modified:
trunk/extensions/SemanticMediaWiki/includes/datavalues/SMW_DV_String.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/datavalues/SMW_DV_String.php
2011-08-21 14:03:42 UTC (rev 95139)
+++ trunk/extensions/SemanticMediaWiki/includes/datavalues/SMW_DV_String.php
2011-08-21 14:11:06 UTC (rev 95140)
@@ -115,7 +115,7 @@
if ( ( $linked === null ) || ( $linked === false ) ) {
return mb_substr( $value, 0, 42 ) . ' <span
class="smwwarning">…</span> ' . mb_substr( $value, $len - 42 );
} else {
- SMWOutputs::requireHeadItem( SMW_HEADER_TOOLTIP
);
+ SMWOutputs::requireResource( 'ext.smw.tooltips'
);
return mb_substr( $value, 0, 42 ) . ' <span
class="smwttpersist"> … <span class="smwttcontent">' . $value . '</span></span>
' . mb_substr( $value, $len - 42 );
}
} elseif ( $this->m_typeid == '_cod' ) {
@@ -129,7 +129,7 @@
* Special features for Type:Code formatting.
*/
protected function getCodeDisplay( $value, $scroll = false ) {
- SMWOutputs::requireHeadItem( SMW_HEADER_STYLE );
+ SMWOutputs::requireResource( 'ext.smw.style' );
$result = str_replace( array( '<', '>', ' ', '=', "'", ':',
"\n" ), array( '<', '>', ' ', '=', ''', ':', "<br
/>" ), $value );
if ( $scroll ) {
$result = "<div style=\"height:5em;
overflow:auto;\">$result</div>";
Modified:
trunk/extensions/SemanticMediaWiki/includes/parserhooks/SMW_Concept.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/parserhooks/SMW_Concept.php
2011-08-21 14:03:42 UTC (rev 95139)
+++ trunk/extensions/SemanticMediaWiki/includes/parserhooks/SMW_Concept.php
2011-08-21 14:11:06 UTC (rev 95140)
@@ -64,7 +64,7 @@
// display concept box:
$rdflink = SMWInfolink::newInternalLink( wfMsgForContent(
'smw_viewasrdf' ), $wgContLang->getNsText( NS_SPECIAL ) . ':ExportRDF/' .
$title->getPrefixedText(), 'rdflink' );
- SMWOutputs::requireHeadItem( SMW_HEADER_STYLE );
+ SMWOutputs::requireResource( 'ext.smw.style' );
// TODO: escape output, preferably via Html or Xml class.
$result = '<div class="smwfact"><span class="smwfactboxhead">'
. wfMsgForContent( 'smw_concept_description', $title->getText() ) .
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
