Merge pull request #2 from bmallred/master

Updated exclusion to work with nested levels

Author: bmallred

example.html

@@ -11,7 +11,7 @@ <h1>jQuery Analytics</h1>
 		<li><a href="#NoMetatdata">No metadata</a></li>
 		<li><a href="#AssignedId" id="staticId">Assigned identification</a></li>
 		<li><a href="#DefaultMetadata" data-analytics-dog="terrier">Default metadata given</a></li>
-		<li><a href="#Excluded" class="analytics-exclude">Excluded link</a></li>
+		<li class="analytics-exclude"><a href="#Excluded1">Excluded link 1</a> and <a href="#Excluded2">excluded link 2</a></li>
 	</ul>
 
 	<p>These links have been dynamically created at runtime but still are being traced.</p>

jquery-analytics.js

@@ -60,16 +60,23 @@ String.prototype.endsWith = function (search) {
             var parent = $(element).parent();
             if (parent != undefined) {
                 $.each(walkTree($(element).parent()), function (i, node) {
-                    tree.push(node);
+                    if ($(node).is(settings.exclude)) {
+                        tree = null;
+                    }
+                    else if (tree !== null) {
+                        tree.push(node);
+                    }
                 });
             }
 
-            if (tagName == "HTML" || tagName == "BODY") {
-                tree.push(tagName);
-            }
-            else {
-                var tagId = $(element).analyticsUniqueId().attr("id");
-                tree.push(tagName + '[id="' + tagId + '"]');
+            if (tree !== null) {
+                if (tagName == "HTML" || tagName == "BODY") {
+                    tree.push(tagName);
+                }
+                else {
+                    var tagId = $(element).analyticsUniqueId().attr("id");
+                    tree.push(tagName + '[id="' + tagId + '"]');
+                }
             }
         }
 
@@ -90,60 +97,68 @@ String.prototype.endsWith = function (search) {
         $this = $(this);
 
         if (settings.url && !$this.is(".analytics-captured") && !$this.is(settings.exclude)) {
-            // We prevent the default action to allow the background call to succeed.
-            var preventedHref = null;
-            if ($this.attr("href")) {
-                e.preventDefault();
-                preventedHref = $this.attr("href");
-            }
-
-            // Initialize the data to be collected.
-            var data = {};
-
-            // Attach the object identifier.
-            var tree = walkTree($this).join(' ');
-            if (settings.id) {
-                data[settings.id] = tree;
-            }
-            else {
-                data["id"] = tree;
-            }
+            // Walk the tree.
+            var tree = walkTree($this);
+
+            // Make sure the tree does not include an excluded section.
+            if (tree !== null && tree.length > 0) {
+                // Join all the nodes of the tree.
+                tree = tree.join(' ');
+
+                // We prevent the default action to allow the background call to succeed.
+                var preventedHref = null;
+                if ($this.attr("href")) {
+                    e.preventDefault();
+                    preventedHref = $this.attr("href");
+                }
 
-            // Attach the client identifier if found.
-            if (settings.client) {
-                data["client"] = settings.client
-            }
+                // Initialize the data to be collected.
+                var data = {};
 
-            // Assign any "data-analytics-" attributes.
-            var dataAttributes = $this.data();
-            for (var attribute in dataAttributes) {
-                if (attribute.startsWith("analytics")) {
-                    var cleanName = attribute.replace(/analytics/g, '').toLowerCase();
-                    data[cleanName] = dataAttributes[attribute];
+                // Attach the object identifier.
+                if (settings.id) {
+                    data[settings.id] = tree;
+                }
+                else {
+                    data["id"] = tree;
                 }
-            }
-
-            // Assign the custom attributes requested to be collected.
-            $.each($(settings.attributes), function (i, attribute) {
-                data[attribute] = $this.attr(attribute);
-            });
 
-            // Send the analytics.
-            $.ajax({
-                type: "POST",
-                url: settings.url,
-                contentType: "application/x-www-form-urlencoded",
-                data: data
-            })
-            .always(function () {
-                if (settings.captureOnce) {
-                    $this.addClass("analytics-captured");
+                // Attach the client identifier if found.
+                if (settings.client) {
+                    data["client"] = settings.client
                 }
 
-                if (preventedHref) {
-                    window.location = preventedHref;
+                // Assign any "data-analytics-" attributes.
+                var dataAttributes = $this.data();
+                for (var attribute in dataAttributes) {
+                    if (attribute.startsWith("analytics")) {
+                        var cleanName = attribute.replace(/analytics/g, '').toLowerCase();
+                        data[cleanName] = dataAttributes[attribute];
+                    }
                 }
-            });
+
+                // Assign the custom attributes requested to be collected.
+                $.each($(settings.attributes), function (i, attribute) {
+                    data[attribute] = $this.attr(attribute);
+                });
+
+                // Send the analytics.
+                $.ajax({
+                    type: "POST",
+                    url: settings.url,
+                    contentType: "application/x-www-form-urlencoded",
+                    data: data
+                })
+                .always(function () {
+                    if (settings.captureOnce) {
+                        $this.addClass("analytics-captured");
+                    }
+
+                    if (preventedHref) {
+                        window.location = preventedHref;
+                    }
+                });
+            }
         }
     };
 

jquery-analytics.min.js

@@ -0,0 +1 @@
+yui-compressor -o 'jquery-analytics.min.js' jquery-analytics.js