From f5cef7bd530b4f2a05f6342e93b2e90ba1ce889e Mon Sep 17 00:00:00 2001
From: George Wilson <georgejameswilson@googlemail.com>
Date: Wed, 16 Jul 2014 10:21:40 +0100
Subject: [PATCH 1/8] Correct steam link (thanks @ketchupmonki)

---
 mod_social_slider/mod_social_slider.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mod_social_slider/mod_social_slider.xml b/mod_social_slider/mod_social_slider.xml
index a92e427..ec6f48a 100644
--- a/mod_social_slider/mod_social_slider.xml
+++ b/mod_social_slider/mod_social_slider.xml
@@ -92,7 +92,7 @@
 					<option value="0">JJ_OFF</option>
 					<option value="1">JJ_ON</option>
 				</field>
-				<field name="steam_link" default="http://steam.com" type="text" size="50" label="JJ_SOCIAL_SLIDER_STEAM_LINK" description="JJ_SOCIAL_SLIDER_STEAM_LINK_DESC" />
+				<field name="steam_link" default="http://steampowered.com" type="text" size="50" label="JJ_SOCIAL_SLIDER_STEAM_LINK" description="JJ_SOCIAL_SLIDER_STEAM_LINK_DESC" />
 
 				<field name="sep8" type="sep" label="COM_MODULES_LASTFM_FIELDSET_LABEL" />
 				
@@ -124,7 +124,7 @@
 					<option value="0">JJ_OFF</option>
 					<option value="1">JJ_ON</option>
 				</field>
-				<field name="tumblr_link" default="http://tumblr.com" type="text" size="50" label="JJ_SOCIAL_SLIDER_TUMBLR_LINK" description="JJ_SOCIAL_SLIDER_TUMBLR_LINK_DESC" />
+				<field name="tumblr_link" default="http://tumblr.com" type="text" size="50" lasbel="JJ_SOCIAL_SLIDER_TUMBLR_LINK" description="JJ_SOCIAL_SLIDER_TUMBLR_LINK_DESC" />
 
 				<field name="sep12" type="sep" label="COM_MODULES_GITHUB_FIELDSET_LABEL" />
 				

From d95bcc1fedaae9e9dbc96769dbc389b97e49acc2 Mon Sep 17 00:00:00 2001
From: George Wilson <georgejameswilson@googlemail.com>
Date: Fri, 1 Aug 2014 22:40:41 +0100
Subject: [PATCH 2/8] typo

---
 mod_social_slider/mod_social_slider.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod_social_slider/mod_social_slider.xml b/mod_social_slider/mod_social_slider.xml
index ec6f48a..8974a4e 100644
--- a/mod_social_slider/mod_social_slider.xml
+++ b/mod_social_slider/mod_social_slider.xml
@@ -124,7 +124,7 @@
 					<option value="0">JJ_OFF</option>
 					<option value="1">JJ_ON</option>
 				</field>
-				<field name="tumblr_link" default="http://tumblr.com" type="text" size="50" lasbel="JJ_SOCIAL_SLIDER_TUMBLR_LINK" description="JJ_SOCIAL_SLIDER_TUMBLR_LINK_DESC" />
+				<field name="tumblr_link" default="http://tumblr.com" type="text" size="50" label="JJ_SOCIAL_SLIDER_TUMBLR_LINK" description="JJ_SOCIAL_SLIDER_TUMBLR_LINK_DESC" />
 
 				<field name="sep12" type="sep" label="COM_MODULES_GITHUB_FIELDSET_LABEL" />
 				

From 346129525aae340dcb9a11f3fda256c31fb8cc99 Mon Sep 17 00:00:00 2001
From: Lodder <lodder15@hotmail.co.uk>
Date: Mon, 18 Aug 2014 21:07:00 +0100
Subject: [PATCH 3/8] remove link focus dashed outline

---
 mod_social_slider/media/css/style.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mod_social_slider/media/css/style.css b/mod_social_slider/media/css/style.css
index de99b13..3928f9c 100644
--- a/mod_social_slider/media/css/style.css
+++ b/mod_social_slider/media/css/style.css
@@ -33,6 +33,9 @@ ul#jj_sl_navigation li a {
     -o-transition: all 0.3s ease;
     transition: all 0.3s ease;	
 }
+ul.jj_sl_navigation li a:focus {
+	outline: 0;
+}
 ul#jj_sl_navigation li a .jj_social_text {
 	display: inline-block;
 	width: 130px;

