Moved assets loading from template to module, closes #2

madeyourday · Feb 18, 2014 · ebd191c · ebd191c
1 parent 9231e92
commit ebd191c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 18 deletions.
diff --git a/src/MadeYourDay/Contao/Module/Slider.php b/src/MadeYourDay/Contao/Module/Slider.php
@@ -162,6 +162,13 @@ protected function compile()
 		$this->Template->images = $images;
 		$this->Template->slides = $this->parseSlides(SlideModel::findPublishedByPid($this->rsts_id));
 		$this->Template->options = $this->arrData;
+
+		$GLOBALS['TL_JAVASCRIPT'][] = 'system/modules/rocksolid-slider/assets/js/rocksolid-slider-1.2.0.min.js|static';
+		$GLOBALS['TL_CSS'][] = 'system/modules/rocksolid-slider/assets/css/rocksolid-slider.min.css||static';
+		$skinPath = 'system/modules/rocksolid-slider/assets/css/' . (empty($this->arrData['rsts_skin']) ? 'default' : $this->arrData['rsts_skin']) . '-skin.min.css';
+		if (file_exists(TL_ROOT . '/' . $skinPath)) {
+			$GLOBALS['TL_CSS'][] = $skinPath . '||static';
+		}
 	}
 
 	/**

diff --git a/templates/rsts_default.html5 b/templates/rsts_default.html5
@@ -1,12 +1,3 @@
-<?php
-	$GLOBALS['TL_JAVASCRIPT'][] = 'system/modules/rocksolid-slider/assets/js/rocksolid-slider-1.2.0.min.js|static';
-	$GLOBALS['TL_CSS'][] = 'system/modules/rocksolid-slider/assets/css/rocksolid-slider.min.css||static';
-	$skinPath = 'system/modules/rocksolid-slider/assets/css/' . (empty($this->options['rsts_skin']) ? 'default' : $this->options['rsts_skin']) . '-skin.min.css';
-	if (file_exists(TL_ROOT . '/' . $skinPath)) {
-		$GLOBALS['TL_CSS'][] = $skinPath . '||static';
-	}
-?>
-
 <div class="<?php echo $this->class ?> block"<?php echo $this->cssID ?><?php if ($this->style): ?> style="<?php echo $this->style ?>"<?php endif ?>>
 
 	<?php if ($this->headline): ?>

diff --git a/templates/rsts_default.xhtml b/templates/rsts_default.xhtml
@@ -1,12 +1,3 @@
-<?php
-	$GLOBALS['TL_JAVASCRIPT'][] = 'system/modules/rocksolid-slider/assets/js/rocksolid-slider-1.2.0.min.js|static';
-	$GLOBALS['TL_CSS'][] = 'system/modules/rocksolid-slider/assets/css/rocksolid-slider.min.css||static';
-	$skinPath = 'system/modules/rocksolid-slider/assets/css/' . (empty($this->options['rsts_skin']) ? 'default' : $this->options['rsts_skin']) . '-skin.min.css';
-	if (file_exists(TL_ROOT . '/' . $skinPath)) {
-		$GLOBALS['TL_CSS'][] = $skinPath . '||static';
-	}
-?>
-
 <div class="<?php echo $this->class ?> block"<?php echo $this->cssID ?><?php if ($this->style): ?> style="<?php echo $this->style ?>"<?php endif ?>>
 
 	<?php if ($this->headline): ?>