VitaliyFilippov has uploaded a new change for review. https://gerrit.wikimedia.org/r/245851
Change subject: Use ResourceLoader ...................................................................... Use ResourceLoader Change-Id: I09f750fff50a6596ede905eca87a00c740691cf8 --- M SlimboxThumbs.php M slimbox/slimboxthumbs.js 2 files changed, 18 insertions(+), 22 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SlimboxThumbs refs/changes/51/245851/1 diff --git a/SlimboxThumbs.php b/SlimboxThumbs.php index 0276e20..67eb5af 100644 --- a/SlimboxThumbs.php +++ b/SlimboxThumbs.php @@ -42,6 +42,19 @@ 'version' => SlimboxThumbs_VERSION, ); +$wgResourceModules['ext.SlimboxThumbs'] = array( + 'localBasePath' => __DIR__, + 'remoteExtPath' => 'SlimboxThumbs', + 'dependencies' => [], + 'styles' => [ + 'slimbox/css/slimbox2.css', + ], + 'scripts' => [ + 'slimbox/js/slimbox2.js', + 'slimbox/slimboxthumbs.js', + ], +); + $dir = dirname( __FILE__ ) . '/'; $wgMessagesDirs['SlimboxThumbs'] = __DIR__ . '/i18n'; $wgExtensionMessagesFiles['SlimboxThumbs'] = $dir . 'SlimboxThumbs.i18n.php'; @@ -104,30 +117,13 @@ // Adds javascript files and stylesheets. function efSBTAddScripts( $out ) { - global $wgVersion, $wgExtensionAssetsPath, $wgUploadPath, $wgServer, $wgScriptPath, $wgArticlePath; - - $mw16 = version_compare( $wgVersion, '1.16', '>=' ); - $useExtensionPath = $mw16 && isset( $wgExtensionAssetsPath ) && $wgExtensionAssetsPath; - $eDir = ( $useExtensionPath ? $wgExtensionAssetsPath : $wgScriptPath . '/extensions' ); - $eDir .= '/SlimboxThumbs/slimbox'; - - if ( $mw16 ) { - $out->includeJQuery(); - } else { - $out->addScript( - '<script type="text/javascript"'. - ' src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>' . "\n" - ); - } + global $wgServer, $wgScriptPath, $wgArticlePath; $re = str_replace( '\\$1', '[^:]+:(.*)', preg_quote( $wgArticlePath ) ); - - $out->addScript( '<script type="text/javascript" src="' . $eDir . '/js/slimbox2.js"></script>' . "\n" ); - $out->addExtensionStyle( $eDir . '/css/slimbox2.css', 'screen' ); - $out->addScript( '<script type="text/javascript" src="' . $eDir . '/slimboxthumbs.js"></script>' . "\n" ); - $out->addInlineScript( "$( window ).on( 'load', function() {". + $out->addModules( 'ext.SlimboxThumbs' ); + $out->addScript( ResourceLoader::makeInlineScript( "mw.loader.using( 'ext.SlimboxThumbs' ).done( function() {". "makeSlimboxThumbs( jQuery, \"".addslashes( $re ). - "\", \"".addslashes( $wgServer.$wgScriptPath )."\" ); } );" ); + "\", \"".addslashes( $wgServer.$wgScriptPath )."\" ); } );" ) ); return true; } diff --git a/slimbox/slimboxthumbs.js b/slimbox/slimboxthumbs.js index 6dc266e..ab469d9 100644 --- a/slimbox/slimboxthumbs.js +++ b/slimbox/slimboxthumbs.js @@ -4,7 +4,7 @@ * Contributor(s): Vitaliy Filippov <vita...@mail.ru> */ -function makeSlimboxThumbs( $, pathRegexp, wgFullScriptPath ) { +window.makeSlimboxThumbs = function( $, pathRegexp, wgFullScriptPath ) { var re = new RegExp( pathRegexp ); var reExcl = /(^|\/)skins\//; var canview = /\.(jpe?g|jpe|gif|png)$/i; -- To view, visit https://gerrit.wikimedia.org/r/245851 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I09f750fff50a6596ede905eca87a00c740691cf8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SlimboxThumbs Gerrit-Branch: master Gerrit-Owner: VitaliyFilippov <vita...@yourcmc.ru> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits