From: Ed Sanders Date: Tue, 12 Jul 2016 13:48:58 +0000 (+0100) Subject: Rename 'slider' gallery mode to 'slideshow' X-Git-Tag: 1.31.0-rc.0~6395 X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=af7ffaeeecd1908351863c0e928b8c5dcfb033fc;p=lhc%2Fweb%2Fwiklou.git Rename 'slider' gallery mode to 'slideshow' Bug: T140093 Change-Id: I6f01344b9ac61e3d2a8e7a9d920ba37786537ff8 --- diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28 index 697665552c..6ee962f9ff 100644 --- a/RELEASE-NOTES-1.28 +++ b/RELEASE-NOTES-1.28 @@ -19,7 +19,7 @@ production. === New features in 1.28 === * User::isBot() method for checking if an account is a bot role account. -* Added a new 'slider' mode for galleries. +* Added a new 'slideshow' mode for galleries. * Added a new hook, 'UserIsBot', to aid in determining if a user is a bot. * Added a new hook, 'ApiMakeParserOptions', to allow extensions to better interact with API parsing. diff --git a/autoload.php b/autoload.php index 8768e9a227..d82d6993c6 100644 --- a/autoload.php +++ b/autoload.php @@ -1260,7 +1260,7 @@ $wgAutoloadLocalClasses = [ 'SkinFallback' => __DIR__ . '/includes/skins/SkinFallback.php', 'SkinFallbackTemplate' => __DIR__ . '/includes/skins/SkinFallbackTemplate.php', 'SkinTemplate' => __DIR__ . '/includes/skins/SkinTemplate.php', - 'SliderImageGallery' => __DIR__ . '/includes/gallery/SliderImageGallery.php', + 'SlideshowImageGallery' => __DIR__ . '/includes/gallery/SlideshowImageGallery.php', 'SpecialActiveUsers' => __DIR__ . '/includes/specials/SpecialActiveusers.php', 'SpecialAllMessages' => __DIR__ . '/includes/specials/SpecialAllMessages.php', 'SpecialAllMyUploads' => __DIR__ . '/includes/specials/SpecialMyRedirectPages.php', diff --git a/includes/gallery/ImageGalleryBase.php b/includes/gallery/ImageGalleryBase.php index 73f4b19d52..6884f65626 100644 --- a/includes/gallery/ImageGalleryBase.php +++ b/includes/gallery/ImageGalleryBase.php @@ -113,7 +113,7 @@ abstract class ImageGalleryBase extends ContextSource { 'packed' => 'PackedImageGallery', 'packed-hover' => 'PackedHoverImageGallery', 'packed-overlay' => 'PackedOverlayImageGallery', - 'slider' => 'SliderImageGallery', + 'slideshow' => 'SlideshowImageGallery', ]; // Allow extensions to make a new gallery format. Hooks::run( 'GalleryGetModes', [ &self::$modeMapping ] ); diff --git a/includes/gallery/SliderImageGallery.php b/includes/gallery/SliderImageGallery.php deleted file mode 100644 index 67be9cea10..0000000000 --- a/includes/gallery/SliderImageGallery.php +++ /dev/null @@ -1,37 +0,0 @@ -mPerRow = 0; - } - - /** - * Add javascript adds interface elements - * @return array - */ - protected function getModules() { - return [ 'mediawiki.page.gallery.slider' ]; - } -} diff --git a/includes/gallery/SlideshowImageGallery.php b/includes/gallery/SlideshowImageGallery.php new file mode 100644 index 0000000000..3f0c9329d0 --- /dev/null +++ b/includes/gallery/SlideshowImageGallery.php @@ -0,0 +1,37 @@ +mPerRow = 0; + } + + /** + * Add javascript adds interface elements + * @return array + */ + protected function getModules() { + return [ 'mediawiki.page.gallery.slideshow' ]; + } +} diff --git a/maintenance/jsduck/categories.json b/maintenance/jsduck/categories.json index 631d2a7b6d..068ee8c960 100644 --- a/maintenance/jsduck/categories.json +++ b/maintenance/jsduck/categories.json @@ -65,7 +65,7 @@ "mw.Upload*", "mw.ForeignUpload", "mw.ForeignStructuredUpload*", - "mw.GallerySlider" + "mw.GallerySlideshow" ] }, { diff --git a/resources/Resources.php b/resources/Resources.php index 46a9ec64dd..e35c3d76fa 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1655,8 +1655,8 @@ return [ 'position' => 'top', 'targets' => [ 'desktop', 'mobile' ], ], - 'mediawiki.page.gallery.slider' => [ - 'scripts' => 'resources/src/mediawiki/page/gallery-slider.js', + 'mediawiki.page.gallery.slideshow' => [ + 'scripts' => 'resources/src/mediawiki/page/gallery-slideshow.js', 'position' => 'top', 'dependencies' => [ 'mediawiki.api', diff --git a/resources/src/mediawiki/page/gallery-slider.js b/resources/src/mediawiki/page/gallery-slider.js deleted file mode 100644 index 82b22e89ad..0000000000 --- a/resources/src/mediawiki/page/gallery-slider.js +++ /dev/null @@ -1,453 +0,0 @@ -/*! - * mw.GallerySlider: Interface controls for the slider gallery - */ -( function ( mw, $, OO ) { - /** - * mw.GallerySlider encapsulates the user interface of the slider - * galleries. An object is instantiated for each `.mw-gallery-slider` - * element. - * - * @class mw.GallerySlider - * @uses mw.Title - * @uses mw.Api - * @param {jQuery} gallery The `