Merge pull request #103 from damonsk/patch4

[*] MO : crossselling - moved javascript include into header hook.

modules/crossselling/crossselling.php

@@ -115,6 +115,7 @@ class CrossSelling extends Module
 	public function hookHeader()
 	{
 		$this->context->controller->addCSS(($this->_path).'crossselling.css', 'all');
+		$this->context->controller->addJS(($this->_path).'js/crossselling.js');
 	}
 
 	/**

modules/crossselling/crossselling.tpl

@@ -25,8 +25,7 @@
 
 {if isset($orderProducts) && count($orderProducts)}
 <div id="crossselling">
-	<script type="text/javascript">var middle = {$middlePosition_crossselling};</script>
+	<script type="text/javascript">var cs_middle = {$middlePosition_crossselling};</script>
-	<script type="text/javascript" src="{$content_dir}modules/crossselling/js/crossselling.js"></script>
 	<h2 class="productscategory_h2">{l s='Customers who bought this product also bought:' mod='crossselling'}</h2>
 	<div id="{if count($orderProducts) > 5}crossselling{else}crossselling_noscroll{/if}">
 		{if count($orderProducts) > 5}<a id="crossselling_scroll_left" title="{l s='Previous' mod='crossselling'}" href="javascript:{ldelim}{rdelim}">{l s='Previous' mod='crossselling'}</a>{/if}

modules/crossselling/js/crossselling.js

@@ -41,24 +41,27 @@ function cs_serialScrollFixLock(event, targeted, scrolled, items, position)
 }
 
 $(document).ready(function(){
-	//init the serialScroll for thumbs
+	if($('#crossselling_list').length > 0)
-	cs_serialScrollNbImages = $('#crossselling_list li').length;
+	{
-	cs_serialScrollNbImagesDisplayed = 5;
+		//init the serialScroll for thumbs
-	cs_serialScrollActualImagesIndex = 0;
+		cs_serialScrollNbImages = $('#crossselling_list li').length;
-	$('#crossselling_list').serialScroll({
+		cs_serialScrollNbImagesDisplayed = 5;
-		items:'li',
+		cs_serialScrollActualImagesIndex = 0;
-		prev:'a#crossselling_scroll_left',
+		$('#crossselling_list').serialScroll({
-		next:'a#crossselling_scroll_right',
+			items:'li',
-		axis:'x',
+			prev:'a#crossselling_scroll_left',
-		offset:0,
+			next:'a#crossselling_scroll_right',
-		stop:true,
+			axis:'x',
-		onBefore:cs_serialScrollFixLock,
+			offset:0,
-		duration:300,
+			stop:true,
-		step: 1,
+			onBefore:cs_serialScrollFixLock,
-		lazy:true,
+			duration:300,
-		lock: false,
+			step: 1,
-		force:false,
+			lazy:true,
-		cycle:false
+			lock: false,
-	});
+			force:false,
-	$('#crossselling_list').trigger( 'goto', [middle-3] );
+			cycle:false
+		});
+		$('#crossselling_list').trigger( 'goto', [cs_middle-3] );
+	}
 });