From 078daf7be822b7878a3f139bd626bc3c2a81a27f Mon Sep 17 00:00:00 2001
From: Charlie <lodder15@hotmail.co.uk>
Date: Fri, 29 Aug 2014 20:54:15 +0100
Subject: [PATCH 4/8] initial merge and removal of jquery

---
 mod_social_slider/fields/jquery.php           |  48 ----
 mod_social_slider/fields/sorting.php          |  45 ++--
 .../en-GB/en-GB.mod_social_slider.ini         |   7 +-
 .../en-GB/en-GB.mod_social_slider.sys.ini     |   4 +-
 mod_social_slider/mod_social_slider.php       | 212 +++++++-----------
 mod_social_slider/mod_social_slider.xml       |   4 -
 6 files changed, 112 insertions(+), 208 deletions(-)
 delete mode 100644 mod_social_slider/fields/jquery.php

diff --git a/mod_social_slider/fields/jquery.php b/mod_social_slider/fields/jquery.php
deleted file mode 100644
index f98d26d..0000000
--- a/mod_social_slider/fields/jquery.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
-* @package    JJ_Social_Slider
-* @author     JoomJunk <admin@joomjunk.co.uk>
-* @copyright  Copyright (C) 2011 - 2014 JoomJunk. All Rights Reserved
-* @license    GPL v3.0 or later http://www.gnu.org/licenses/gpl-3.0.html
-*/
-
-defined('_JEXEC') or die('Restricted access');
-
-JFormHelper::loadFieldClass('list');
-
-/**
- * Form Field class for JoomJunk.
- * Provides radio button inputs for the jQuery insertation in Joomla 2.5 only
- *
- * @package     JJ_Social_Slider
- * @since       1.3.0
- */
-class JFormFieldjQuery extends JFormFieldList
-{
-	/**
-	 * The form field type.
-	 *
-	 * @var    string
-	 * @since  1.3.0
-	 */
-	protected $type = 'jQuery';
-
-	/**
-	 * Method to get the list field input markup.
-	 *
-	 * @return  string  The field input markup if version is less than Joomla 3.0, else text string.
-	 *
-	 * @since   1.3.0
-	 */
-	protected function getInput()
-	{
-		if (version_compare(JVERSION,'3.0.0','ge'))
-		{
-			return '<span class="readonly">' . JText::_('JJ_SOCIAL_SLIDER_NOJQUERY_30') . '</span>';
-		}
-		else
-		{
-			return parent::getInput();
-		}
-	}
-}
diff --git a/mod_social_slider/fields/sorting.php b/mod_social_slider/fields/sorting.php
index b041fa2..9e464ae 100644
--- a/mod_social_slider/fields/sorting.php
+++ b/mod_social_slider/fields/sorting.php
@@ -56,33 +56,44 @@ protected function getInput()
 			'sort_19' => JText::_('COM_MODULES_CUSTOM4_FIELDSET_LABEL'),
 			'sort_20' => JText::_('COM_MODULES_CUSTOM5_FIELDSET_LABEL')
 		);
-		$document = JFactory::getDocument();
+		$doc = JFactory::getDocument();
 
 		// Inject jQuery onto the page
-		JHtml::_('jquery.framework');
+		if (version_compare(JVERSION,'3.0.0','ge'))
+		{
+			JHtml::_('jquery.framework');
+		}
+		else
+		{
+			if(!JFactory::getApplication()->get('jquery')){
+				JFactory::getApplication()->set('jquery',true);
+				$doc->addScript('http://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js');
+				$doc->addScriptDeclaration('jQuery.noConflict();');
+			}
+		}
 
 		// Next insert the jQuery plugin
-		JHtml::_('script', 'mod_social_slider/jquery-sortable.js', false, true);
+		JHtml::_('script', JUri::root() . 'media/mod_social_slider/jquery-sortable.js');
 
 		// Now initialize the plugin
