Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-07-07 09:41:33 +02:00
Code Issues Packages Projects Releases Activity

Merge branch 'feature-multimedia' into develop

Browse Source 
* feature-multimedia:
  reset on construct
  thumbnail selection fixes
  remove debugger line
This commit is contained in:
Gert
2015-04-01 23:33:24 +02:00
parent 7139425812 1bda3eb1e3
commit 6142a12f48
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
system/src/Grav/Common/Markdown/ParsedownGravTrait.php
View File

@@ -171,7 +171,6 @@ trait ParsedownGravTrait
if (isset($url['fragment'])) {
$medium->urlHash($url['fragment']);
}
self::$grav['debugger']->addMessage($url);
$excerpt['element'] = $medium->parseDownElement($title, $alt, $class);

3
system/src/Grav/Common/Page/Medium/Medium.php
View File

@@ -58,6 +58,7 @@ class Medium extends Data implements RenderableInterface
parent::__construct($items, $blueprint);
$this->def('mime', 'application/octet-stream');
$this->reset();
}
/**
@@ -265,7 +266,7 @@ class Medium extends Data implements RenderableInterface
*/
public function thumbnail($type = 'auto')
{
if (!in_array($type, $this->thumbnailTypes))
if ($type !== 'auto' && !in_array($type, $this->thumbnailTypes))
return $this;
if ($this->thumbnailType !== $type) {

15
system/src/Grav/Common/Page/Medium/ThumbnailImageMedium.php
View File

@@ -64,6 +64,19 @@ class ThumbnailImageMedium extends ImageMedium
return $this->bubble('display', [$mode], false);
}
/**
* Switch thumbnail.
*
* @param string $type
*
* @return $this
*/
public function thumbnail($type = 'auto')
{
$this->bubble('thumbnail', [$type], false);
return $this->bubble('getThumbnail', [], false);
}
/**
* Turn the current Medium into a Link
*
@@ -100,7 +113,7 @@ class ThumbnailImageMedium extends ImageMedium
protected function bubble($method, array $arguments = [], $testLinked = true)
{
if (!$testLinked || $this->linked) {
return call_user_func_array(array($this->parent, $method), $arguments);
return $this->parent ? call_user_func_array(array($this->parent, $method), $arguments) : $this;
} else {
return call_user_func_array(array($this, 'parent::' . $method), $arguments);
}