Changeset 4520

Timestamp:

01/27/12 10:37:47 (4 months ago)

Author:

tboutell

Message:

Slideshows are allowed to have the crossfade transition now even if they have no height specified, because John has special case CSS or JS to make that work in some project somewhere. It is up to the developer to understand that they can't specify crossfade (which is not the default transition) unless they have a height on their slideshow. OK so far, but if the developer expressly specifies a maxHeight, that should also be accepted. This change fixes the bug spotted on MO this morning.

Files:

• plugins/apostrophePlugin/branches/1.5/lib/action/BaseaSlideshowSlotComponents.class.php (modified) (1 diff)

plugins/apostrophePlugin/branches/1.5/lib/action/BaseaSlideshowSlotComponents.class.php

@@ -81 +81 @@
     $this->options['uncropped'] = $this->getOption('uncropped', false);
 
+    // Crossfade doesn't work well without a height unless you do special gymnastics. The simple
+    // workaround is to specify maxHeight as a fallback
+    if (($this->options['transition'] === 'crossfade') && ($this->options['height'] === false) && ($this->options['maxHeight'] !== false))
+    {
+      $this->options['height'] = $this->options['maxHeight'];
+    }
+
     // We automatically set up the aspect ratio if the resizeType is set to 'c'
     $constraints = $this->getOption('constraints', array());