-		$document->addScriptDeclaration('
-		jQuery(document).ready(function($) {
-			var group = $("#sortable").sortable({
-				pullPlaceholder: false,
-				onDrop: function (item, container, _super) {
-					$("#' . $this->id . '").val(group.sortable("serialize").get().join("\n"))
-					_super(item, container)
-				},
-				serialize: function (parent, children, isContainer) {
-					return isContainer ? children.join() : parent.attr("id")
-				},
-			})
-		});
+		$doc->addScriptDeclaration('
+			jQuery(document).ready(function($) {
+				var group = $("#sortable").sortable({
+					pullPlaceholder: false,
+					onDrop: function (item, container, _super) {
+						$("#' . $this->id . '").val(group.sortable("serialize").get().join("\n"))
+						_super(item, container)
+					},
+					serialize: function (parent, children, isContainer) {
+						return isContainer ? children.join() : parent.attr("id")
+					},
+				})
+			});
 		');
 
 		// Add in relevant styles
 		$icon = JUri::root() . 'media/mod_social_slider/icons/';
-		$document->addStyleDeclaration('
+		$doc->addStyleDeclaration('
 			body.dragging, body.dragging * {
 			  cursor: move !important;
 			}
diff --git a/mod_social_slider/language/en-GB/en-GB.mod_social_slider.ini b/mod_social_slider/language/en-GB/en-GB.mod_social_slider.ini
index 590a457..683aa2a 100644
--- a/mod_social_slider/language/en-GB/en-GB.mod_social_slider.ini
+++ b/mod_social_slider/language/en-GB/en-GB.mod_social_slider.ini
@@ -4,7 +4,7 @@
 ; @ Released under GNU/GPL 3.0 License
 ; Note : All ini files need to be saved as UTF-8
 
-JJ_SOCIAL_SLIDER_DESC="<h1>JJ Social Slider</h1><h3>Brought to you by JoomJunk</h3><p>Copyright (C) 2014 JoomJunk</p><p>Released under GNU/GPL 3.0 License</p><p>Website: <a href='http://www.joomjunk.co.uk'>www.joomjunk.co.uk</a></p><p>Social Slider is a simple module that appears in a fixed position, either on the left or right hand side of your page. Upon hovering over an icon, the bar slides out using CSS3 or jQuery animations, providing a small caption which you can link to a social network page.</p>"
+JJ_SOCIAL_SLIDER_DESC="<h1>JJ Social Slider</h1><h3>Brought to you by JoomJunk</h3><p>Copyright (C) 2014 JoomJunk</p><p>Released under GNU/GPL 3.0 License</p><p>Website: <a href='http://www.joomjunk.co.uk'>www.joomjunk.co.uk</a></p><p>Social Slider is a simple module that appears in a fixed position, either on the left or right hand side of your page. Upon hovering over an icon, the bar slides out using CSS3 transitions, providing a small caption which you can link to a social network page.</p>"
 
 COM_MODULES_FACEBOOK_FIELDSET_LABEL="Facebook"
 COM_MODULES_TWITTER_FIELDSET_LABEL="Twitter"
@@ -144,11 +144,6 @@ JJ_SOCIAL_SLIDER_ICON_COLOUR="Icon Colour"
 JJ_SOCIAL_SLIDER_ICON_COLOUR_DESC="Select whether you would likes to have black or white icons"
 JJ_SOCIAL_SLIDER_ICONS_WHITE="White"
 JJ_SOCIAL_SLIDER_ICONS_BLACK="Black"
-JJ_SOCIAL_SLIDER_CSS="CSS"
-JJ_SOCIAL_SLIDER_JQUERY_CSS="jQuery or CSS"
-JJ_SOCIAL_SLIDER_JQUERY_CSS_DESC="Choose whether you would like to use jQuery or CSS animations"
-JJ_SOCIAL_SLIDER_JQUERY="jQuery"
-JJ_SOCIAL_SLIDER_NOJQUERY_30="jQuery is included locally in Joomla 3.x by default"
 JJ_SOCIAL_SLIDER_TAB="Target"
 JJ_SOCIAL_SLIDER_TAB_DESC="Select whether you want the social network to open in the same or a new tab"
 JJ_SOCIAL_SLIDER_TAB_NEW="New tab"
diff --git a/mod_social_slider/language/en-GB/en-GB.mod_social_slider.sys.ini b/mod_social_slider/language/en-GB/en-GB.mod_social_slider.sys.ini
index f30fcc6..53ba1eb 100644
--- a/mod_social_slider/language/en-GB/en-GB.mod_social_slider.sys.ini
+++ b/mod_social_slider/language/en-GB/en-GB.mod_social_slider.sys.ini
@@ -4,5 +4,5 @@
 ; @ Released under GNU/GPL 3.0 License
 ; Note : All ini files need to be saved as UTF-8
 
-JJ_SOCIAL_SLIDER_DESC="<h1>JJ Social Slider</h1><h3>Brought to you by JoomJunk</h3><p>Copyright (C) 2014 JoomJunk</p><p>Released under GNU/GPL 3.0 License</p><p>Website: <a href='http://www.joomjunk.co.uk'>www.joomjunk.co.uk</a></p><p>Social Slider is a simple module that appears in a fixed position, either on the left or right hand side of your page. Upon hovering over an icon, the bar slides out using CSS3 or jQuery animations, providing a small caption which you can link to a social network page.</p>"
-JJ_SOCIAL_SLIDER_JOOMLA_VERSION_OUTDATED="This module requires Joomla 3.2 or higher. There are packages available for download at <a href='http://www.joomjunk.co.uk'>www.joomjunk.co.uk</a> available for Joomla 2.5"
+JJ_SOCIAL_SLIDER_DESC="<h1>JJ Social Slider</h1><h3>Brought to you by JoomJunk</h3><p>Copyright (C) 2014 JoomJunk</p><p>Released under GNU/GPL 3.0 License</p><p>Website: <a href='http://www.joomjunk.co.uk'>www.joomjunk.co.uk</a></p><p>Social Slider is a simple module that appears in a fixed position, either on the left or right hand side of your page. Upon hovering over an icon, the bar slides out using CSS3 transitions, providing a small caption which you can link to a social network page.</p>"
+JJ_SOCIAL_SLIDER_JOOMLA_VERSION_OUTDATED="This module requires Joomla 2.5 or Joomla 3.2+."
diff --git a/mod_social_slider/mod_social_slider.php b/mod_social_slider/mod_social_slider.php
index aeb4364..1120460 100644
--- a/mod_social_slider/mod_social_slider.php
+++ b/mod_social_slider/mod_social_slider.php
@@ -27,12 +27,7 @@
 	$position = $params->get('position', 'left');
 }
 
-$document = JFactory::getDocument();
-
-if ($params->get('jquery_css') == 0)
-{
-	JHtml::_('jquery.framework');
-}
+$doc = JFactory::getDocument();
 
 $slides = array(
         'sort_1' => 'facebook',
@@ -57,19 +52,20 @@
         'sort_20' => 'custom5'
 );
 
-$style1 = 'ul#jj_sl_navigation li a {'
+$css = "";
+
+$css .= 'ul#jj_sl_navigation li a {'
 		. 'background-color:' . $params->get('slide_colour') . ';'
 		. 'text-align:' . $position . ';'
 		. 'color:' . $params->get('text_colour') . ' !important;'
 		. '}';
-$document->addStyleDeclaration($style1);
-
+		
 if ($params->get('disable') == 1)
 {
 	$mobile = '@media screen and (max-width: ' . $params->get("mobile_width", "480px") . '){'
 		. 'ul#jj_sl_navigation { display: none; }'
 		. '}';
-	$document->addStyleDeclaration($mobile);
+	$doc->addStyleDeclaration($mobile);
 }
 
 if ($params->get('disable') == 2)
@@ -77,135 +73,90 @@
 	$mobile_tablet = '@media screen and (max-width: ' . $params->get("tablet_width", "768px") . '){'
 		. 'ul#jj_sl_navigation { display: none; }'
 		. '}';
-	$document->addStyleDeclaration($mobile_tablet);
+	$doc->addStyleDeclaration($mobile_tablet);
 }
 
 if ($position == "left")
 {
-	if ($params->get('jquery_css') == 0)
-	{
-		$js_left = '
-		(function($){
-			$(function() {
-				$("#jj_sl_navigation a").css("marginLeft", "-140px")
-				$("#jj_sl_navigation > li").hover(
-					function () {
-						$("a",$(this)).stop().animate({"marginLeft":"-2px"},200);
-					},
-					function () {
-						$("a",$(this)).stop().animate({"marginLeft":"-140px"},200);
-					}
-				);
-			});
-		})(jQuery);
-		';
-		$css = '';
-		$document->addScriptDeclaration($js_left);
-	}
 
-	else
-	{
-		$css = 'ul#jj_sl_navigation li { '
-			. 'margin-left: -140px;'
-			. '-webkit-transition: margin-left 0.3s;'
-			. '-moz-transition: margin-left 0.3s;'
-			. '-ms-transition: margin-left 0.3s;'
-			. '-o-transition: margin-left 0.3s;'
-			. 'transition: margin-left 0.3s;'
-			. '}';
+	$css .= 'ul#jj_sl_navigation li { '
+		. 'margin-left: -140px;'
+		. '-webkit-transition: margin-left 0.3s;'
+		. '-moz-transition: margin-left 0.3s;'
+		. '-ms-transition: margin-left 0.3s;'
+		. '-o-transition: margin-left 0.3s;'
+		. 'transition: margin-left 0.3s;'
+	. '}';
+      
+	$css .= 'ul#jj_sl_navigation { '
+		. $position . ':0px;'
+		. $params->get('top_bottom', 'top') . ':' . $params->get('top') . 'px;'
+		. '}'
+		. 'ul#jj_sl_navigation li:hover { '
+		. 'margin-left: 0px;'
+		. '}'
+		. 'ul#jj_sl_navigation li a { '
+		. 'padding: 11px 0px 11px 10px;'
+		. 'margin-left: -2px;'
+	. '}';
+	
+	foreach ($slides as $slide => $social){
+		if (strpos($social, "custom") === false)
+		{
+			$css .= 'ul#jj_sl_navigation .jj_sl_' . $social . ' a {
+					background-position: 144px 50%;
+					background-image: url(' . JUri::root() . 'media/mod_social_slider/icons/' . $social . '-' . $params->get('icon_colour') . '.png);
+			 }';
+		}
+		else
+		{
+			$css .= 'ul#jj_sl_navigation .jj_sl_' . $social . ' a {
+					background-position: 144px 50%;
+					background-image: url(' . JUri::root() . 'media/mod_social_slider/icons/' . $params->get( $social . '_image') . ');
+			 }';
+		}
 	}
-	$style = "";        
-        $style .= 'ul#jj_sl_navigation { '
-        . $position . ':0px;'
-        . $params->get('top_bottom', 'top') . ':' . $params->get('top') . 'px;'
-        . '}'
-        . 'ul#jj_sl_navigation li:hover { '
-        . 'margin-left: 0px;'
-        . '}'
-        . 'ul#jj_sl_navigation li a { '
-        . 'padding: 11px 0px 11px 10px;'
-        . 'margin-left: -2px;'
-        . '}';
-        foreach ($slides as $slide => $social){
-                if (strpos($social, "custom") === false)
-                {
-                        $style .= 'ul#jj_sl_navigation .jj_sl_' . $social . ' a {
-                                background-position: 144px 50%;
-                                background-image: url(' . JUri::root() . 'media/mod_social_slider/icons/' . $social . '-' . $params->get('icon_colour') . '.png);
-                         }';
-                }
-                else
-                {
-                        $style .= 'ul#jj_sl_navigation .jj_sl_' . $social . ' a {
-                                background-position: 144px 50%;
-                                background-image: url(' . JUri::root() . 'media/mod_social_slider/icons/' . $params->get( $social . '_image') . ');
-                         }';
-                }
-        }
 }
 elseif ($position == "right")
 {
-	if ($params->get('jquery_css') == 0)
-	{
-		$js_right = '
-		(function($){
-			$(function() {
-				$("#jj_sl_navigation a").css("marginLeft", "140px")
-				$("#jj_sl_navigation > li").hover(
-					function () {
-						$("a",$(this)).stop().animate({"marginLeft":"2px"},200);
-					},
-					function () {
-						$("a",$(this)).stop().animate({"marginLeft":"140px"},200);
-					}
-				);
-			});
-		})(jQuery);
-		';
-		$css = 'ul#jj_sl_navigation li {position: relative;} ul#jj_sl_navigation{right: -140px;}';
-		$document->addScriptDeclaration($js_right);
-	}
 
-	else
-	{
-		$css = 'ul#jj_sl_navigation li { '
-			. 'right: -138px;'
-			. 'position:relative;'
-			. '-webkit-transition: right 0.3s;'
-			. '-moz-transition: right 0.3s;'
-			. '-ms-transition: right 0.3s;'
-			. '-o-transition: right 0.3s;'
-			. 'transition: right 0.3s;'
-			. '}';
-	}
+	$css .= 'ul#jj_sl_navigation li { '
+		. 'right: -138px;'
+		. 'position:relative;'
+		. '-webkit-transition: right 0.3s;'
+		. '-moz-transition: right 0.3s;'
+		. '-ms-transition: right 0.3s;'
+		. '-o-transition: right 0.3s;'
+		. 'transition: right 0.3s;'
+	. '}';
+
+	$css .= 'ul#jj_sl_navigation { '
+		. $position . ':0px;'
+		. $params->get('top_bottom', 'top') . ':' . $params->get('top') . 'px;'
+		. '}'
+		. 'ul#jj_sl_navigation li:hover { '
+		. 'right: 0px;'
+		. '}'
+		. 'ul#jj_sl_navigation li a { '
+		. 'padding: 11px 10px 11px 0px;'
+	. '}';
 	
-	$style = "";
-        $style .= 'ul#jj_sl_navigation { '
-                . $position . ':0px;'
-                . $params->get('top_bottom', 'top') . ':' . $params->get('top') . 'px;'
-                . '}'
-                . 'ul#jj_sl_navigation li:hover { '
-                . 'right: 0px;'
-                . '}'
-                . 'ul#jj_sl_navigation li a { '
-                . 'padding: 11px 10px 11px 0px;'
-                . '}';
-        foreach ($slides as $slide => $social){
-                if (strpos($social, "custom") === false)
-                {
-                        $style .= 'ul#jj_sl_navigation .jj_sl_' . $social . ' a {
-                                background-position: 4px 50%;
-                                background-image: url(' . JUri::root() . 'media/mod_social_slider/icons/' . $social . '-' . $params->get('icon_colour') . '.png);
-                         }';
-                }
-                else
-                {
-                        $style .= 'ul#jj_sl_navigation .jj_sl_' . $social . ' a {
-                                background-position: 4px 50%;
-                                background-image: url(' . JUri::root() . 'media/mod_social_slider/icons/' . $params->get( $social . '_image') . ');
-                         }';
-                }
-        }
+	foreach ($slides as $slide => $social){
+		if (strpos($social, "custom") === false)
+		{
+			$css .= 'ul#jj_sl_navigation .jj_sl_' . $social . ' a {
+					background-position: 4px 50%;
+					background-image: url(' . JUri::root() . 'media/mod_social_slider/icons/' . $social . '-' . $params->get('icon_colour') . '.png);
+			 }';
+		}
+		else
+		{
+			$css .= 'ul#jj_sl_navigation .jj_sl_' . $social . ' a {
+					background-position: 4px 50%;
+					background-image: url(' . JUri::root() . 'media/mod_social_slider/icons/' . $params->get( $social . '_image') . ');
+			 }';
+		}
+	}
 }
 
 $custom_css = 'ul#jj_sl_navigation .jj_sl_custom1 a:hover{
