Merge pull request #4 from bmallred/master

Fixed some issues with exclusions

jquery-analytics.js

@@ -49,6 +49,23 @@ String.prototype.endsWith = function (search) {
        url: null
    };
    // Determines if there is an exclusion in the path.
    // @param {Object} element
    // @return {Boolean} a value indicating whether the object is excluded
    function isExcluded(element) {
        var excluded = $(element).is(settings.exclude);
        var parent = $(element).parent();
        
        if (parent && parent.prop("tagName") !== undefined) {
            excluded = excluded || parent.is(settings.excluded);
            if (!excluded) {
                excluded = excluded || isExcluded(parent);
            }
        }
        return excluded;
    };
    // Walk the tree of a given node.
    // @param {Object} element
    // @return {Array} path
@@ -58,25 +75,18 @@ String.prototype.endsWith = function (search) {
        
        if (tagName != undefined) {
            var parent = $(element).parent();
            if (parent != undefined) {
            if (parent && parent.prop("tagName") !== undefined) {
                $.each(walkTree($(element).parent()), function (i, node) {
                    if ($(node).is(settings.exclude)) {
                        tree = null;
                    }
                    else if (tree !== null) {
                        tree.push(node);
                    }
                    tree.push(node);
                });
            }
            
            if (tree !== null) {
                if (tagName == "HTML" || tagName == "BODY") {
                    tree.push(tagName);
                }
                else {
                    var tagId = $(element).analyticsUniqueId().attr("id");
                    tree.push(tagName + '[id="' + tagId + '"]');
                }
            if (tagName == "HTML" || tagName == "BODY") {
                tree.push(tagName);
            }
            else {
                var tagId = $(element).analyticsUniqueId().attr("id");
                tree.push(tagName + '[id="' + tagId + '"]');
            }
        }
        
@@ -96,12 +106,12 @@ String.prototype.endsWith = function (search) {
        // Locally scope this variable.
        $this = $(this);
        if (settings.url && !$this.is(".analytics-captured") && !$this.is(settings.exclude)) {
        if (settings.url && !$this.is(".analytics-captured") && !isExcluded($this)) {
            // Walk the tree.
            var tree = walkTree($this);
            // Make sure the tree does not include an excluded section.
            if (tree !== null && tree.length > 0) {
            if (tree && tree.length > 0) {
                // Join all the nodes of the tree.
                tree = tree.join(' ');
@@ -191,7 +201,7 @@ String.prototype.endsWith = function (search) {
        var selector = settings.assignTo.join(",");
        return this.each(function () {
            // Itereate through all elements given on initiation.
            // Iterate through all elements given on initiation.
            $(this).find(selector).andSelf().filter(selector)
            .each(function () {
                identifyPath($(this));

jquery-analytics.min.js

@@ -1 +1 @@
String.prototype.startsWith=function(a){return this.indexOf(a)==0};String.prototype.endsWith=function(a){return this.lastIndexOf(a)==this.length-a.length};(function(d){var f=0;var b={attributes:[],assignTo:["a","input[type='submit']"],captureOnce:false,client:null,id:"id",exclude:".analytics-exclude",url:null};function a(i){var g=[];var h=d(i).prop("tagName");if(h!=undefined){var k=d(i).parent();if(k!=undefined){d.each(a(d(i).parent()),function(l,m){if(d(m).is(b.exclude)){g=null}else{if(g!==null){g.push(m)}}})}if(g!==null){if(h=="HTML"||h=="BODY"){g.push(h)}else{var j=d(i).analyticsUniqueId().attr("id");g.push(h+'[id="'+j+'"]')}}}return g}function c(g){a(g)}function e(m){$this=d(this);if(b.url&&!$this.is(".analytics-captured")&&!$this.is(b.exclude)){var g=a($this);if(g!==null&&g.length>0){g=g.join(" ");var l=null;if($this.attr("href")){m.preventDefault();l=$this.attr("href")}var k={};if(b.id){k[b.id]=g}else{k.id=g}if(b.client){k.client=b.client}var j=$this.data();for(var i in j){if(i.startsWith("analytics")){var h=i.replace(/analytics/g,"").toLowerCase();k[h]=j[i]}}d.each(d(b.attributes),function(n,o){k[o]=$this.attr(o)});d.ajax({type:"POST",url:b.url,contentType:"application/x-www-form-urlencoded",data:k}).always(function(){if(b.captureOnce){$this.addClass("analytics-captured")}if(l){window.location=l}})}}}d.fn.analyticsUniqueId=function(){if(this.length==0){return}return this.each(function(){if(!d(this).attr("id")){d(this).attr("id","analytics-id-"+ ++f)}})};d.fn.analytics=function(h){if(d(this).length==0){return}b=d.extend({},b,h);var g=b.assignTo.join(",");return this.each(function(){d(this).find(g).andSelf().filter(g).each(function(){c(d(this));d(this).on("click",e)})}).on("DOMNodeInserted",function(i){d(i.target).find(g).andSelf().filter(g).each(function(){c(d(this));d(this).on("click",e)})})}})(jQuery);
String.prototype.startsWith=function(a){return this.indexOf(a)==0};String.prototype.endsWith=function(a){return this.lastIndexOf(a)==this.length-a.length};(function(e){var g=0;var c={attributes:[],assignTo:["a","input[type='submit']"],captureOnce:false,client:null,id:"id",exclude:".analytics-exclude",url:null};function a(i){var h=e(i).is(c.exclude);var j=e(i).parent();if(j&&j.prop("tagName")!==undefined){h=h||j.is(c.excluded);if(!h){h=h||a(j)}}return h}function b(j){var h=[];var i=e(j).prop("tagName");if(i!=undefined){var l=e(j).parent();if(l&&l.prop("tagName")!==undefined){e.each(b(e(j).parent()),function(m,n){h.push(n)})}if(i=="HTML"||i=="BODY"){h.push(i)}else{var k=e(j).analyticsUniqueId().attr("id");h.push(i+'[id="'+k+'"]')}}return h}function d(h){b(h)}function f(n){$this=e(this);if(c.url&&!$this.is(".analytics-captured")&&!a($this)){var h=b($this);if(h&&h.length>0){h=h.join(" ");var m=null;if($this.attr("href")){n.preventDefault();m=$this.attr("href")}var l={};if(c.id){l[c.id]=h}else{l.id=h}if(c.client){l.client=c.client}var k=$this.data();for(var j in k){if(j.startsWith("analytics")){var i=j.replace(/analytics/g,"").toLowerCase();l[i]=k[j]}}e.each(e(c.attributes),function(o,p){l[p]=$this.attr(p)});e.ajax({type:"POST",url:c.url,contentType:"application/x-www-form-urlencoded",data:l}).always(function(){if(c.captureOnce){$this.addClass("analytics-captured")}if(m){window.location=m}})}}}e.fn.analyticsUniqueId=function(){if(this.length==0){return}return this.each(function(){if(!e(this).attr("id")){e(this).attr("id","analytics-id-"+ ++g)}})};e.fn.analytics=function(i){if(e(this).length==0){return}c=e.extend({},c,i);var h=c.assignTo.join(",");return this.each(function(){e(this).find(h).andSelf().filter(h).each(function(){d(e(this));e(this).on("click",f)})}).on("DOMNodeInserted",function(j){e(j.target).find(h).andSelf().filter(h).each(function(){d(e(this));e(this).on("click",f)})})}})(jQuery);