Merge pull request #16 from everdimension/optional_arguments_fix

Determine callback and options arguments first
chinchang · Oct 31, 2015 · 3763db3 · 3763db3
2 parents e5ed929 + 29197cb
commit 3763db3
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/cta.js b/src/cta.js
@@ -86,6 +86,12 @@
 	};
 
 	function cta(trigger, target, options, callback) {
+		// Support optional arguments
+		if (typeof options === 'function') {
+			callback = options;
+			options = {};
+		}
+
 		if (!isSupportedBrowser) {
 			if (callback) {
 				callback(target);
@@ -100,11 +106,6 @@
 			dummy,
 			extraTransitionDuration = 1;
 
-		// Support optional arguments
-		if (typeof options === 'function') {
-			callback = options;
-			options = {};
-		}
 		options = options || {};
 		options.duration = options.duration || defaults.duration;
 		options.targetShowDuration = options.targetShowDuration || getAnimationTime(target) || defaults.targetShowDuration;