@@ -223,8 +174,7 @@ function () {
 			   ul#jj_sl_navigation .jj_sl_custom5 a:hover{
 				background-color: ' . $params->get('custom5_colour') . ';
 			   }';
-$document->addStyleDeclaration($custom_css);
-$document->addStyleDeclaration($style);
-$document->addStyleDeclaration($css);
+$doc->addStyleDeclaration($custom_css);
+$doc->addStyleDeclaration($css);
 
 require JModuleHelper::getLayoutPath('mod_social_slider');
diff --git a/mod_social_slider/mod_social_slider.xml b/mod_social_slider/mod_social_slider.xml
index 8974a4e..87e08b2 100644
--- a/mod_social_slider/mod_social_slider.xml
+++ b/mod_social_slider/mod_social_slider.xml
@@ -242,10 +242,6 @@
 					<option value="white">JJ_SOCIAL_SLIDER_ICONS_WHITE</option>
 					<option value="black">JJ_SOCIAL_SLIDER_ICONS_BLACK</option>
 				</field>
-				<field name="jquery_css" type="radio" default="1" label="JJ_SOCIAL_SLIDER_JQUERY_CSS" description="JJ_SOCIAL_SLIDER_JQUERY_CSS_DESC">
-					<option value="0">JJ_SOCIAL_SLIDER_JQUERY</option>
-					<option value="1">JJ_SOCIAL_SLIDER_CSS</option>
-				</field>
 				<field name="tab" type="radio" default="0" label="JJ_SOCIAL_SLIDER_TAB" description="JJ_SOCIAL_SLIDER_TAB_DESC">
 					<option value="0">JJ_SOCIAL_SLIDER_TAB_NEW</option>
 					<option value="1">JJ_SOCIAL_SLIDER_TAB_SAME</option>

