dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "resourceloader: Simplify StringSet fallback"
[lhc/web/wiklou.git]
/
includes
/
gallery
/
PackedImageGallery.php
diff --git
a/includes/gallery/PackedImageGallery.php
b/includes/gallery/PackedImageGallery.php
index
207efa8
..
7aa8c78
100644
(file)
--- a/
includes/gallery/PackedImageGallery.php
+++ b/
includes/gallery/PackedImageGallery.php
@@
-21,14
+21,14
@@
*/
class PackedImageGallery extends TraditionalImageGallery {
*/
class PackedImageGallery extends TraditionalImageGallery {
- function __construct( $mode = 'traditional' ) {
- parent::__construct( $mode );
+ function __construct( $mode = 'traditional'
, IContextSource $context = null
) {
+ parent::__construct( $mode
, $context
);
// Does not support per row option.
$this->mPerRow = 0;
}
/**
// Does not support per row option.
$this->mPerRow = 0;
}
/**
- * We artificially have 1.5 the resolution nec
c
essary so that
+ * We artificially have 1.5 the resolution necessary so that
* we can scale it up by that much on the client side, without
* worrying about requesting a new image.
*/
* we can scale it up by that much on the client side, without
* worrying about requesting a new image.
*/
@@
-60,10
+60,10
@@
class PackedImageGallery extends TraditionalImageGallery {
}
// self::SCALE_FACTOR so the js has some room to manipulate sizes.
}
// self::SCALE_FACTOR so the js has some room to manipulate sizes.
- return
array(
+ return
[
'width' => $width * self::SCALE_FACTOR,
'height' => $this->mHeights * self::SCALE_FACTOR,
'width' => $width * self::SCALE_FACTOR,
'height' => $this->mHeights * self::SCALE_FACTOR,
-
)
;
+
]
;
}
protected function getThumbDivWidth( $thumbWidth ) {
}
protected function getThumbDivWidth( $thumbWidth ) {
@@
-95,9
+95,10
@@
class PackedImageGallery extends TraditionalImageGallery {
/**
* Add javascript which auto-justifies the rows by manipulating the image sizes.
* Also ensures that the hover version of this degrades gracefully.
/**
* Add javascript which auto-justifies the rows by manipulating the image sizes.
* Also ensures that the hover version of this degrades gracefully.
+ * @return array
*/
protected function getModules() {
*/
protected function getModules() {
- return
array( 'mediawiki.page.gallery' )
;
+ return
[ 'mediawiki.page.gallery' ]
;
}
/**
}
/**
@@
-106,6
+107,5
@@
class PackedImageGallery extends TraditionalImageGallery {
* @param int $num
*/
public function setPerRow( $num ) {
* @param int $num
*/
public function setPerRow( $num ) {
- return;
}
}
}
}