http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72802
Revision: 72802
Author: jeroendedauw
Date: 2010-09-11 13:04:06 +0000 (Sat, 11 Sep 2010)
Log Message:
-----------
Follow up to r72640
Modified Paths:
--------------
trunk/extensions/SlimboxThumbs/SlimboxThumbs.php
trunk/extensions/SlimboxThumbs/SlimboxThumbs_Settings.php
Modified: trunk/extensions/SlimboxThumbs/SlimboxThumbs.php
===================================================================
--- trunk/extensions/SlimboxThumbs/SlimboxThumbs.php 2010-09-11 12:44:11 UTC
(rev 72801)
+++ trunk/extensions/SlimboxThumbs/SlimboxThumbs.php 2010-09-11 13:04:06 UTC
(rev 72802)
@@ -108,12 +108,13 @@
/* Add javacsripts and stylesheets */
function efSBTAddScripts( $out ) {
global $slimboxThumbsFilesDir, $hasGallery;
- // we don't want to load jQuery if there's no gallery here
- if ( !$hasGallery ) return false;
+
+ // We don't want to load jQuery if there's no gallery here.
+ //if ( !$hasGallery ) return false;
$out->addScript( '<script type="text/javascript"
src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js";></script>'
. "\n" );
$out->addScript( '<script type="text/javascript" src="' .
$slimboxThumbsFilesDir . '/js/slimbox2.js"></script>' . "\n" );
- $out->addStyle( $slimboxThumbsFilesDir . '/css/slimbox2.css', 'screen'
);
+ $out->addExtensionStyle( $slimboxThumbsFilesDir . '/css/slimbox2.css',
'screen' );
// use thumb.php to resize pictures if browser window is smaller than
the picture itself
$out->addInlineScript( '$(document).ready(function(){
Modified: trunk/extensions/SlimboxThumbs/SlimboxThumbs_Settings.php
===================================================================
--- trunk/extensions/SlimboxThumbs/SlimboxThumbs_Settings.php 2010-09-11
12:44:11 UTC (rev 72801)
+++ trunk/extensions/SlimboxThumbs/SlimboxThumbs_Settings.php 2010-09-11
13:04:06 UTC (rev 72802)
@@ -17,4 +17,8 @@
$slimboxDefaultWidth = 680;
# Path of the Slimbox directory (string).
-$slimboxThumbsFilesDir = dirname( __FILE__ ) . '/slimbox';
\ No newline at end of file
+$useExtensionPath = version_compare( $wgVersion, '1.16', '>=' ) && isset(
$wgExtensionAssetsPath ) && $wgExtensionAssetsPath;
+$slimboxThumbsFilesDir = ( $useExtensionPath ? $wgExtensionAssetsPath
: $wgScriptPath . '/extensions' ) . '/SlimboxThumbs';
+unset( $useExtensionPath );
+
+$slimboxThumbsFilesDir .= '/slimbox';
\ No newline at end of file
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