From 92e9cc891f05c1ac15de8e2bd4062e7c20316c05 Mon Sep 17 00:00:00 2001
From: Charlie <lodder15@hotmail.co.uk>
Date: Sun, 31 Aug 2014 11:59:10 +0100
Subject: [PATCH 5/8] removed merge, oops

---
 mod_social_slider/fields/sorting.php | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/mod_social_slider/fields/sorting.php b/mod_social_slider/fields/sorting.php
index 9e464ae..a71f185 100644
--- a/mod_social_slider/fields/sorting.php
+++ b/mod_social_slider/fields/sorting.php
@@ -59,21 +59,10 @@ protected function getInput()
 		$doc = JFactory::getDocument();
 
 		// Inject jQuery onto the page
-		if (version_compare(JVERSION,'3.0.0','ge'))
-		{
-			JHtml::_('jquery.framework');
-		}
-		else
-		{
-			if(!JFactory::getApplication()->get('jquery')){
-				JFactory::getApplication()->set('jquery',true);
-				$doc->addScript('http://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js');
-				$doc->addScriptDeclaration('jQuery.noConflict();');
-			}
-		}
+		JHtml::_('jquery.framework');
 
 		// Next insert the jQuery plugin
-		JHtml::_('script', JUri::root() . 'media/mod_social_slider/jquery-sortable.js');
+		JHtml::_('script', 'mod_social_slider/jquery-sortable.js', false, true);
 
 		// Now initialize the plugin
 		$doc->addScriptDeclaration('

From 17e0514fa2403110a557d681f14493a61c18078d Mon Sep 17 00:00:00 2001
From: Charlie <lodder15@hotmail.co.uk>
Date: Sun, 31 Aug 2014 12:03:41 +0100
Subject: [PATCH 6/8] fixed CSS right bug

---
 mod_social_slider/mod_social_slider.php | 38 ++++++++++++-------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/mod_social_slider/mod_social_slider.php b/mod_social_slider/mod_social_slider.php
index 1120460..de8bfac 100644
--- a/mod_social_slider/mod_social_slider.php
+++ b/mod_social_slider/mod_social_slider.php
@@ -121,7 +121,7 @@
 {
 
 	$css .= 'ul#jj_sl_navigation li { '
-		. 'right: -138px;'
+		. 'right: 0px;'
 		. 'position:relative;'
 		. '-webkit-transition: right 0.3s;'
 		. '-moz-transition: right 0.3s;'
@@ -131,11 +131,11 @@
 	. '}';
 
 	$css .= 'ul#jj_sl_navigation { '
-		. $position . ':0px;'
+		. $position . ':-140px;'
 		. $params->get('top_bottom', 'top') . ':' . $params->get('top') . 'px;'
 		. '}'
 		. 'ul#jj_sl_navigation li:hover { '
-		. 'right: 0px;'
+		. 'right: -140px;'
 		. '}'
 		. 'ul#jj_sl_navigation li a { '
 		. 'padding: 11px 10px 11px 0px;'
@@ -159,22 +159,22 @@
 	}
 }
 
