Changeset 4521

Timestamp:

01/27/12 10:43:24 (4 months ago)

Author:

tboutell

Message:

Cleaner fix. maxHeight shouldn't just smash height, height is sometimes respected in its own right. It should just be a last minute alternative to height for setting the height of the outer div if height is not specified.

Location:

plugins/apostrophePlugin/branches/1.5

Files:

• lib/action/BaseaSlideshowSlotComponents.class.php (modified) (1 diff)
• modules/aSlideshowSlot/templates/_slideshow.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());

plugins/apostrophePlugin/branches/1.5/modules/aSlideshowSlot/templates/_slideshow.php

@@ -12 +12 @@
 
 <?php if (count($items)): ?>
-        <ul id="a-slideshow-<?php echo $id ?>" class="a-slideshow clearfix <?php echo (count($items === 1) ? 'single-image' : 'multi-image') ?> transition-<?php echo $options['transition'] ?>"<?php echo ($options['transition'] == 'crossfade')? ' style="height:'.$options['height'].'px; width:'.$options['width'].'px;"':'' ?>>
+  <?php // Crossfade doesn't work well without a height unless you do special gymnastics. The simple ?>
+  <?php // workaround is to specify maxHeight as a fallback ?>
+  
+        <ul id="a-slideshow-<?php echo $id ?>" class="a-slideshow clearfix <?php echo (count($items === 1) ? 'single-image' : 'multi-image') ?> transition-<?php echo $options['transition'] ?>"<?php echo ($options['transition'] == 'crossfade')? ' style="height:'.($options['height'] ? $options['height'] : ($options['maxHeight'] ? $options['maxHeight'] : 0)) . 'px; width:'.$options['width'].'px;"':'' ?>>
         <?php $first = true; $n=0; foreach ($items as $item): ?>
           <?php $dimensions = aDimensions::constrain(