Changed order of conditionals to check if attr is a callback first.

ashleydw · Oct 25, 2017 · 64cfa74 · 64cfa74
1 parent 5e4f415
commit 64cfa74
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/dist/ekko-lightbox.js b/dist/ekko-lightbox.js
@@ -267,10 +267,10 @@ var Lightbox = (function ($) {
 		}, {
 			key: '_getAttr',
 			value: function _getAttr(element, attr) {
-				if (0 === attr.indexOf("data-")) {
-					return $(element).data(attr.replace("data-", ""));
-				} else if (typeof attr === 'function') {
+				if (typeof attr === 'function') {
 					return attr.call(element);
+				} else if (0 === attr.toString().indexOf("data-")) {
+					return $(element).data(attr.replace("data-", ""));
 				} else {
 					return $(element).attr(attr);
 				}

diff --git a/dist/ekko-lightbox.js.map b/dist/ekko-lightbox.js.map
diff --git a/dist/ekko-lightbox.min.js b/dist/ekko-lightbox.min.js
diff --git a/dist/ekko-lightbox.min.js.map b/dist/ekko-lightbox.min.js.map
diff --git a/ekko-lightbox.js b/ekko-lightbox.js
@@ -272,10 +272,10 @@ const Lightbox = (($) => {
 		}
 
 		_getAttr(element,attr){
-			if(0 === attr.indexOf("data-")){
-				return $(element).data(attr.replace("data-",""));
-			} else if(typeof attr === 'function') {
+			if(typeof attr === 'function') {
 				return attr.call(element);
+			} else if(0 === attr.toString().indexOf("data-")) {
+				return $(element).data(attr.replace("data-", ""));
 			} else {
 				return $(element).attr(attr);
 			}