-$custom_css = 'ul#jj_sl_navigation .jj_sl_custom1 a:hover{
-				background-color: ' . $params->get('custom1_colour') . ';
-			   }
-			   ul#jj_sl_navigation .jj_sl_custom2 a:hover{
-				background-color: ' . $params->get('custom2_colour') . ';
-			   }
-			   ul#jj_sl_navigation .jj_sl_custom3 a:hover{
-				background-color: ' . $params->get('custom3_colour') . ';
-			   }
-			   ul#jj_sl_navigation .jj_sl_custom4 a:hover{
-				background-color: ' . $params->get('custom4_colour') . ';
-			   }
-			   ul#jj_sl_navigation .jj_sl_custom5 a:hover{
-				background-color: ' . $params->get('custom5_colour') . ';
-			   }';
-$doc->addStyleDeclaration($custom_css);
+$css. = 'ul#jj_sl_navigation .jj_sl_custom1 a:hover{
+			background-color: ' . $params->get('custom1_colour') . ';
+		   }
+		   ul#jj_sl_navigation .jj_sl_custom2 a:hover{
+			background-color: ' . $params->get('custom2_colour') . ';
+		   }
+		   ul#jj_sl_navigation .jj_sl_custom3 a:hover{
+			background-color: ' . $params->get('custom3_colour') . ';
+		   }
+		   ul#jj_sl_navigation .jj_sl_custom4 a:hover{
+			background-color: ' . $params->get('custom4_colour') . ';
+		   }
+		   ul#jj_sl_navigation .jj_sl_custom5 a:hover{
+			background-color: ' . $params->get('custom5_colour') . ';
+		}';
+		
 $doc->addStyleDeclaration($css);
 
 require JModuleHelper::getLayoutPath('mod_social_slider');

