fixed disabled links to work with nested linking

mmonkey · Feb 20, 2015 · 2c716ce · 2c716ce
1 parent bdbcc42
commit 2c716ce
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 9 deletions.
diff --git a/build/js/fireSlider.js b/build/js/fireSlider.js
@@ -1,4 +1,4 @@
-/*! fireSlider (1.2.61) (C) 2014 CJ O'Hara and Tyler Fowle. MIT @license: en.wikipedia.org/wiki/MIT_License */
+/*! fireSlider (1.2.62) (C) 2014 CJ O'Hara and Tyler Fowle. MIT @license: en.wikipedia.org/wiki/MIT_License */
 var V = (window.jQuery) ? $.Velocity : Velocity;
 
 (function (FireSlider, window, undefined) {
@@ -663,7 +663,14 @@ var V = (window.jQuery) ? $.Velocity : Velocity;
 					fireSlider._utilities.listen(fs.slider, 'click', function(e) {
 						var target = (e.target) ? e.target : e.srcElement;
 						if(target.tagName === "A") {
-							if(!fireSlider._utilities.hasClass(target.parentNode, fs.options.activeSlideClass)) {
+							var parents = fireSlider._utilities.getParents(target);
+							var isActive = false;
+							for(var i = 0; i < parents.length; i++) {
+								if(fireSlider._utilities.hasClass(parents[i], fs.options.activeSlideClass)) {
+									isActive = true;
+								}
+							}
+							if(!isActive) {
 								if (e.preventDefault) e.preventDefault();
 								else e.returnValue = false;
 							}
@@ -871,6 +878,15 @@ var V = (window.jQuery) ? $.Velocity : Velocity;
 			return ret;
 		},
 
+		getParents: function(elm) {
+			var results = [];
+			while(elm.parentNode) {
+				results.push(elm.parentNode);
+				elm = elm.parentNode;
+			}
+			return results;
+		},
+
 		// Gets the index of a DOM element relative to it's parent element
 		getIndex: function(node) {
 			var result = -1;

diff --git a/dist/fireSlider.min.js b/dist/fireSlider.min.js
diff --git a/dist/fireSlider.velocity.js b/dist/fireSlider.velocity.js
diff --git a/gulpfile.js b/gulpfile.js
@@ -9,7 +9,7 @@ var gulp = require('gulp'),
 		uglify = require('gulp-uglify'),
 		util = require('gulp-util');
 
-var version = '1.2.6';
+var version = '1.2.62';
 var versionComment = '/*! fireSlider (' + version + ') (C) 2014 CJ O\'Hara and Tyler Fowle. MIT @license: en.wikipedia.org/wiki/MIT_License */\n';
 var velocityComment = '/*! VelocityJS.org (C) 2014 Julian Shapiro. MIT @license: en.wikipedia.org/wiki/MIT_License */\n/*! VelocityJS.org jQuery Shim (C) 2014 The jQuery Foundation. MIT @license: en.wikipedia.org/wiki/MIT_License. */\n';
 var velocity = 'var Velocity = require(\'velocity-animate\');\n';

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fireSlider.js",
-  "version": "v1.2.61",
+  "version": "v1.2.62",
   "description": "A responsive javascript slider and carousel plugin, with breakpoints",
   "repository": {
     "type": "git",