From 403ce760b22fd92cf03714ed41a8fe4dbd8dace2 Mon Sep 17 00:00:00 2001
From: Damon Skelhorn <damon@eighty-six.co.uk>
Date: Tue, 18 Dec 2012 11:52:25 +0000
Subject: [PATCH 1/2] [*] MO : crossselling - moved javascript include into
 header hook.

---
 modules/crossselling/crossselling.php   | 1 +
 modules/crossselling/crossselling.tpl   | 3 +--
 modules/crossselling/js/crossselling.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/crossselling/crossselling.php b/modules/crossselling/crossselling.php
index ebb0434a1..ee9fc14a8 100755
--- a/modules/crossselling/crossselling.php
+++ b/modules/crossselling/crossselling.php
@@ -100,6 +100,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');
 	}
 
 	/**
diff --git a/modules/crossselling/crossselling.tpl b/modules/crossselling/crossselling.tpl
index 80ce798f5..b10ab5f99 100755
--- a/modules/crossselling/crossselling.tpl
+++ b/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" src="{$content_dir}modules/crossselling/js/crossselling.js"></script>
+	<script type="text/javascript">var cs_middle = {$middlePosition_crossselling};</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}
diff --git a/modules/crossselling/js/crossselling.js b/modules/crossselling/js/crossselling.js
index 73db212a5..deb924291 100755
--- a/modules/crossselling/js/crossselling.js
+++ b/modules/crossselling/js/crossselling.js
@@ -60,5 +60,5 @@ $(document).ready(function(){
 		force:false,
 		cycle:false
 	});
-	$('#crossselling_list').trigger( 'goto', [middle-3] );
+	$('#crossselling_list').trigger( 'goto', [cs_middle-3] );
 });

From 144081ae9ef52049e6380a3db3116cce5cb8f982 Mon Sep 17 00:00:00 2001
From: Damon Skelhorn <damon@eighty-six.co.uk>
Date: Tue, 18 Dec 2012 14:38:48 +0000
Subject: [PATCH 2/2] [-] MO : crossselling - Added in condition to test
 element is present.

---
 modules/crossselling/js/crossselling.js | 43 +++++++++++++------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/modules/crossselling/js/crossselling.js b/modules/crossselling/js/crossselling.js
index deb924291..3e64b8bc0 100755
--- a/modules/crossselling/js/crossselling.js
+++ b/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
-	cs_serialScrollNbImages = $('#crossselling_list li').length;
-	cs_serialScrollNbImagesDisplayed = 5;
-	cs_serialScrollActualImagesIndex = 0;
-	$('#crossselling_list').serialScroll({
-		items:'li',
-		prev:'a#crossselling_scroll_left',
-		next:'a#crossselling_scroll_right',
-		axis:'x',
-		offset:0,
-		stop:true,
-		onBefore:cs_serialScrollFixLock,
-		duration:300,
-		step: 1,
-		lazy:true,
-		lock: false,
-		force:false,
-		cycle:false
-	});
-	$('#crossselling_list').trigger( 'goto', [cs_middle-3] );
+	if($('#crossselling_list').length > 0)
+	{
+		//init the serialScroll for thumbs
+		cs_serialScrollNbImages = $('#crossselling_list li').length;
+		cs_serialScrollNbImagesDisplayed = 5;
+		cs_serialScrollActualImagesIndex = 0;
+		$('#crossselling_list').serialScroll({
+			items:'li',
+			prev:'a#crossselling_scroll_left',
+			next:'a#crossselling_scroll_right',
+			axis:'x',
+			offset:0,
+			stop:true,
+			onBefore:cs_serialScrollFixLock,
+			duration:300,
+			step: 1,
+			lazy:true,
+			lock: false,
+			force:false,
+			cycle:false
+		});
+		$('#crossselling_list').trigger( 'goto', [cs_middle-3] );
+	}
 });