From 4aeb56ed803316349e3f5c78c8b7187a74f74541 Mon Sep 17 00:00:00 2001
From: Charlie <lodder15@hotmail.co.uk>
Date: Sun, 31 Aug 2014 12:17:57 +0100
Subject: [PATCH 7/8] CSS enhancements

---
 mod_social_slider/mod_social_slider.php | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/mod_social_slider/mod_social_slider.php b/mod_social_slider/mod_social_slider.php
index de8bfac..110fc99 100644
--- a/mod_social_slider/mod_social_slider.php
+++ b/mod_social_slider/mod_social_slider.php
@@ -80,20 +80,21 @@
 {
 
 	$css .= 'ul#jj_sl_navigation li { '
-		. 'margin-left: -140px;'
-		. '-webkit-transition: margin-left 0.3s;'
-		. '-moz-transition: margin-left 0.3s;'
-		. '-ms-transition: margin-left 0.3s;'
-		. '-o-transition: margin-left 0.3s;'
-		. 'transition: margin-left 0.3s;'
+		. 'left: 0;'
+		. 'position:relative;'
+		. '-webkit-transition: left 0.3s;'
+		. '-moz-transition: left 0.3s;'
+		. '-ms-transition: left 0.3s;'
+		. '-o-transition: left 0.3s;'
+		. 'transition: left 0.3s;'
 	. '}';
       
 	$css .= 'ul#jj_sl_navigation { '
-		. $position . ':0px;'
+		. $position . ': -140px;'
 		. $params->get('top_bottom', 'top') . ':' . $params->get('top') . 'px;'
 		. '}'
 		. 'ul#jj_sl_navigation li:hover { '
-		. 'margin-left: 0px;'
+		. 'left: 140px;'
 		. '}'
 		. 'ul#jj_sl_navigation li a { '
 		. 'padding: 11px 0px 11px 10px;'
@@ -121,7 +122,7 @@
 {
 
 	$css .= 'ul#jj_sl_navigation li { '
-		. 'right: 0px;'
+		. 'right: 0;'
 		. 'position:relative;'
 		. '-webkit-transition: right 0.3s;'
 		. '-moz-transition: right 0.3s;'
@@ -135,7 +136,7 @@
 		. $params->get('top_bottom', 'top') . ':' . $params->get('top') . 'px;'
 		. '}'
 		. 'ul#jj_sl_navigation li:hover { '
-		. 'right: -140px;'
+		. 'right: 140px;'
 		. '}'
 		. 'ul#jj_sl_navigation li a { '
 		. 'padding: 11px 10px 11px 0px;'
@@ -159,7 +160,7 @@
 	}
 }
 
-$css. = 'ul#jj_sl_navigation .jj_sl_custom1 a:hover{
+$css .= 'ul#jj_sl_navigation .jj_sl_custom1 a:hover{
 			background-color: ' . $params->get('custom1_colour') . ';
 		   }
 		   ul#jj_sl_navigation .jj_sl_custom2 a:hover{

From b3dd3fc49c721f7572c37416172a5f9d52d66249 Mon Sep 17 00:00:00 2001
From: Charlie <lodder15@hotmail.co.uk>
Date: Sun, 31 Aug 2014 12:50:14 +0100
Subject: [PATCH 8/8] updated to version 1.5.5

---
 changelog.php                           | 6 ++++++
 mod_social_slider/mod_social_slider.xml | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/changelog.php b/changelog.php
index 3fa8bb7..ce50db5 100644
--- a/changelog.php
+++ b/changelog.php
@@ -15,6 +15,12 @@
 - -> Removed
 ! -> Note
 
+Version 1.5.5
+# Slider container will no longer overlap other elements
+^ CSS enhancements
+- Removed jQuery option and thus dropping support for IE8
+- Removed support for Joomla 3.0 and 3.1
+
 Version 1.5.4
 + Used more unique naming convertions to prevent overrides
 - Removed unnecessary jQuery file for (Joomla 3.2)
diff --git a/mod_social_slider/mod_social_slider.xml b/mod_social_slider/mod_social_slider.xml
index 87e08b2..bed81f0 100644
--- a/mod_social_slider/mod_social_slider.xml
+++ b/mod_social_slider/mod_social_slider.xml
@@ -7,7 +7,7 @@
 	<license>http://www.gnu.org/licenses/gpl-3.0.html</license> 
 	<authorEmail>admin@joomjunk.co.uk</authorEmail> 
 	<authorUrl>http://www.joomjunk.co.uk</authorUrl> 
-	<version>1.5.4</version>
+	<version>1.5.5</version>
 	<description>JJ_SOCIAL_SLIDER_DESC</description>
 	
 	<files>